Merge pull request #406 from sjlangley/master

Always use Google_Io_Stream on App Engine

Author: ianbarber

src/Google/Client.php

@@ -87,7 +87,7 @@ public function __construct($config = null)
     }
 
     if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
-      if (function_exists('curl_version') && function_exists('curl_exec')) {
+      if (function_exists('curl_version') && function_exists('curl_exec') && !$this->isAppEngine()) {
         $config->setIoClass("Google_IO_Curl");
       } else {
         $config->setIoClass("Google_IO_Stream");

tests/general/ApiClientTest.php

@@ -131,6 +131,7 @@ public function testAppEngineAutoConfig()
     $_SERVER['SERVER_SOFTWARE'] = 'Google App Engine';
     $client = new Google_Client();
     $this->assertInstanceOf('Google_Cache_Memcache', $client->getCache());
+    $this->assertInstanceOf('Google_Io_Stream', $client->getIo());
     unset($_SERVER['SERVER_SOFTWARE']);
   }