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 2018/11/08 10:11:59 UTC
svn commit: r1846113 - in /httpd/httpd/branches/2.4.x: STATUS
modules/http2/h2_conn.c
Author: icing
Date: Thu Nov 8 10:11:59 2018
New Revision: 1846113
URL: http://svn.apache.org/viewvc?rev=1846113&view=rev
Log:
backport proposal
Modified:
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/http2/h2_conn.c
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1846113&r1=1846112&r2=1846113&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Nov 8 10:11:59 2018
@@ -208,6 +208,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
2.4.x patch: svn merge -c 1845768 ^/httpd/httpd/trunk .
+1: icing, jim
+ *) mod_ssl: Fixes PR 62654 where "require ssl" did not work on HTTP/2
+ connections.
+ trunk patch: http://svn.apache.org/r1846112
+ 2.4.x patch: svn merge -c 1846112 ^/httpd/httpd/trunk .
+ +1: icing,
PATCHES/ISSUES THAT ARE BEING WORKED
[ New entries should be added at the START of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_conn.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_conn.c?rev=1846113&r1=1846112&r2=1846113&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_conn.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_conn.c Thu Nov 8 10:11:59 2018
@@ -354,6 +354,7 @@ apr_status_t h2_slave_run_pre_connection
* (Not necessarily in pre_connection, but later. Set it here, so it
* is in place.) */
slave->keepalives = 1;
+ slave->keepalive = AP_CONN_CLOSE;
return ap_run_pre_connection(slave, csd);
}
return APR_SUCCESS;