Merge pull request #116 from stepanselyuk/master

Additional way to calculate the request body size.

Author: Fosco Marotto

src/Facebook/HttpClients/FacebookCurlHttpClient.php

@@ -295,8 +295,11 @@ private function getHeaderSize()
     // This corrects a Curl bug where header size does not account
     // for additional Proxy headers.
     if ( self::needsCurlProxyFix() ) {
-      if ( stripos($this->rawResponse, self::CONNECTION_ESTABLISHED) !== false ) {
-        $headerSize += mb_strlen(self::CONNECTION_ESTABLISHED);
+      // Additional way to calculate the request body size.
+      if (preg_match('/Content-Length: (\d+)/', $this->rawResponse, $m)) {
+          $headerSize = mb_strlen($this->rawResponse) - $m[1];
+      } elseif (stripos($this->rawResponse, self::CONNECTION_ESTABLISHED) !== false) {
+          $headerSize += mb_strlen(self::CONNECTION_ESTABLISHED);
       }
     }
 

tests/HttpClients/AbstractTestHttpClient.php

@@ -7,6 +7,8 @@ abstract class AbstractTestHttpClient extends PHPUnit_Framework_TestCase
 Content-Type: text/html; charset=utf-8
 Location: https://foobar.com/\r\n\r\n";
   protected $fakeRawProxyHeader = "HTTP/1.0 200 Connection established\r\n\r\n";
+  protected $fakeRawProxyHeader2 = "HTTP/1.0 200 Connection established
+Proxy-agent: Kerio Control/7.1.1 build 1971\r\n\r\n";
   protected $fakeRawHeader = "HTTP/1.1 200 OK
 Etag: \"9d86b21aa74d74e574bbb35ba13524a52deb96e3\"
 Content-Type: text/javascript; charset=UTF-8

tests/HttpClients/FacebookCurlHttpClientTest.php

@@ -298,6 +298,34 @@ public function testProperlyHandlesProxyHeadersWithCurlBug()
     $this->assertEquals($headers, $this->fakeHeadersAsArray);
   }
 
+  public function testProperlyHandlesProxyHeadersWithCurlBug2()
+  {
+        $rawHeader = $this->fakeRawProxyHeader2 . $this->fakeRawHeader;
+        $this->curlMock
+            ->shouldReceive('getinfo')
+            ->with(CURLINFO_HEADER_SIZE)
+            ->once()
+            ->andReturn(mb_strlen($this->fakeRawHeader)); // Mimic bug that doesn't count proxy header
+        $this->curlMock
+            ->shouldReceive('version')
+            ->once()
+            ->andReturn(array('version_number' => self::CURL_VERSION_BUGGY));
+        $this->curlMock
+            ->shouldReceive('exec')
+            ->once()
+            ->andReturn($rawHeader . $this->fakeRawBody);
+
+        $this->curlClient->sendRequest();
+        list($rawHeaders, $rawBody) = $this->curlClient->extractResponseHeadersAndBody();
+
+        $this->assertEquals($rawHeaders, trim($rawHeader));
+        $this->assertEquals($rawBody, $this->fakeRawBody);
+
+        $headers = FacebookCurlHttpClient::headersToArray($rawHeaders);
+
+        $this->assertEquals($headers, $this->fakeHeadersAsArray);
+  }
+
   public function testProperlyHandlesRedirectHeaders()
   {
     $rawHeader = $this->fakeRawRedirectHeader . $this->fakeRawHeader;