diff options
| author | Stefan Eissing <icing@apache.org> | 2019-01-28 11:27:08 +0100 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2019-01-28 11:27:08 +0100 |
| commit | a721d5cc9ebed4cb3679a935f4eb2cb167a78527 (patch) | |
| tree | 853bdbf0a738e075569a1bdbc90c542e28b1ca04 /modules/http2/h2_stream.c | |
| parent | fr doc rebuild. (diff) | |
| download | apache2-a721d5cc9ebed4cb3679a935f4eb2cb167a78527.tar.xz apache2-a721d5cc9ebed4cb3679a935f4eb2cb167a78527.zip | |
*) 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_stream.c')
| -rw-r--r-- | modules/http2/h2_stream.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/http2/h2_stream.c b/modules/http2/h2_stream.c index 24ebc56023..3cef6bae05 100644 --- a/modules/http2/h2_stream.c +++ b/modules/http2/h2_stream.c @@ -365,9 +365,8 @@ void h2_stream_dispatch(h2_stream *stream, h2_stream_event_t ev) static void set_policy_for(h2_stream *stream, h2_request *r) { int enabled = h2_session_push_enabled(stream->session); - stream->push_policy = h2_push_policy_determine(r->headers, stream->pool, - enabled); - r->serialize = h2_config_geti(stream->session->config, H2_CONF_SER_HEADERS); + stream->push_policy = h2_push_policy_determine(r->headers, stream->pool, enabled); + r->serialize = h2_config_sgeti(stream->session->s, H2_CONF_SER_HEADERS); } apr_status_t h2_stream_send_frame(h2_stream *stream, int ftype, int flags, size_t frame_len) @@ -987,7 +986,7 @@ const h2_priority *h2_stream_get_priority(h2_stream *stream, const char *ctype = apr_table_get(response->headers, "content-type"); if (ctype) { /* FIXME: Not good enough, config needs to come from request->server */ - return h2_config_get_priority(stream->session->config, ctype); + return h2_cconfig_get_priority(stream->session->c, ctype); } } return NULL; |