Merge pull request #282 from breeze2/master

longbai · web-flow · commit 1577f3b24de4 · 2018-11-06T21:26:50.000+08:00
upload file with 'x-qn-meta-' params
diff --git a/src/Qiniu/Storage/UploadManager.php b/src/Qiniu/Storage/UploadManager.php
@@ -133,8 +133,9 @@ public static function trimParams($params)
         }
         $ret = array();
         foreach ($params as $k => $v) {
-            $pos = strpos($k, 'x:');
-            if ($pos === 0 && !empty($v)) {
+            $pos1 = strpos($k, 'x:');
+            $pos2 = strpos($k, 'x-qn-meta-');
+            if (($pos1 === 0 || $pos2 === 0) && !empty($v)) {
                 $ret[$k] = $v;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,9 @@ public static function trimParams($params)`
`133`	`133`	`}`
`134`	`134`	`$ret = array();`
`135`	`135`	`foreach ($params as $k => $v) {`
`136`		`- $pos = strpos($k, 'x:');`
`137`		`- if ($pos === 0 && !empty($v)) {`
	`136`	`+ $pos1 = strpos($k, 'x:');`
	`137`	`+ $pos2 = strpos($k, 'x-qn-meta-');`
	`138`	`+ if (($pos1 === 0 \|\| $pos2 === 0) && !empty($v)) {`
`138`	`139`	`$ret[$k] = $v;`
`139`	`140`	`}`
`140`	`141`	`}`