From 28fa74dd09ecb82854827a145d33b4f430e8520705cd8c46c38a63b88de36fdc Mon Sep 17 00:00:00 2001
From: David Anes <david.anes@suse.com>
Date: Tue, 11 Apr 2023 13:32:57 +0000
Subject: [PATCH] Accepting request 1077884 from home:adkorte:branches:Apache

OBS-URL: https://build.opensuse.org/request/show/1077884
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=690
---
 apache2.changes          | 28 ++++++++++++++++++++++++++++
 apache2.spec             |  2 +-
 httpd-2.4.56.tar.bz2     |  3 ---
 httpd-2.4.56.tar.bz2.asc | 16 ----------------
 httpd-2.4.57.tar.bz2     |  3 +++
 httpd-2.4.57.tar.bz2.asc | 16 ++++++++++++++++
 6 files changed, 48 insertions(+), 20 deletions(-)
 delete mode 100644 httpd-2.4.56.tar.bz2
 delete mode 100644 httpd-2.4.56.tar.bz2.asc
 create mode 100644 httpd-2.4.57.tar.bz2
 create mode 100644 httpd-2.4.57.tar.bz2.asc

diff --git a/apache2.changes b/apache2.changes
index f2ed1af..6ef2993 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Fri Apr  7 13:17:47 UTC 2023 - Arjen de Korte <suse+build@de-korte.org>
+
+- Update to 2.4.57:
+    *) mod_proxy: Check before forwarding that a nocanon path has not been
+      rewritten with spaces during processing.  [Yann Ylavic]
+
+    *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
+      double encode encoded slashes in the URL sent by the reverse proxy to the
+      backend. [Ruediger Pluem]
+
+    *) mod_http2: fixed a crash during connection termination. See PR 66539.
+      [Stefan Eissing]
+
+    *) mod_rewrite: Fix a 2.4.56 regression for substitutions ending
+      in a question mark. PR66547. [Eric Covener]
+
+    *) mod_rewrite: Add "BCTLS" and "BNE" RewriteRule flags. Re-allow encoded
+      characters on redirections without the "NE" flag. 
+      [Yann Ylavic, Eric Covener]
+
+    *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
+      to the origin server, when using mapping=encoded|servlet.  [Yann Ylavic]
+
+    *) mod_mime: Do not match the extention against possible query string
+      parameters in case ProxyPass was used with the nocanon option.
+      [Ruediger Pluem]
+
 -------------------------------------------------------------------
 Wed Mar  8 19:44:32 UTC 2023 - David Anes <david.anes@suse.com>
 
diff --git a/apache2.spec b/apache2.spec
index ff36d5d..1be1e4a 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -107,7 +107,7 @@
 %define build_http2 1
 
 Name:           apache2%{psuffix}
-Version:        2.4.56
+Version:        2.4.57
 Release:        0
 Summary:        The Apache HTTPD Server
 License:        Apache-2.0
diff --git a/httpd-2.4.56.tar.bz2 b/httpd-2.4.56.tar.bz2
deleted file mode 100644
index b694014..0000000
--- a/httpd-2.4.56.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c
-size 7456418
diff --git a/httpd-2.4.56.tar.bz2.asc b/httpd-2.4.56.tar.bz2.asc
deleted file mode 100644
index e4beaa8..0000000
--- a/httpd-2.4.56.tar.bz2.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEZbLUT+dL1ePeOsPwgngd5G1ZVPoFAmQFCgEACgkQgngd5G1Z
-VPr0HhAAho+G5ExeMUPh7N8rDRJNswryTarzrphSO9kcll9cOcwPFxAsrp06aeaX
-PEnRh3iVIncHXy8i+Jgj4U+srnSNWoU6x0RbmUju4kv2xXYHXNJieOGRanmE03Hu
-hHq7Nv7KKb3GtYneof9pGboCR32LklJGSqEe8tpaW4f9y+HGOMflxpCLMqOAukyD
-i8buHUvQ9OEC5TKbefq+eSkL0ndi8993pNP8k2fw+AQi5oHZe4gcEeUXCh4Eo9Bj
-+bfPnIjS2A9znQ3IkWk1zz5WAUJIz1FfokDFrIZvEFf7+Vv48Fg0h7YfwgtT3sAs
-Bz4ndUeG4DFKb0XwZ5uqnjeHkmRBn65FS+aXemhT1ilr3dx28O178BQ8gOv4FCYW
-ijrefUxyz0WJYeD1qxhvWewXCEyzwSdiNCItfkKAl0g0b2VJnWjhx302QSjwaRT/
-Qeh+bxGneDigyTy9eq2gdluUH/QoxwS+KVz+kp8xPoXJAkNT+2YOjpijOtnTMqQ0
-zTpTWS6f9WLXVBX38oOF3EM915RQcGmGWVp3RRaxh6WPmR1rlf/zIih4XqZn68NH
-qCjmRjE1ctG87ant/immcCrJ5GiSR9gHXhKMf7KLCUP3582fFuwvh0K9uO8z/Yfw
-j/Ppae3Y/4CPd8Yk6tB90eFFHWusMHtcUD/mMKMOnSdVWxR7IGA=
-=wk6o
------END PGP SIGNATURE-----
diff --git a/httpd-2.4.57.tar.bz2 b/httpd-2.4.57.tar.bz2
new file mode 100644
index 0000000..953663d
--- /dev/null
+++ b/httpd-2.4.57.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a
+size 7457022
diff --git a/httpd-2.4.57.tar.bz2.asc b/httpd-2.4.57.tar.bz2.asc
new file mode 100644
index 0000000..5d25946
--- /dev/null
+++ b/httpd-2.4.57.tar.bz2.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEZbLUT+dL1ePeOsPwgngd5G1ZVPoFAmQpqJUACgkQgngd5G1Z
+VPrSqhAAge2udhX49FI9zwhoxeCND0dxB/DZ8vWc6MbDryYUYZBA2+o7cvwSRSdZ
+fxghFliJUWDSDD7YFjIrsAKPcjdKS2vn6+vmNRU05dw+JoZuQuyzg9PMuEOo3qRN
+poVd7SsxFhAT3ow6+j2ns3ei+B87BWrgkN6P2A4UNiUKKej+EACL3JnrOGbcPoLa
+ThEdphd5B6qTegw3Sz3aHgJ06833mH5KdrUNXwjmhsZCdgmBORyepjAQFKQChOq6
+JExsk/PTPgy0KX27IWMgrgQohW0zEzr8BtrZsu+DXxuhjen7bKm06uEoYDCR6xF1
+gu/oGBLVuDkktnRfleGUtmXoJ+yVMyz06ILL/ka5Jy3ob8sdWqD37oAcGQJeZYog
+uUnW+FoCmfv6uLRxZbFr2SCr2Jc8cnI45cPpppG0OraBJHHja99W60lInDpjFvHF
+U9Ev+UNU3PwtYuIhwp8tJB61cnQzxyH0Frt5lQfXxPKWTuFY3MSuoNJi1x3IqZvx
+fan2kxN0R0RyvXOhD6eJcQpydRHNDj/zgIo46gL7XRPB4aFBZRPyXwTVejcT6juL
+CHX/AUk18DIlBd+X7wJ115UQg9m6bABrj+Jg6ujoTb62Vstuju3P6XJ/qbCpGQcY
+ZyLOwbFiDD8CMm06ELQixDa9momkXXWH6mH+cEQDkPl+Scz5pf0=
+=qbuf
+-----END PGP SIGNATURE-----