From c2e03dec03a56ab77042ee03a993015986fe129a Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Mon, 16 Sep 2019 09:46:33 +0200
Subject: [PATCH] fix: [apache] proxy rewrites response header only if needed

Previously, we had issues (for instance with nextcloud) with the 'Location'
header using the custom scheme "nc://" being rewritten by "ProxyPassReverse /".
This newer stance avoids rewriting this scheme, and continue to work correctly.
---
 apache/lib/common | 2 +-
 apache/test/vhost | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apache/lib/common b/apache/lib/common
index 617b50bc..7a70f2ed 100644
--- a/apache/lib/common
+++ b/apache/lib/common
@@ -703,7 +703,7 @@ __vhost_proxy_statement() {
     ProxyPass / http://$target/ ${proxy_pass_options[*]}
     <Location / >
 $(__vhost_creds_statement "$cfg" "$dest" | prefix "        ")
-        ProxyPassReverse /
+        ProxyPassReverse http://$target/
     </Location>
 $([ "$protocol" == "https" ] && echo "    SSLProxyEngine On")
 </IfModule>
diff --git a/apache/test/vhost b/apache/test/vhost
index ebcd4f7d..497ca192 100644
--- a/apache/test/vhost
+++ b/apache/test/vhost
@@ -168,7 +168,7 @@ is out part '
             AuthName "private"
             AuthUserFile /etc/apache2/sites-enabled/www.example.com.passwd
             Require valid-user
-            ProxyPassReverse /
+            ProxyPassReverse http://popo:3333/
         </Location>
 '
 
@@ -290,7 +290,7 @@ is out '<VirtualHost *:80>
         ProxyPass / http://popo:3333/ retry=0
         <Location / >
             Allow from all
-            ProxyPassReverse /
+            ProxyPassReverse http://popo:3333/
         </Location>
 
     </IfModule>
@@ -343,7 +343,7 @@ is out '<VirtualHost *:80>
           ProxyPass / http://popo:3333/ retry=0
           <Location / >
               Allow from all
-              ProxyPassReverse /
+              ProxyPassReverse http://popo:3333/
           </Location>
           SSLProxyEngine On
       </IfModule>