Skip to content

Commit 5e08023

Browse files
committed
2 votes, 1 promotion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1923127 13f79535-47bb-0310-9956-ffa450edef68
1 parent 52883de commit 5e08023

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

STATUS

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,19 @@ RELEASE SHOWSTOPPERS:
157157
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
158158
[ start all new proposals below, under PATCHES PROPOSED. ]
159159

160+
*) Easy patches: synch 2.4.x and trunk
161+
- ab: Increase MAX_CONCURRENCY hard limit (from 20K to 200K)
162+
- ab: Fix X509 * leak
163+
- dav/fs/dbm.c: Remove error message references to "property" databases
164+
- httpd.h: Fix comment
165+
trunk patch:
166+
- https://svn.apache.org/r1910518
167+
https://svn.apache.org/r1910847
168+
https://svn.apache.org/r1912477
169+
https://svn.apache.org/r1918297
170+
2.4.x patch: svn merge -c 1910518,1910847,1912477,1918297 ^/httpd/httpd/trunk .
171+
+1: jailletc36, jim, ylavic
172+
160173

161174
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
162175
[ New proposals should be added at the end of the list ]
@@ -170,25 +183,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
170183
+1: ivan
171184
+0: jorton - falls under RTC exception for "non-Unix build"
172185

173-
*) Easy patches: synch 2.4.x and trunk
174-
- ab: Increase MAX_CONCURRENCY hard limit (from 20K to 200K)
175-
- ab: Fix X509 * leak
176-
- dav/fs/dbm.c: Remove error message references to "property" databases
177-
- httpd.h: Fix comment
178-
trunk patch:
179-
- https://svn.apache.org/r1910518
180-
https://svn.apache.org/r1910847
181-
https://svn.apache.org/r1912477
182-
https://svn.apache.org/r1918297
183-
2.4.x patch: svn merge -c 1910518,1910847,1912477,1918297 ^/httpd/httpd/trunk .
184-
+1: jailletc36, jim
185-
186186
*) Do not add a space before '|' when setting the value for stickysession in the
187187
balancer manager as this breaks the stickysession configuration once a new
188188
configuration is submitted by the balancer manager. PR: 69510
189189
trunk patch: https://svn.apache.org/r1923101
190190
2.4.x patch: svn merge -c 1923101 ^/httpd/httpd/trunk .
191-
+1: jim
191+
+1: jim, ylavic
192192

193193

194194
PATCHES/ISSUES THAT ARE BEING WORKED

0 commit comments

Comments
 (0)