From 5aa5934da77c15e0920df34639cd9af1dee1766d Mon Sep 17 00:00:00 2001 From: Liang Tao Date: Tue, 8 Apr 2014 10:48:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E9=87=8D=E8=AF=95=E4=B8=8A=E4=BC=A0=E5=87=BA=E9=94=99=E7=89=87?= =?UTF-8?q?=E7=9A=84Bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/qiniu/rs/up.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/qiniu/rs/up.rb b/lib/qiniu/rs/up.rb index ec1663b..57f3da0 100755 --- a/lib/qiniu/rs/up.rb +++ b/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 From 35b16820963d39f91bd54bebba8b26a1ee8d6da7 Mon Sep 17 00:00:00 2001 From: Liang Tao Date: Tue, 8 Apr 2014 10:55:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ Gemfile.lock | 4 ++-- lib/qiniu/rs/version.rb | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6d978e..f076ea7 100644 --- a/CHANGELOG.md +++ b/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修正维护。 diff --git a/Gemfile.lock b/Gemfile.lock index a3103cf..455a3d1 100644 --- a/Gemfile.lock +++ b/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) diff --git a/lib/qiniu/rs/version.rb b/lib/qiniu/rs/version.rb index ca4a447..b2ca677 100755 --- a/lib/qiniu/rs/version.rb +++ b/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 MAJOR, MINOR, and PATCH with '.' # # Example