Merge branch 'master' of github.com:qiniu/php-sdk into config_uphost

Author: longbai

src/Qiniu/Http/Client.php

@@ -83,9 +83,14 @@ private static function sendRequest($request)
             CURLOPT_HEADER => true,
             CURLOPT_NOBODY => false,
             CURLOPT_CUSTOMREQUEST  => $request->method,
-            CURLOPT_FOLLOWLOCATION => 1,
             CURLOPT_URL => $request->url
         );
+
+        // Handle open_basedir & safe mode
+        if (!ini_get('safe_mode') && !ini_get('open_basedir'))
+        {
+            $options[CURLOPT_FOLLOWLOCATION] = true;
+        }
 
         if (!empty($request->headers)) {
             $headers = array();

src/Qiniu/Storage/BucketManager.php

@@ -208,7 +208,7 @@ public function changeMime($bucket, $key, $mime)
      *                                  ]
      * @link  http://developer.qiniu.com/docs/v6/api/reference/rs/fetch.html
      */
-    public function fetch($url, $bucket, $key)
+    public function fetch($url, $bucket, $key = null)
     {
 
         $resource = \Qiniu\base64_urlSafeEncode($url);

tests/Qiniu/Tests/BucketTest.php

@@ -131,6 +131,13 @@ public function testFetch()
         );
         $this->assertArrayHasKey('key', $ret);
         $this->assertNull($error);
+ 
+        list($ret, $error) = $this->bucketManager->fetch(
+            'http://developer.qiniu.com/docs/v6/sdk/php-sdk.html',
+            $this->bucketName
+        );
+        $this->assertArrayHasKey('key', $ret);
+        $this->assertNull($error);
     }
 
     public function testBatchCopy()