summaryrefslogtreecommitdiff
path: root/modules/http2/h2_headers.c
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2019-01-28 10:27:08 +0000
committerStefan Eissing <icing@apache.org>2019-01-28 10:27:08 +0000
commita721d5cc9ebed4cb3679a935f4eb2cb167a78527 (patch)
tree853bdbf0a738e075569a1bdbc90c542e28b1ca04 /modules/http2/h2_headers.c
parentc77b4604eeb011fa0b66c033efc33ebc378ff8b6 (diff)
downloadhttpd-a721d5cc9ebed4cb3679a935f4eb2cb167a78527.tar.gz
*) mod_http2: Configuration directoves H2Push and H2Upgrade can now be specified per
Location/Directory, e.g. disabling PUSH for a specific set of resources. [Stefan Eissing] *) mod_http2: HEAD requests to some module such as mod_cgid caused the stream to terminate improperly and cause a HTTP/2 PROTOCOL_ERROR. Fixes <https://github.com/icing/mod_h2/issues/167>. [Michael Kaufmann] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1852339 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http2/h2_headers.c')
-rw-r--r--modules/http2/h2_headers.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/http2/h2_headers.c b/modules/http2/h2_headers.c
index 8b7add6230..1f7a8ede73 100644
--- a/modules/http2/h2_headers.c
+++ b/modules/http2/h2_headers.c
@@ -28,6 +28,7 @@
#include "h2_private.h"
#include "h2_h2.h"
+#include "h2_config.h"
#include "h2_util.h"
#include "h2_request.h"
#include "h2_headers.h"
@@ -141,8 +142,10 @@ h2_headers *h2_headers_rcreate(request_rec *r, int status,
}
}
if (is_unsafe(r->server)) {
- apr_table_setn(headers->notes, H2_HDR_CONFORMANCE,
- H2_HDR_CONFORMANCE_UNSAFE);
+ apr_table_setn(headers->notes, H2_HDR_CONFORMANCE, H2_HDR_CONFORMANCE_UNSAFE);
+ }
+ if (h2_config_rgeti(r, H2_CONF_PUSH) == 0 && h2_config_sgeti(r->server, H2_CONF_PUSH) != 0) {
+ apr_table_setn(headers->notes, H2_PUSH_MODE_NOTE, "0");
}
return headers;
}