Merge pull request #169 from longbai/resume_file_close

move file close outof resume

Author: longbai

src/Qiniu/Config.php

@@ -3,7 +3,7 @@
 
 final class Config
 {
-    const SDK_VER = '7.0.6';
+    const SDK_VER = '7.0.7';
 
     const BLOCK_SIZE = 4194304; //4*1024*1024 分块上传块大小，该参数为接口规格，不能修改
 

src/Qiniu/Storage/ResumeUploader.php

@@ -67,7 +67,6 @@ public function upload()
             $blockSize = $this->blockSize($uploaded);
             $data = fread($this->inputStream, $blockSize);
             if ($data === false) {
-                fclose($this->inputStream);
                 throw new \Exception("file read failed", 1);
             }
             $crc = \Qiniu\crc32_data($data);
@@ -85,13 +84,11 @@ public function upload()
             }
 
             if (! $response->ok() || !isset($ret['crc32'])|| $crc != $ret['crc32']) {
-                fclose($this->inputStream);
                 return array(null, new Error($this->currentUrl, $response));
             }
             array_push($this->contexts, $ret['ctx']);
             $uploaded += $blockSize;
         }
-        fclose($this->inputStream);
         return $this->makeFile();
     }
 

src/Qiniu/Storage/UploadManager.php

@@ -118,7 +118,9 @@ public function putFile(
             $mime,
             $this->config
         );
-        return $up->upload();
+        $ret = $up->upload();
+        fclose($file);
+        return $ret;
     }
 
     public static function trimParams($params)

tests/Qiniu/Tests/ResumeUpTest.php

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