Merge branch 'master' into master

Author: longbai

examples/persistent_fop_status.php

@@ -3,10 +3,16 @@
 
 use Qiniu\Processing\PersistentFop;
 
+$pfop = new Qiniu\Processing\PersistentFop(null, null);
+
 // 触发持久化处理后返回的 Id
-$persistentId = 'z0.564d5f977823de48a85ece59';
+$persistentId = 'z1.5b8a48e5856db843bc24cfc3';
 
 // 通过persistentId查询该 触发持久化处理的状态
-$status = PersistentFop::status($persistentId);
+list($ret, $err) = $pfop->status($persistentId);
 
-var_dump($status);
+if ($err) {
+    print_r($err);
+} else {
+    print_r($ret);
+}

examples/upload_and_callback.php

@@ -4,6 +4,13 @@
 use Qiniu\Auth;
 use Qiniu\Storage\UploadManager;
 
+// use Qiniu\Config;
+// use Qiniu\Zone;
+
+// 指定zone上传
+// $zone = Zone::zoneZ0(); //华东QVM内网上传指定host
+// $config = new Config($zone);
+
 $accessKey = getenv('QINIU_ACCESS_KEY');
 $secretKey = getenv('QINIU_SECRET_KEY');
 $bucket = getenv('QINIU_TEST_BUCKET');
@@ -20,6 +27,8 @@
 //上传文件的本地路径
 $filePath = './php-logo.png';
 
+//指定 config
+// $uploadMgr = new UploadManager($config);
 $uploadMgr = new UploadManager();
 
 list($ret, $err) = $uploadMgr->putFile($uptoken, null, $filePath);

src/Qiniu/Cdn/CdnManager.php

@@ -175,6 +175,7 @@ public static function createTimestampAntiLeechUrl($rawUrl, $encryptKey, $durati
         $deadline = time() + $durationInSeconds;
         $expireHex = dechex($deadline);
         $path = isset($parsedUrl['path']) ? $parsedUrl['path'] : '';
+        $path = implode('/', array_map('rawurlencode', explode('/', $path)));
 
         $strToSign = $encryptKey . $path . $expireHex;
         $signStr = md5($strToSign);

src/Qiniu/Zone.php

@@ -52,6 +52,32 @@ public static function zone0()
         return $Zone_z0;
     }
 
+    //华东机房内网上传
+    public static function zoneZ0()
+    {
+        $Zone_z01 = new Zone(
+            array("free-qvm-z0-xs.qiniup.com"),
+            'rs.qbox.me',
+            'rsf.qbox.me',
+            'api.qiniu.com',
+            'iovip.qbox.me'
+        );
+        return $Zone_z01;
+    }
+
+    //华北机房内网上传
+    public static function zoneZ1()
+    {
+        $Zone_z12 = new Zone(
+            array("free-qvm-z1-zz.qiniup.com"),
+            "rs-z1.qbox.me",
+            "rsf-z1.qbox.me",
+            "api-z1.qiniu.com",
+            "iovip-z1.qbox.me"
+        );
+        return $Zone_z12;
+    }
+
     //华北机房
     public static function zone1()
     {

tests/Qiniu/Tests/ResumeUpTest.php

@@ -35,7 +35,7 @@ public function test4ML()
     public function test4ML2()
     {
         $key = 'resumePutFile4ML';
-        $zone = new Zone(array('up.fake.qiniu.com'), array('up.qiniup.com'));
+        $zone = new Zone(array('up.qiniup.com'));
         $cfg = new Config($zone);
         $upManager = new UploadManager($cfg);
         $token = $this->auth->uploadToken($this->bucketName, $key);