From 512a73ef7e40be5ec95604bd7a7a41455008f84a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 12 Apr 2024 10:32:35 +0200
Subject: Merging debian version 2.4.59-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/perl-framework/t/conf/extra.conf.in | 71 +++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

(limited to 'debian/perl-framework/t/conf/extra.conf.in')

diff --git a/debian/perl-framework/t/conf/extra.conf.in b/debian/perl-framework/t/conf/extra.conf.in
index a684f76..2719985 100644
--- a/debian/perl-framework/t/conf/extra.conf.in
+++ b/debian/perl-framework/t/conf/extra.conf.in
@@ -254,7 +254,7 @@
 
     ### Proxy pass-through to env.pl
     RewriteRule ^/modules/rewrite/proxy2/(.*)$ http://@SERVERNAME@:@PORT@/modules/cgi/$1 [L,P]
-    
+
     ### Pass-through conditional on QUERY_STRING
     RewriteCond %{QUERY_STRING} horse=trigger
     RewriteRule ^/modules/rewrite/proxy3/(.*)$ http://@SERVERNAME@:@PORT@/modules/cgi/$1 [L,P]
@@ -269,6 +269,35 @@
     RewriteRule ^/modules/rewrite/cookie/none - [CO=NAME3:VAL:localhost:86400:/0:secure:httponly:none]
     RewriteRule ^/modules/rewrite/cookie/foo - [CO=NAME3:VAL:localhost:86400:/0:secure:httponly:foo]
 
+    RewriteRule ^/modules/rewrite/escaping/local/(.*) /?$1
+    RewriteRule ^/modules/rewrite/escaping/local_b/(.*) /?$1 [B]
+    RewriteRule ^/modules/rewrite/escaping/local_b_justslash/(.*) /?$1 [B=/]
+
+    RewriteRule ^/modules/rewrite/escaping/qsd-like/(.*) /$1? [R]
+    RewriteRule ^/modules/rewrite/escaping/qsd-like-plus-qsa/(.*) /$1? [R,QSA]
+    RewriteRule ^/modules/rewrite/escaping/qsd-like-plus-qsa-qsl/(.*) /$1? [R,QSA,QSL]
+
+    <IfVersion >= 2.4.57>
+      RewriteRule ^/modules/rewrite/escaping/local_bctls/(.*) /?$1 [BCTLS]
+      RewriteRule ^/modules/rewrite/escaping/local_bctls_andslash/(.*) /?$1 [B=/,BCTLS]
+      RewriteRule ^/modules/rewrite/escaping/local_bctls_nospace/(.*) /?$1 "[BCTLS,BNE= ?]"
+      RewriteRule ^/modules/rewrite/escaping/local_b_noslash/(.*) /?$1 [B,BNE=/]
+    </IfVersion>
+    RewriteRule ^/modules/rewrite/escaping/redir/(.*) http://@SERVERNAME@:@PORT@/?$1 [R]
+    RewriteRule ^/modules/rewrite/escaping/redir_ne/(.*) http://@SERVERNAME@:@PORT@/?$1 [R,NE]
+    RewriteRule ^/modules/rewrite/escaping/proxy/(.*) http://@SERVERNAME@:@PORT@/?$1 [P]
+    RewriteRule ^/modules/rewrite/escaping/proxy_ne/(.*) http://@SERVERNAME@:@PORT@/?$1 [P,NE]
+    <LocationMatch ^/modules/rewrite/escaping/fixups/>
+      RewriteRule local/(.*) /?$1
+      RewriteRule redir/(.*) http://@SERVERNAME@:@PORT@/?$1 [R]
+      RewriteRule redir_ne/(.*) http://@SERVERNAME@:@PORT@/?$1 [R,NE]
+      RewriteRule proxy/(.*) http://@SERVERNAME@:@PORT@/?$1 [P]
+      RewriteRule proxy_ne/(.*) http://@SERVERNAME@:@PORT@/?$1 [P,NE]
+    </LocationMatch>
+
+   <Location /modules/rewrite/escaping>
+      Header always set rewritten-query "expr=%{QUERY_STRING}"
+   </Location>
    <VirtualHost cve_2011_3368_rewrite>
       DocumentRoot @SERVERROOT@/htdocs/modules/proxy
       RewriteEngine On
@@ -1462,6 +1491,11 @@ LimitRequestFields    32
 <IfModule mod_sed.c>
   AliasMatch /apache/sed/[^/]+/(.*) @DocumentRoot@/$1
 
+  <Location /apache/sed-echo>
+    SetHandler echo_post
+    SetInputFilter sed 
+  </Location>
+
   <Location /apache/sed/>
     AddOutputFilter sed .html
   </Location>
@@ -1469,6 +1503,39 @@ LimitRequestFields    32
   <Location /apache/sed/out-foo>
       OutputSed "s/foo/bar/g"
   </Location>
+  <Location /apache/sed-echo/input>
+      InputSed "s/foo/bar/g"
+  </Location>
+  <Location /apache/sed-echo/out-foo-grow>
+    SetOutputFilter sed
+    OutputSed "s/foo/barbarbarbar/g"
+  </Location>
 </IfModule>
 
-
+#
+# t/apache/pr64339.t test configuration
+# 
+<IfModule mod_xml2enc.c>
+   <IfModule mod_proxy_html.c>
+      <IfModule mod_proxy.c>
+         Alias /modules/xml2enc/back @SERVERROOT@/htdocs/modules/xml2enc
+         Alias /modules/xml2enc/back/iso @SERVERROOT@/htdocs/modules/xml2enc
+         <Location /modules/xml2enc/back>
+             AddType application/foo+xml fooxml
+             AddType application/notreallyxml notxml
+             AddType application/xml xml
+             AddType text/html isohtml
+             AddCharset ISO-8859-1 .isohtml
+             AddCharset UTF-8 .xml
+             AddCharset UTF-8 .fooxml
+         </Location>
+         <Location /modules/xml2enc/front>
+             ProxyHTMLEnable on
+             # mod_proxy_html needs some configuration.
+             ProxyHTMLURLMap / /blah
+             ProxyHTMLLinks a href
+             ProxyPass http://@SERVERNAME@:@PORT@/modules/xml2enc/back
+         </Location>
+      </IfModule>
+   </IfModule>
+</IfModule>
-- 
cgit v1.2.3