From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 7C1071F6BD for ; Fri, 3 Feb 2017 22:58:05 +0000 (UTC) From: Eric Wong To: mogilefs-client-public@bogomips.org Subject: [PATCH] socket_common: expand IO#write garbage workaround to 2.0 and 2.1 Date: Fri, 3 Feb 2017 22:58:05 +0000 Message-Id: <20170203225805.31115-1-e@80x24.org> List-Id: On reading more carefully, it seems this change is from r34847 which landed in Ruby 2.0. So we still need to support Ruby 2.0 and 2.1 users. --- lib/mogilefs/socket_common.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/mogilefs/socket_common.rb b/lib/mogilefs/socket_common.rb index 886c738..212f5da 100644 --- a/lib/mogilefs/socket_common.rb +++ b/lib/mogilefs/socket_common.rb @@ -58,9 +58,10 @@ def readpartial(size, buf = "", timeout = 5) # Workaround for https://bugs.ruby-lang.org/issues/13085 # (excessive garbage from IO#write) - # This looks like it will be fixed in Ruby 2.5 final. + # This regression was introduced in Ruby 2.0 (r34847) + # and looks like it will be fixed in Ruby 2.5 final. if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && - RUBY_VERSION.to_f >= 2.2 && RUBY_VERSION.to_f <= 2.4 + RUBY_VERSION.to_f >= 2.0 && RUBY_VERSION.to_f <= 2.4 def write(buf) # Blocking TCP writes would error out long before one day, # and MogileFS won't allow file creations which take over a day. -- EW