Merge pull request #87 from BluntBlade/qiniu-rs

修正一直重试上传出错片的Bug。

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGE LOG
 
+### v3.4.8
+
+- 修复断点续上传功能中一直重试上传出错片的Bug。[https://github.com/qiniu/ruby-sdk/pull/87](https://github.com/qiniu/ruby-sdk/pull/87) (#7205)
+
 ### v3.4.7
 
 - 停止追加新功能，仅进行Bug修正维护。  

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiniu-rs (3.4.7)
+    qiniu-rs (3.4.8)
       json (~> 1.7)
       mime-types (~> 1.19)
       rest-client (~> 1.6)
@@ -12,7 +12,7 @@ GEM
   specs:
     diff-lcs (1.1.3)
     fakeweb (1.3.0)
-    json (1.7.7)
+    json (1.8.1)
     mime-types (1.23)
     rake (10.0.3)
     rest-client (1.6.7)

lib/qiniu/rs/up.rb

@@ -230,6 +230,8 @@ module Qiniu
                         break
                     elsif i == retry_times && data["crc32"] != body_crc32
                         Log.logger.error %Q(Uploading block error. Expected crc32: #{body_crc32}, but got: #{data["crc32"]})
+                        # 上传重试达到上限，直接返回错误
+                        return [code, data]
                     end
                 end
             end

lib/qiniu/rs/version.rb

@@ -5,7 +5,7 @@ module Qiniu
     module Version
       MAJOR = 3
       MINOR = 4
-      PATCH = 7
+      PATCH = 8
       # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
       #
       # Example