Skip to content

Commit 30ca015

Browse files
committed
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1925972 13f79535-47bb-0310-9956-ffa450edef68
1 parent 33c98b0 commit 30ca015

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

STATUS

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,37 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
168168
+0: jorton - falls under RTC exception for "non-Unix build"
169169

170170

171+
*) mod_http2: update to v2.0.30
172+
Trunk version of patch:
173+
https://svn.apache.org/r1924145
174+
https://svn.apache.org/r1924164
175+
https://svn.apache.org/r1924197
176+
Backport version for 2.4.x of patch:
177+
svn merge -c 1924145,r1924164,1924197 ^/httpd/httpd/trunk .
178+
+1: icing, rpluem, jorton
179+
rpluem says: The compatibility tag in docs/manual/mod/mod_http2.xml needs
180+
to be adjusted to 2.4 (also in trunk after backporting)
181+
182+
*) mod_proxy_http2: revert r1912193 for detecting broken backend connections
183+
as this interferes with backend selection who a node is unresponsive.
184+
PR69624.
185+
Trunk version of patch:
186+
https://svn.apache.org/r1924554
187+
Backport version for 2.4.x of patch:
188+
svn merge -c 1924554 ^/httpd/httpd/trunk .
189+
+1: icing, rpluem, jorton
190+
rpluem says: Is 2.0.31-git the correct value for MOD_HTTP2_VERSION or
191+
should it be 2.0.31?
192+
193+
*) scoreboard/mod_http2: record durations of HTTP/2 requests.
194+
Trunk version of patch:
195+
https://svn.apache.org/r1923754
196+
https://svn.apache.org/r1923806
197+
Backport version for 2.4.x of patch:
198+
svn merge -c 1923754,1923806 ^/httpd/httpd/trunk .
199+
backport needs adjusting MMN
200+
+1: icing, rpluem, jorton
201+
171202
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
172203
[ New proposals should be added at the end of the list ]
173204

@@ -187,44 +218,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
187218
Can be applied via apply_backport_pr.sh 515
188219
+1: rpluem, jorton
189220

190-
*) scoreboard/mod_http2: record durations of HTTP/2 requests.
191-
Trunk version of patch:
192-
https://svn.apache.org/r1923754
193-
https://svn.apache.org/r1923806
194-
Backport version for 2.4.x of patch:
195-
svn merge -c 1923754,1923806 ^/httpd/httpd/trunk .
196-
backport needs adjusting MMN
197-
+1: icing, rpluem
198-
199221
*) mod_lua: Fix memory handling in output filter
200222
Trunk version of patch:
201223
https://svn.apache.org/r1924095
202224
Backport version for 2.4.x of patch:
203225
svn merge -c 1924095 ^/httpd/httpd/trunk .
204226
+1: jorton, rpluem
205227

206-
*) mod_http2: update to v2.0.30
207-
Trunk version of patch:
208-
https://svn.apache.org/r1924145
209-
https://svn.apache.org/r1924164
210-
https://svn.apache.org/r1924197
211-
Backport version for 2.4.x of patch:
212-
svn merge -c 1924145,r1924164,1924197 ^/httpd/httpd/trunk .
213-
+1: icing, rpluem
214-
rpluem says: The compatibility tag in docs/manual/mod/mod_http2.xml needs
215-
to be adjusted to 2.4 (also in trunk after backporting)
216-
217-
*) mod_proxy_http2: revert r1912193 for detecting broken backend connections
218-
as this interferes with backend selection who a node is unresponsive.
219-
PR69624.
220-
Trunk version of patch:
221-
https://svn.apache.org/r1924554
222-
Backport version for 2.4.x of patch:
223-
svn merge -c 1924554 ^/httpd/httpd/trunk .
224-
+1: icing, rpluem
225-
rpluem says: Is 2.0.31-git the correct value for MOD_HTTP2_VERSION or
226-
should it be 2.0.31?
227-
228228
*) mod_ssl: Remove warning over potential uninitialised value
229229
for ssl protocol prior to protocol selection.
230230
Trunk version of patch:

0 commit comments

Comments
 (0)