From: Steven Barth Date: Wed, 10 Jun 2009 23:28:16 +0000 (+0000) Subject: Some sendfile() under Linux 2.4 is broken X-Git-Tag: 0.9.0~208 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=690927bf6bb1fa52780266b3b7884c70d465632f;p=oweals%2Fluci.git Some sendfile() under Linux 2.4 is broken --- diff --git a/libs/nixio/lua/nixio/util.lua b/libs/nixio/lua/nixio/util.lua index 6f929519b..0e8c90c9a 100644 --- a/libs/nixio/lua/nixio/util.lua +++ b/libs/nixio/lua/nixio/util.lua @@ -23,6 +23,8 @@ local ZIOBLKSIZE = 65536 local socket = nixio.meta_socket local tls_socket = nixio.meta_tls_socket local file = nixio.meta_file +local uname = nixio.uname() +local ZBUG = uname.sysname == "Linux" and uname.release:sub(1, 3) == "2.4" function consume(iter) local tbl = {} @@ -191,7 +193,7 @@ function meta.copyz(self, fd, size) local sent, lsent, code, msg = 0 local splicable - if self:is_file() then + if not ZBUG and self:is_file() then local ftype = self:stat("type") if nixio.sendfile and fd:is_socket() and ftype == "reg" then repeat