You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2016/07/20 15:57:51 UTC
svn commit: r1753541 - in /httpd/httpd/trunk/modules/http2: h2_alt_svc.c
h2_stream.c
Author: icing
Date: Wed Jul 20 15:57:51 2016
New Revision: 1753541
URL: http://svn.apache.org/viewvc?rev=1753541&view=rev
Log:
mod_http2: fixing config lookup now that we have dir conf
Modified:
httpd/httpd/trunk/modules/http2/h2_alt_svc.c
httpd/httpd/trunk/modules/http2/h2_stream.c
Modified: httpd/httpd/trunk/modules/http2/h2_alt_svc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_alt_svc.c?rev=1753541&r1=1753540&r2=1753541&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_alt_svc.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_alt_svc.c Wed Jul 20 15:57:51 2016
@@ -86,7 +86,7 @@ static int h2_alt_svc_handler(request_re
return DECLINED;
}
- cfg = h2_config_rget(r);
+ cfg = h2_config_sget(r->server);
if (r->hostname && cfg && cfg->alt_svcs && cfg->alt_svcs->nelts > 0) {
const char *alt_svc_used = apr_table_get(r->headers_in, "Alt-Svc-Used");
if (!alt_svc_used) {
Modified: httpd/httpd/trunk/modules/http2/h2_stream.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_stream.c?rev=1753541&r1=1753540&r2=1753541&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_stream.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_stream.c Wed Jul 20 15:57:51 2016
@@ -274,7 +274,7 @@ apr_status_t h2_stream_set_request(h2_st
}
set_state(stream, H2_STREAM_ST_OPEN);
status = h2_request_rwrite(stream->request, stream->pool, r);
- stream->request->serialize = h2_config_geti(h2_config_rget(r),
+ stream->request->serialize = h2_config_geti(h2_config_sget(r->server),
H2_CONF_SER_HEADERS);
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r, APLOGNO(03058)
"h2_request(%d): rwrite %s host=%s://%s%s",