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/05/02 08:44:11 UTC
svn commit: r1830733 - /httpd/httpd/patches/2.4.x/h2_keepalive_restore.patch
Author: icing
Date: Wed May 2 08:44:11 2018
New Revision: 1830733
URL: http://svn.apache.org/viewvc?rev=1830733&view=rev
Log:
backport patch
Added:
httpd/httpd/patches/2.4.x/h2_keepalive_restore.patch
Added: httpd/httpd/patches/2.4.x/h2_keepalive_restore.patch
URL: http://svn.apache.org/viewvc/httpd/httpd/patches/2.4.x/h2_keepalive_restore.patch?rev=1830733&view=auto
==============================================================================
--- httpd/httpd/patches/2.4.x/h2_keepalive_restore.patch (added)
+++ httpd/httpd/patches/2.4.x/h2_keepalive_restore.patch Wed May 2 08:44:11 2018
@@ -0,0 +1,57 @@
+Index: modules/http2/h2_conn.c
+===================================================================
+--- modules/http2/h2_conn.c (revision 1830731)
++++ modules/http2/h2_conn.c (working copy)
+@@ -240,7 +240,19 @@
+ && mpm_state != AP_MPMQ_STOPPING);
+
+ if (c->cs) {
+- c->cs->state = CONN_STATE_LINGER;
++ switch (session->state) {
++ case H2_SESSION_ST_INIT:
++ case H2_SESSION_ST_IDLE:
++ case H2_SESSION_ST_BUSY:
++ case H2_SESSION_ST_WAIT:
++ c->cs->state = CONN_STATE_WRITE_COMPLETION;
++ break;
++ case H2_SESSION_ST_CLEANUP:
++ case H2_SESSION_ST_DONE:
++ default:
++ c->cs->state = CONN_STATE_LINGER;
++ break;
++ }
+ }
+
+ return APR_SUCCESS;
+Index: modules/http2/h2_version.h
+===================================================================
+--- modules/http2/h2_version.h (revision 1830731)
++++ modules/http2/h2_version.h (working copy)
+@@ -27,7 +27,7 @@
+ * @macro
+ * Version number of the http2 module as c string
+ */
+-#define MOD_HTTP2_VERSION "1.10.16"
++#define MOD_HTTP2_VERSION "1.10.20"
+
+ /**
+ * @macro
+@@ -35,7 +35,7 @@
+ * release. This is a 24 bit number with 8 bits for major number, 8 bits
+ * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
+ */
+-#define MOD_HTTP2_VERSION_NUM 0x010a10
++#define MOD_HTTP2_VERSION_NUM 0x010a14
+
+
+ #endif /* mod_h2_h2_version_h */
+Index: .
+===================================================================
+--- . (revision 1830731)
++++ . (working copy)
+
+Property changes on: .
+___________________________________________________________________
+Modified: svn:mergeinfo
+## -0,0 +0,1 ##
+ Merged /httpd/httpd/trunk:r1830562