Merge pull request #115 from longbai/7.0

fixed json with charset

Author: longbai

.travis.yml

@@ -8,10 +8,6 @@ php:
   - 5.5
   - 5.6
 before_script:
-  - export QINIU_ACCESS_KEY="QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm"
-  - export QINIU_SECRET_KEY="Bxckh6FA-Fbs9Yt3i3cbKVK22UPBmAOHJcL95pGz"
-  - export QINIU_TEST_BUCKET="phpsdk"
-  - export QINIU_TEST_KEY="php-logo.png"
   - export QINIU_TEST_ENV="travis"
   - travis_retry composer self-update
   - travis_retry composer install --no-interaction --prefer-source --dev

src/Qiniu/Http/Response.php

@@ -169,6 +169,7 @@ public function needRetry()
 
     private static function isJson($headers)
     {
-        return isset($headers['Content-Type']) && $headers['Content-Type'] == 'application/json';
+        return isset($headers['Content-Type']) &&
+        strpos($headers['Content-Type'], 'application/json') === 0;
     }
 }

tests/bootstrap.php

@@ -4,11 +4,11 @@
 
 use Qiniu\Auth;
 
-$accessKey = getenv('QINIU_ACCESS_KEY');
-$secretKey = getenv('QINIU_SECRET_KEY');
+$accessKey = 'QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm';
+$secretKey = 'Bxckh6FA-Fbs9Yt3i3cbKVK22UPBmAOHJcL95pGz';
 $testAuth = new Auth($accessKey, $secretKey);
-$bucketName = getenv('QINIU_TEST_BUCKET');
-$key = getenv('QINIU_TEST_KEY');
+$bucketName = 'phpsdk';
+$key = 'php-logo.png';
 
 $dummyAccessKey = 'abcdefghklmnopq';
 $dummySecretKey = '1234567890';