Merge pull request googleapis#270 from danielzhme/master

Remove HTTP/1.1 proxy header

Author: ianbarber

src/Google/IO/Abstract.php

@@ -28,7 +28,10 @@ abstract class Google_IO_Abstract
 {
   const UNKNOWN_CODE = 0;
   const FORM_URLENCODED = 'application/x-www-form-urlencoded';
-  const CONNECTION_ESTABLISHED = "HTTP/1.0 200 Connection established\r\n\r\n";
+  private static $CONNECTION_ESTABLISHED_HEADERS = array(
+    "HTTP/1.0 200 Connection established\r\n\r\n",
+    "HTTP/1.1 200 Connection established\r\n\r\n",
+  );
   private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
 
   /** @var Google_Client */
@@ -249,14 +252,18 @@ protected function updateCachedRequest($cached, $responseHeaders)
    */
   public function parseHttpResponse($respData, $headerSize)
   {
-    if (stripos($respData, self::CONNECTION_ESTABLISHED) !== false) {
-      $respData = str_ireplace(self::CONNECTION_ESTABLISHED, '', $respData);
-
-      // Subtract the proxy header size unless the cURL bug prior to 7.30.0
-      // is present which prevented the proxy header size from being taken into
-      // account.
-      if (!$this->needsQuirk()) {
-        $headerSize -= strlen(self::CONNECTION_ESTABLISHED);
+    // check proxy header
+    foreach (self::$CONNECTION_ESTABLISHED_HEADERS as $established_header) {
+      if (stripos($respData, $established_header) !== false) {
+        // existed, remove it
+        $respData = str_ireplace($established_header, '', $respData);
+        // Subtract the proxy header size unless the cURL bug prior to 7.30.0
+        // is present which prevented the proxy header size from being taken into
+        // account.
+        if (!$this->needsQuirk()) {
+          $headerSize -= strlen($established_header);
+        }
+        break;
       }
     }
 

tests/general/IoTest.php

@@ -237,20 +237,25 @@ public function responseChecker($io)
     $this->assertEquals(null, json_decode($body, true));
 
     // Test transforms from proxies.
-    $rawHeaders = Google_IO_Abstract::CONNECTION_ESTABLISHED
-        . "HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n";
-    $headersSize = strlen($rawHeaders);
-    // If we have a broken cURL version we have to simulate it to get the
-    // correct test result.
-    if ($hasQuirk && get_class($io) === 'Google_IO_Curl') {
-        $headersSize -= strlen(Google_IO_Abstract::CONNECTION_ESTABLISHED);
+    $connection_established_headers = array(
+      "HTTP/1.0 200 Connection established\r\n\r\n",
+      "HTTP/1.1 200 Connection established\r\n\r\n",
+    );
+    foreach ($connection_established_headers as $established_header) {
+        $rawHeaders = "{$established_header}HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n";
+        $headersSize = strlen($rawHeaders);
+        // If we have a broken cURL version we have to simulate it to get the
+        // correct test result.
+        if ($hasQuirk && get_class($io) === 'Google_IO_Curl') {
+            $headersSize -= strlen($established_header);
+        }
+        $rawBody = "{}";
+
+        $rawResponse = "$rawHeaders\r\n$rawBody";
+        list($headers, $body) = $io->parseHttpResponse($rawResponse, $headersSize);
+        $this->assertEquals(1, sizeof($headers));
+        $this->assertEquals(array(), json_decode($body, true));
     }
-    $rawBody = "{}";
-
-    $rawResponse = "$rawHeaders\r\n$rawBody";
-    list($headers, $body) = $io->parseHttpResponse($rawResponse, $headersSize);
-    $this->assertEquals(1, sizeof($headers));
-    $this->assertEquals(array(), json_decode($body, true));
   }
 
   public function processEntityRequest($io, $client)