Skip to content

Commit 20ede44

Browse files
author
Christophe Jaillet
committed
Easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1922498 13f79535-47bb-0310-9956-ffa450edef68
1 parent 19718a9 commit 20ede44

File tree

1 file changed

+28
-0
lines changed

1 file changed

+28
-0
lines changed

STATUS

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,34 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
226226
2.4.x patch: svn merge -c 1921260 ^/httpd/httpd/trunk .
227227
+1: jorton,
228228

229+
*) Easy patches: synch 2.4.x and trunk
230+
- server: Use apr_size_t instead of int to harden against overflows
231+
- mod_http2: DOXYGEN has nothing to do here, just remove this
232+
strange "#if defined(DOXYGEN)"
233+
- test: make the compiler happy when using --enable-maintainer-mode
234+
- mod_proxy: Fix format string type check
235+
- mod_http2: Fix comment, no functional change
236+
- <various>: Remove unnecessary APLOGNO() use in TRACE-level logging
237+
- mod_cache_socache: Update comment only, to remove reference to
238+
session cache
239+
- mod_dav: Fix error message formatting if an unauthenticated user
240+
tries to use an authenticated user's lock token
241+
- <none>: trigger ci
242+
- server: Fix typo in comment
243+
trunk patch:
244+
https://svn.apache.org/r1903680
245+
https://svn.apache.org/r1912663
246+
https://svn.apache.org/r1917013
247+
https://svn.apache.org/r1912941
248+
https://svn.apache.org/r1913078
249+
https://svn.apache.org/r1913338
250+
https://svn.apache.org/r1914035
251+
https://svn.apache.org/r1914439
252+
https://svn.apache.org/r1915270
253+
https://svn.apache.org/r1915543
254+
2.4.x patch: svn merge -c 1903680,1912663,1917013,1912941,1913078,1913338,1914035,1914439,1915270,1915543 ^/httpd/httpd/trunk .
255+
+1: jailletc36,
256+
229257
PATCHES/ISSUES THAT ARE BEING WORKED
230258
[ New entries should be added at the START of the list ]
231259

0 commit comments

Comments
 (0)