Merge branch 'master' into master

Author: jemygraw

examples/upload_and_pfop.php

@@ -12,7 +12,6 @@
 
 // 在七牛保存的文件名
 $key = 'php-logo.png';
-$token = $auth->uploadToken($bucket);
 $uploadMgr = new UploadManager();
 
 $pfop = "imageMogr2/rotate/90|saveas/" . \Qiniu\base64_urlSafeEncode($bucket . ":php-logo-rotate.png");

src/Qiniu/Http/Client.php

@@ -83,7 +83,7 @@ public static function sendRequest($request)
             CURLOPT_HEADER => true,
             CURLOPT_NOBODY => false,
             CURLOPT_CUSTOMREQUEST => $request->method,
-            CURLOPT_URL => $request->url
+            CURLOPT_URL => $request->url,
         );
 
         // Handle open_basedir & safe mode

src/Qiniu/Http/Response.php

@@ -130,7 +130,7 @@ public function json()
 
     private static function bodyJson($body)
     {
-        return \Qiniu\json_decode((string)$body, true, 512);
+        return \Qiniu\json_decode((string) $body, true, 512);
     }
 
     public function xVia()
@@ -170,7 +170,7 @@ public function needRetry()
 
     private static function isJson($headers)
     {
-        return array_key_exists('Content-Type', $headers) &&
+        return array_key_exists('content-type', $headers) &&
         strpos($headers['Content-Type'], 'application/json') === 0;
     }
 }