Merge ~bryce/ubuntu/+source/apache2:sru-lp1927742-lunar into ubuntu/+source/apache2:ubuntu/lunar-devel

[Bryce Harrington]

Unmerged commits

30dd7ad... by Bryce Harrington on 2024-01-17

changelog

08d6308... by Bryce Harrington on 2024-01-17

  * d/p/fix-dolphin-to-delete-webdav-dirs.patch: Add dolphin and
    Konqueror/5 careful redirection so that directories can be deleted
    via webdav.
    (LP: #1927742)

diff --git a/debian/changelog b/debian/changelog
index a42c22c..ced5c4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apache2 (2.4.55-1ubuntu2.2) lunar; urgency=medium
+
+  * d/p/fix-dolphin-to-delete-webdav-dirs.patch: Add dolphin and
+    Konqueror/5 careful redirection so that directories can be deleted
+    via webdav.
+    (LP: #1927742)
+
+ -- Bryce Harrington <[e-mail]>  Tue, 16 Jan 2024 19:00:27 -0800
+
 apache2 (2.4.55-1ubuntu2.1) lunar-security; urgency=medium
 
   * SECURITY UPDATE: mod_macro buffer over-read
diff --git a/debian/patches/fix-dolphin-to-delete-webdav-dirs.patch b/debian/patches/fix-dolphin-to-delete-webdav-dirs.patch
new file mode 100644
index 0000000..1fac833
--- /dev/null
+++ b/debian/patches/fix-dolphin-to-delete-webdav-dirs.patch
@@ -0,0 +1,16 @@
+Description: Recognize dolphin and Konqueror/5 browsers for webdav.
+ Without these settings, these browsers will be sent redirects on
+ URLs for directories specified without a trailing '/'.  That can
+ prevent webdav DELETE operations from working.
+Author: Michal Maloszewski <[e-mail]>
+Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=67039
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1927742
+Last-Update: 2024-01-16
+--- a/docs/conf/extra/httpd-dav.conf.in
++++ b/docs/conf/extra/httpd-dav.conf.in
+@@ -48,3 +48,5 @@
+ BrowserMatch "^XML Spy" redirect-carefully
+ BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
+ BrowserMatch " Konqueror/4" redirect-carefully
++BrowserMatch " Konqueror/5" redirect-carefully
++BrowserMatch " dolphin/" redirect-carefully
diff --git a/debian/patches/series b/debian/patches/series
index f3a923c..c7cdbd9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix-dolphin-to-delete-webdav-dirs.patch
 fhs_compliance.patch
 no_LD_LIBRARY_PATH.patch
 suexec-CVE-2007-1742.patch