From 1fa748bc1611126b0ddc1f6cc86d9926f1b743d2 Mon Sep 17 00:00:00 2001
From: "Matteo Nastasi (mop)" <nastasi@alternativeoutput.it>
Date: Tue, 10 Feb 2015 18:42:31 +0100
Subject: [PATCH] unset 'headitem' header entry when provider_proxy address

---
 web/Obj/provider_proxy.phh | 6 ++++--
 web/Obj/sac-a-push.phh     | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/Obj/provider_proxy.phh b/web/Obj/provider_proxy.phh
index b1a4d95..fc01aba 100644
--- a/web/Obj/provider_proxy.phh
+++ b/web/Obj/provider_proxy.phh
@@ -80,7 +80,7 @@ class ProviderProxy
         }
     }
 
-    function realip($header, $ip)
+    function realip(&$header, $ip)
     {
         fprintf(STDERR, "PP realip: [%d]\n", count($this->pp));
         if ($this->pp != NULL) {
@@ -89,7 +89,9 @@ class ProviderProxy
                 if ($pp_item->ipclass->check($ip)) {
                     if (isset($header[$pp_item->headitem])) {
                         fprintf(STDERR, "PP: match public proxy [%s][%s]\n", $pp_name, $header[$pp_item->headitem]);
-                        return ($header[$pp_item->headitem]);
+                        $ret = $header['POST_'.$pp_item->headitem] = $header[$pp_item->headitem];
+                        unset($header[$pp_item->headitem]);
+                        return ($ret);
                     }
                 }
             }
diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh
index 0d489d0..1d55c3e 100644
--- a/web/Obj/sac-a-push.phh
+++ b/web/Obj/sac-a-push.phh
@@ -719,7 +719,7 @@ class Sac_a_push {
                             // FOR TEST $header['X-Forwarded-For'] = '154.155.22.33';
                             $addr = $this->pproxy_realip($header, addrtoipv4($addr_full));
 
-                            printf("PATH: [%s]\n", $path);
+                            printf("PATH: [%s] [%s]\n", $path, print_r($header, TRUE));
                             if ($method == "POST" && $rest > 0) {
                                 if (isset($header['Expect']) && $header['Expect'] == '100-continue') {
                                     fprintf(STDERR, "\nPOSTA DE CHE\n\n");
@@ -963,7 +963,7 @@ class Sac_a_push {
         }  // while (...
     }  // function run(...
 
-    function pproxy_realip($header, $ip_str)
+    function pproxy_realip(&$header, $ip_str)
     {
         return ($this->provider_proxy->realip($header, $ip_str));
     }
-- 
2.17.1