[apache2] 01/02: Revert REDIRECT_URL to pre-2.4.17 behavior

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit d578473a7658a60f50706745a30663552ffb2df8
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Oct 31 22:52:16 2015 +0100

    Revert REDIRECT_URL to pre-2.4.17 behavior
---
 debian/changelog                         |  7 +++++++
 debian/patches/revert-REDIRECT_URL.patch | 33 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index db7298b..5d16e9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.17-2) UNRELEASED; urgency=medium
+
+  * Revert REDIRECT_URL to pre-2.4.17 behavior for now. The change broke
+    lots of web-apps. Closes: #803353
+
+ -- Stefan Fritsch <sf at debian.org>  Sat, 31 Oct 2015 22:51:31 +0100
+
 apache2 (2.4.17-1) unstable; urgency=medium
 
   [ Stefan Fritsch ]
diff --git a/debian/patches/revert-REDIRECT_URL.patch b/debian/patches/revert-REDIRECT_URL.patch
new file mode 100644
index 0000000..283fbf7
--- /dev/null
+++ b/debian/patches/revert-REDIRECT_URL.patch
@@ -0,0 +1,33 @@
+# Revert REDIRECT_URL to pre-2.4.17 behavior
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803353
+# https://bz.apache.org/bugzilla/show_bug.cgi?id=57785
+--- apache2.orig/server/util_script.c
++++ apache2/server/util_script.c
+@@ -282,25 +282,12 @@ AP_DECLARE(void) ap_add_common_vars(requ
+     /* Apache custom error responses. If we have redirected set two new vars */
+ 
+     if (r->prev) {
+-        /* PR#57785: reconstruct full URL here */
+-        apr_uri_t *uri = &r->prev->parsed_uri;
+-        if (!uri->scheme) {
+-            uri->scheme = (char*)ap_http_scheme(r->prev);
+-        }
+-        if (!uri->port) {
+-            uri->port = ap_get_server_port(r->prev);
+-            uri->port_str = apr_psprintf(r->pool, "%u", uri->port);
+-        }
+-        if (!uri->hostname) {
+-            uri->hostname = (char*)ap_get_server_name_for_url(r->prev);
+-        }
+         add_unless_null(e, "REDIRECT_QUERY_STRING", r->prev->args);
+-        add_unless_null(e, "REDIRECT_URL",
+-                        apr_uri_unparse(r->pool, uri, 0));
++        add_unless_null(e, "REDIRECT_URL", r->prev->uri);
+     }
+ 
+     if (e != r->subprocess_env) {
+-        apr_table_overlap(r->subprocess_env, e, APR_OVERLAP_TABLES_SET);
++      apr_table_overlap(r->subprocess_env, e, APR_OVERLAP_TABLES_SET);
+     }
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index aa0aae4..0942c53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ reproducible_builds.diff
 
 # This patch is applied manually
 #suexec-custom.patch
+revert-REDIRECT_URL.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git