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 2020/06/24 14:42:15 UTC
svn commit: r1879157 - /httpd/httpd/patches/2.4.x/h2-master-secondary.patch
Author: icing
Date: Wed Jun 24 14:42:15 2020
New Revision: 1879157
URL: http://svn.apache.org/viewvc?rev=1879157&view=rev
Log:
update to add r1879156
Modified:
httpd/httpd/patches/2.4.x/h2-master-secondary.patch
Modified: httpd/httpd/patches/2.4.x/h2-master-secondary.patch
URL: http://svn.apache.org/viewvc/httpd/httpd/patches/2.4.x/h2-master-secondary.patch?rev=1879157&r1=1879156&r2=1879157&view=diff
==============================================================================
--- httpd/httpd/patches/2.4.x/h2-master-secondary.patch (original)
+++ httpd/httpd/patches/2.4.x/h2-master-secondary.patch Wed Jun 24 14:42:15 2020
@@ -1,6 +1,6 @@
Index: CHANGES
===================================================================
---- CHANGES (Revision 1879138)
+--- CHANGES (Revision 1879156)
+++ CHANGES (Arbeitskopie)
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
@@ -14,7 +14,7 @@ Index: CHANGES
*) mod_http2: Fixed regression that no longer set H2_STREAM_ID and H2_STREAM_TAG.
Index: modules/http2/h2_conn.c
===================================================================
---- modules/http2/h2_conn.c (Revision 1879138)
+--- modules/http2/h2_conn.c (Revision 1879156)
+++ modules/http2/h2_conn.c (Arbeitskopie)
@@ -138,7 +138,7 @@
ap_register_input_filter("H2_IN", h2_filter_core_input,
@@ -146,7 +146,7 @@ Index: modules/http2/h2_conn.c
Index: modules/http2/h2_conn.h
===================================================================
---- modules/http2/h2_conn.h (Revision 1879138)
+--- modules/http2/h2_conn.h (Revision 1879156)
+++ modules/http2/h2_conn.h (Arbeitskopie)
@@ -68,10 +68,10 @@
const char *h2_conn_mpm_name(void);
@@ -165,7 +165,7 @@ Index: modules/http2/h2_conn.h
#endif /* defined(__mod_h2__h2_conn__) */
Index: modules/http2/h2_filter.c
===================================================================
---- modules/http2/h2_filter.c (Revision 1879138)
+--- modules/http2/h2_filter.c (Revision 1879156)
+++ modules/http2/h2_filter.c (Arbeitskopie)
@@ -370,7 +370,7 @@
x.s = s;
@@ -187,7 +187,7 @@ Index: modules/http2/h2_filter.c
Index: modules/http2/h2_h2.c
===================================================================
---- modules/http2/h2_h2.c (Revision 1879138)
+--- modules/http2/h2_h2.c (Revision 1879156)
+++ modules/http2/h2_h2.c (Arbeitskopie)
@@ -666,7 +666,7 @@
{
@@ -236,7 +236,7 @@ Index: modules/http2/h2_h2.c
check_push(r, "late_fixup");
Index: modules/http2/h2_mplx.c
===================================================================
---- modules/http2/h2_mplx.c (Revision 1879138)
+--- modules/http2/h2_mplx.c (Revision 1879156)
+++ modules/http2/h2_mplx.c (Arbeitskopie)
@@ -56,10 +56,18 @@
apr_size_t count;
@@ -1149,7 +1149,7 @@ Index: modules/http2/h2_mplx.c
return status;
Index: modules/http2/h2_mplx.h
===================================================================
---- modules/http2/h2_mplx.h (Revision 1879138)
+--- modules/http2/h2_mplx.h (Revision 1879156)
+++ modules/http2/h2_mplx.h (Arbeitskopie)
@@ -31,8 +31,10 @@
* queued in the multiplexer. If a task thread tries to write more
@@ -1413,7 +1413,7 @@ Index: modules/http2/h2_mplx.h
#endif /* defined(__mod_h2__h2_mplx__) */
Index: modules/http2/h2_request.c
===================================================================
---- modules/http2/h2_request.c (Revision 1879138)
+--- modules/http2/h2_request.c (Revision 1879156)
+++ modules/http2/h2_request.c (Arbeitskopie)
@@ -288,6 +288,9 @@
if (r->method_number == M_GET && r->method[0] == 'H') {
@@ -1438,7 +1438,7 @@ Index: modules/http2/h2_request.c
Index: modules/http2/h2_session.c
===================================================================
---- modules/http2/h2_session.c (Revision 1879138)
+--- modules/http2/h2_session.c (Revision 1879156)
+++ modules/http2/h2_session.c (Arbeitskopie)
@@ -106,7 +106,7 @@
@@ -1577,7 +1577,7 @@ Index: modules/http2/h2_session.c
}
Index: modules/http2/h2_session.h
===================================================================
---- modules/http2/h2_session.h (Revision 1879138)
+--- modules/http2/h2_session.h (Revision 1879156)
+++ modules/http2/h2_session.h (Arbeitskopie)
@@ -132,7 +132,7 @@
const char *last_status_msg; /* the one already reported */
@@ -1590,7 +1590,7 @@ Index: modules/http2/h2_session.h
Index: modules/http2/h2_stream.c
===================================================================
---- modules/http2/h2_stream.c (Revision 1879138)
+--- modules/http2/h2_stream.c (Revision 1879156)
+++ modules/http2/h2_stream.c (Arbeitskopie)
@@ -911,7 +911,7 @@
@@ -1603,7 +1603,7 @@ Index: modules/http2/h2_stream.c
return status;
Index: modules/http2/h2_task.c
===================================================================
---- modules/http2/h2_task.c (Revision 1879138)
+--- modules/http2/h2_task.c (Revision 1879156)
+++ modules/http2/h2_task.c (Arbeitskopie)
@@ -86,7 +86,7 @@
task->request->authority,
@@ -1747,10 +1747,10 @@ Index: modules/http2/h2_task.c
NULL, NULL, APR_HOOK_FIRST);
- ap_register_input_filter("H2_SLAVE_IN", h2_filter_slave_in,
-+ ap_register_input_filter("H2_secondary_IN", h2_filter_secondary_in,
++ ap_register_input_filter("H2_SECONDARY_IN", h2_filter_secondary_in,
NULL, AP_FTYPE_NETWORK);
- ap_register_output_filter("H2_SLAVE_OUT", h2_filter_slave_output,
-+ ap_register_output_filter("H2_secondary_OUT", h2_filter_secondary_output,
++ ap_register_output_filter("H2_SECONDARY_OUT", h2_filter_secondary_output,
NULL, AP_FTYPE_NETWORK);
ap_register_output_filter("H2_PARSE_H1", h2_filter_parse_h1,
NULL, AP_FTYPE_NETWORK);
@@ -1834,7 +1834,7 @@ Index: modules/http2/h2_task.c
}
Index: modules/http2/h2_task.h
===================================================================
---- modules/http2/h2_task.h (Revision 1879138)
+--- modules/http2/h2_task.h (Revision 1879156)
+++ modules/http2/h2_task.h (Arbeitskopie)
@@ -90,7 +90,7 @@
apr_bucket *eor;
@@ -1847,7 +1847,7 @@ Index: modules/http2/h2_task.h
apr_interval_time_t timeout,
Index: modules/http2/h2_workers.c
===================================================================
---- modules/http2/h2_workers.c (Revision 1879138)
+--- modules/http2/h2_workers.c (Revision 1879156)
+++ modules/http2/h2_workers.c (Arbeitskopie)
@@ -155,7 +155,7 @@
{
@@ -1873,7 +1873,7 @@ Index: modules/http2/h2_workers.c
}
Index: modules/http2/mod_http2.c
===================================================================
---- modules/http2/mod_http2.c (Revision 1879138)
+--- modules/http2/mod_http2.c (Revision 1879156)
+++ modules/http2/mod_http2.c (Arbeitskopie)
@@ -237,7 +237,7 @@
if (ctx) {
@@ -1895,11 +1895,11 @@ Index: modules/http2/mod_http2.c
}
Index: .
===================================================================
---- . (Revision 1879138)
+--- . (Revision 1879156)
+++ . (Arbeitskopie)
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
- Zusammengeführt /httpd/httpd/trunk:r1878926
+ Zusammengeführt /httpd/httpd/trunk:r1879156