Better proxy request scrubbing

See [Issue 122](#122)
nategood · May 21, 2014 · d485510 · d485510
1 parent 24a481d
commit d485510
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Httpful/Request.php b/src/Httpful/Request.php
@@ -207,10 +207,12 @@ public function send()
 
         $info = curl_getinfo($this->_ch);
 
-        //Remove the "HTTP/1.0 200 Connection established" string
-        if ($this->hasProxy() && false !== stripos($result, "HTTP/1.0 200 Connection established\r\n\r\n")) {
-            $result = str_ireplace("HTTP/1.0 200 Connection established\r\n\r\n", '', $result);
+        // Remove the "HTTP/1.x 200 Connection established" string and any other headers added by proxy
+        $proxy_regex = "/HTTP\/1\.[01] 200 Connection established.*?\r\n\r\n/s";
+        if ($this->hasProxy() && preg_match($proxy_regex, $result)) {
+            $result = preg_replace($proxy_regex, '', $result);
         }
+
         $response = explode("\r\n\r\n", $result, 2 + $info['redirect_count']);
 
         $body = array_pop($response);