Fix handling for 204 with no content

Author: Ian Barber

examples/batch.php

@@ -35,7 +35,8 @@
  ************************************************/
 $client = new Google_Client();
 $client->setApplicationName("Client_Library_Examples");
-$apiKey = "<YOUR_API_KEY>";
+$apiKey = "<YOUR_API_KEY>"; // Change to your API key. 
+// Warn if the API key isn't changed!
 if ($apiKey == '<YOUR_API_KEY>') {
   echo missingApiKeyWarning();
 } else {

examples/simple-query.php

@@ -37,7 +37,8 @@
  ************************************************/
 $client = new Google_Client();
 $client->setApplicationName("Client_Library_Examples");
-$apiKey = "<YOUR_API_KEY>";
+$apiKey = "<YOUR_API_KEY>"; // Change this line.
+// Warn if the API key isn't changed.
 if ($apiKey == '<YOUR_API_KEY>') {
   echo missingApiKeyWarning();
 }

src/Google/IO/Abstract.php

@@ -271,7 +271,10 @@ public function parseHttpResponse($respData, $headerSize)
       $responseBody = substr($respData, $headerSize);
       $responseHeaders = substr($respData, 0, $headerSize);
     } else {
-      list($responseHeaders, $responseBody) = explode("\r\n\r\n", $respData, 2);
+      $responseSegments = explode("\r\n\r\n", $respData, 2);
+      $responseHeaders = $responseSegments[0];
+      $responseBody = isset($responseSegments[1]) ? $responseSegments[1] :
+                                                    null;
     }
 
     $responseHeaders = $this->getHttpResponseHeaders($responseHeaders);

tests/general/IoTest.php

@@ -236,6 +236,13 @@ public function responseChecker($io)
     $this->assertEquals(3, sizeof($headers));
     $this->assertEquals(null, json_decode($body, true));
 
+    // Test no content.
+    $rawerHeaders = "HTTP/1.1 204 No Content\r\n"
+      . "Date: Fri, 19 Sep 2014 15:52:14 GMT";
+    list($headers, $body) = $io->parseHttpResponse($rawerHeaders, 0);
+    $this->assertEquals(1, sizeof($headers));
+    $this->assertEquals(null, json_decode($body, true));
+
     // Test transforms from proxies.
     $connection_established_headers = array(
       "HTTP/1.0 200 Connection established\r\n\r\n",