aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-29 09:13:08 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-01-29 09:13:08 +0000
commitc5f2c66270be83a8263cce40cfe9a516c11e6e27 (patch)
tree7fd6c31d565bb3de31cf5fc18f9c5dcf862ba6f9
parent0cee7f8e2f19196625501118d68b2acb58313acf (diff)
downloadruby-c5f2c66270be83a8263cce40cfe9a516c11e6e27.tar.gz
io.c: remove socket check
* io.c (nogvl_copy_stream_sendfile): remove socket check [ruby-core:59856][Feature #9427] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 08aa770b5f..3a6b031a86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 29 18:09:48 2014 Eric Wong <e@80x24.org>
+
+ * io.c (nogvl_copy_stream_sendfile): remove socket check
+ [ruby-core:59856][Feature #9427]
+
Wed Jan 29 04:29:54 2014 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/openssl/ossl_ssl.c: pass read_nonblock options to underlying IO
diff --git a/io.c b/io.c
index 6bab4f9378..00f9abc2c5 100644
--- a/io.c
+++ b/io.c
@@ -10062,8 +10062,6 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
stp->error_no = errno;
return -1;
}
- if ((dst_stat.st_mode & S_IFMT) != S_IFSOCK)
- return 0;
src_offset = stp->src_offset;
use_pread = src_offset != (off_t)-1;