Merge pull request #110 from mishan/fix-issue-109

Address Issue #109

Author: ianbarber

src/Google/IO/Abstract.php

@@ -68,6 +68,12 @@ abstract public function setTimeout($timeout);
    */
   abstract public function getTimeout();
 
+  /**
+   * Determine whether "Connection Established" quirk is needed
+   * @return boolean
+   */
+  abstract protected function _needsQuirk();
+
   /**
    * @visible for testing.
    * Cache the response to an HTTP request if it is cacheable.
@@ -238,7 +244,8 @@ protected function updateCachedRequest($cached, $responseHeaders)
    */
   public function parseHttpResponse($respData, $headerSize)
   {
-    if (stripos($respData, self::CONNECTION_ESTABLISHED) !== false) {
+    // only strip this header if the sub-class needs this quirk
+    if ($this->_needsQuirk() && stripos($respData, self::CONNECTION_ESTABLISHED) !== false) {
       $respData = str_ireplace(self::CONNECTION_ESTABLISHED, '', $respData);
     }
 

src/Google/IO/Curl.php

@@ -25,6 +25,9 @@
 
 class Google_IO_Curl extends Google_IO_Abstract
 {
+  // hex for version 7.31.0
+  const NO_QUIRK_VERSION = 0x071F00;
+
   private $options = array();
   /**
    * Execute an HTTP Request
@@ -118,4 +121,15 @@ public function getTimeout()
   {
     return $this->options[CURLOPT_TIMEOUT];
   }
+
+  /**
+   * Determine whether "Connection Established" quirk is needed
+   * @return boolean
+   */
+  protected function _needsQuirk()
+  {
+    $ver = curl_version();
+    $versionNum = $ver['version_number'];
+    return $versionNum < static::NO_QUIRK_VERSION;
+  }
 }

src/Google/IO/Stream.php

@@ -156,6 +156,16 @@ public function getTimeout()
     return $this->options[self::TIMEOUT];
   }
 
+ /**
+   * Determine whether "Connection Established" quirk is needed
+   * @return boolean
+   */
+  protected function _needsQuirk()
+  {
+      // Stream needs the special quirk
+      return true;
+  }
+
   protected function getHttpResponseCode($response_headers)
   {
     $header_count = count($response_headers);