summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2022-11-30 14:46:04 +0000
committerJim Jagielski <jim@apache.org>2022-11-30 14:46:04 +0000
commit2f384972409ecb8f9530a3c043fac13908efbef7 (patch)
tree1efaa583781b81f880addb746e6328c124aa2de9
parenta2da46b70c658c2d609f83cd8d417ff841801ffe (diff)
downloadhttpd-2f384972409ecb8f9530a3c043fac13908efbef7.tar.gz
update backport prop w/ mmn bump commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1905647 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--STATUS8
1 files changed, 4 insertions, 4 deletions
diff --git a/STATUS b/STATUS
index ff6f6e62f6..a53964b526 100644
--- a/STATUS
+++ b/STATUS
@@ -188,10 +188,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
https://svn.apache.org/r1903744
https://svn.apache.org/r1903745
https://svn.apache.org/r1904642
+ https://svn.apache.org/r1905646 (*)
Backport version for 2.4.x of patch:
- svn merge works
+ svn merge works (* requires hand fixing)
+1: jim, covener
- covener: needs MMN bump
*) mod_http2: backport of v2.0.10 to synch sources with trunk/github
See: change-entries/http2_v2.txt for details.
@@ -203,11 +203,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
*) mod_dav: DAVlockDiscovery option to disable WebDAV lock discovery
This is a game changer for performances if client use PROPFIND a lot,
trunk patch: http://svn.apache.org/r1904638
- http://svn.apache.org/r1904662
+ http://svn.apache.org/r1904662
http://svn.apache.org/r1905170
http://svn.apache.org/r1905206
http://svn.apache.org/r1905230
- 2.4.x patch: svn merge -c 1904638,1904662,1905170,1905206,1905230 ^/httpd/httpd/trunk .
+ 2.4.x patch: svn merge -c 1904638,1904662,1905170,1905206,1905230 ^/httpd/httpd/trunk .
+1: manu, covener
covener: xml needs doc tweak after backport