Merge pull request #311 from qiniu/develop

update CdnManager.php
qiniu · Aug 1, 2019 · abf34f8 · abf34f8
2 parents afe7d87 + c1867c2
commit abf34f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,8 @@ php:
   - 5.6
   - 7.0
 
+dist: trusty
+
 before_script:
   - export QINIU_TEST_ENV="travis"
   - travis_retry composer self-update

diff --git a/src/Qiniu/Cdn/CdnManager.php b/src/Qiniu/Cdn/CdnManager.php
@@ -170,23 +170,16 @@ private function post($url, $body)
     public static function createTimestampAntiLeechUrl($rawUrl, $encryptKey, $durationInSeconds)
     {
         $parsedUrl = parse_url($rawUrl);
-
         $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);
-
-        $url = $parsedUrl['scheme'].'://'.$parsedUrl['host'].$path;
-
         if (isset($parsedUrl['query'])) {
-            $signedUrl = $url . '&sign=' . $signStr . '&t=' . $expireHex;
+            $signedUrl = $rawUrl . '&sign=' . $signStr . '&t=' . $expireHex;
         } else {
-            $signedUrl = $url . '?sign=' . $signStr . '&t=' . $expireHex;
+            $signedUrl = $rawUrl . '?sign=' . $signStr . '&t=' . $expireHex;
         }
-
         return $signedUrl;
     }
 }
diff --git a/src/Qiniu/Config.php b/src/Qiniu/Config.php
@@ -3,7 +3,7 @@
 
 final class Config
 {
-    const SDK_VER = '7.2.9';
+    const SDK_VER = '7.2.10';
 
     const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小，该参数为接口规格，不能修改