From bd9fcdb96862ceab23bb241091ee21d9fe9f3642 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Wed, 20 Jul 2016 15:57:51 +0000 Subject: [PATCH] mod_http2: fixing config lookup now that we have dir conf git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1753541 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http2/h2_alt_svc.c | 2 +- modules/http2/h2_stream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/http2/h2_alt_svc.c b/modules/http2/h2_alt_svc.c index 24a8b1f41a..3dee9df0b6 100644 --- a/modules/http2/h2_alt_svc.c +++ b/modules/http2/h2_alt_svc.c @@ -86,7 +86,7 @@ static int h2_alt_svc_handler(request_rec *r) 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) { diff --git a/modules/http2/h2_stream.c b/modules/http2/h2_stream.c index a7a6764192..3a7f1a94a1 100644 --- a/modules/http2/h2_stream.c +++ b/modules/http2/h2_stream.c @@ -274,7 +274,7 @@ apr_status_t h2_stream_set_request(h2_stream *stream, request_rec *r) } 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", -- 2.40.0