diff --git a/src/Qiniu/Storage/ResumeUploader.php b/src/Qiniu/Storage/ResumeUploader.php index 7253c932..659f4c6e 100644 --- a/src/Qiniu/Storage/ResumeUploader.php +++ b/src/Qiniu/Storage/ResumeUploader.php @@ -24,6 +24,7 @@ final class ResumeUploader private $contexts; private $host; private $currentUrl; + private $config; /** * 上传二进制流到七牛 @@ -52,6 +53,7 @@ public function __construct( $this->size = $size; $this->params = $params; $this->mime = $mime; + $this->config = $config; $this->host = $config::$upHost; $this->contexts = array(); } @@ -77,7 +79,7 @@ public function upload() $ret = $response->json(); } if ($response->statusCode < 0) { - $this->host = $config::$upHostBackup; + $this->host = $this->config::$upHostBackup; } if ($response->needRetry() || !isset($ret['crc32']) || $crc != $ret['crc32']) { $response = $this->makeBlock($data, $blockSize); diff --git a/tests/Qiniu/Tests/ResumeUpTest.php b/tests/Qiniu/Tests/ResumeUpTest.php index dd7e7e4a..a03abc1e 100644 --- a/tests/Qiniu/Tests/ResumeUpTest.php +++ b/tests/Qiniu/Tests/ResumeUpTest.php @@ -3,6 +3,8 @@ use Qiniu\Storage\ResumeUploader; use Qiniu\Storage\UploadManager; +use Qiniu\Zone; +use Qiniu\Config; class ResumeUpTest extends \PHPUnit_Framework_TestCase { @@ -29,6 +31,20 @@ public function test4ML() unlink($tempFile); } + public function test4ML2() + { + $key = 'resumePutFile4ML'; + $zone = new Zone('http://up.fake.com', 'http://up.qiniu.com'); + $cfg = new Config($zone); + $upManager = new UploadManager($cfg); + $token = $this->auth->uploadToken($this->bucketName, $key); + $tempFile = qiniuTempFile(4*1024*1024+10); + list($ret, $error) = $upManager->putFile($token, $key, $tempFile); + $this->assertNull($error); + $this->assertNotNull($ret['hash']); + unlink($tempFile); + } + // public function test8M() // { // $key = 'resumePutFile8M';