Merge pull request #172 from JellyBool/master

longbai · longbai · commit 3b65fe7f4f5f · 2016-01-21T15:03:25.000+08:00
Change buildUrl to support https
diff --git a/src/Qiniu/Processing/Operation.php b/src/Qiniu/Processing/Operation.php
@@ -44,13 +44,13 @@ public function execute($key, $fops)
         return array($resp->body, null);
     }
 
-    public function buildUrl($key, $fops)
+    public function buildUrl($key, $fops, $protocol = 'http')
     {
         if (is_array($fops)) {
             $fops = implode('|', $fops);
         }
 
-        $url = "http://$this->domain/$key?$fops";
+        $url = $protocol."://$this->domain/$key?$fops";
         if ($this->auth !== null) {
             $url = $this->auth->privateDownloadUrl($url, $this->token_expire);
         }

Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,13 @@ public function execute($key, $fops)`
`44`	`44`	`return array($resp->body, null);`
`45`	`45`	`}`
`46`	`46`
`47`		`- public function buildUrl($key, $fops)`
	`47`	`+ public function buildUrl($key, $fops, $protocol = 'http')`
`48`	`48`	`{`
`49`	`49`	`if (is_array($fops)) {`
`50`	`50`	`$fops = implode('\|', $fops);`
`51`	`51`	`}`
`52`	`52`
`53`		`- $url = "http://$this->domain/$key?$fops";`
	`53`	`+ $url = $protocol."://$this->domain/$key?$fops";`
`54`	`54`	`if ($this->auth !== null) {`
`55`	`55`	`$url = $this->auth->privateDownloadUrl($url, $this->token_expire);`
`56`	`56`	`}`