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/11/18 15:19:01 UTC
svn commit: r1770395 - in /httpd/httpd/trunk/modules/http2: h2_h2.c
h2_session.c
Author: icing
Date: Fri Nov 18 15:19:00 2016
New Revision: 1770395
URL: http://svn.apache.org/viewvc?rev=1770395&view=rev
Log:
mod_http2: limiting new PUSHes to GET only, preventing 103 responses when expecting a 100
Modified:
httpd/httpd/trunk/modules/http2/h2_h2.c
httpd/httpd/trunk/modules/http2/h2_session.c
Modified: httpd/httpd/trunk/modules/http2/h2_h2.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_h2.c?rev=1770395&r1=1770394&r2=1770395&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_h2.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_h2.c Fri Nov 18 15:19:00 2016
@@ -684,7 +684,8 @@ static int h2_h2_pre_close_conn(conn_rec
static void check_push(request_rec *r, const char *tag)
{
const h2_config *conf = h2_config_rget(r);
- if (conf && conf->push_list && conf->push_list->nelts > 0) {
+ if (!r->expecting_100
+ && conf && conf->push_list && conf->push_list->nelts > 0) {
int i, old_status;
const char *old_line;
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r,
Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1770395&r1=1770394&r2=1770395&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Fri Nov 18 15:19:00 2016
@@ -1473,6 +1473,8 @@ static apr_status_t on_stream_headers(h2
*/
if (!stream->initiated_on
&& !stream->has_response
+ && stream->request && stream->request->method
+ && !strcmp("GET", stream->request->method)
&& (headers->status < 400)
&& (headers->status != 304)
&& h2_session_push_enabled(session)) {