From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] wbuf: fix writev calls for vectors
Date: Tue, 7 Apr 2015 22:08:43 +0000 [thread overview]
Message-ID: <1428444523-8333-1-git-send-email-e@80x24.org> (raw)
kgio_writev returns nil on success instead of the number of bytes
written, so we must manually calculate the number of bytes written
intead :x
This is triggerable when sending giant chunked responses.
---
lib/yahns/wbuf.rb | 7 ++++++-
test/test_proxy_pass.rb | 27 +++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/lib/yahns/wbuf.rb b/lib/yahns/wbuf.rb
index 42776cf..9888a8c 100644
--- a/lib/yahns/wbuf.rb
+++ b/lib/yahns/wbuf.rb
@@ -41,6 +41,11 @@ class Yahns::Wbuf # :nodoc:
@busy = busy # may be false
end
+ def wbuf_writev(buf)
+ @tmpio.kgio_writev(buf)
+ buf.inject(0) { |n, s| n += s.size }
+ end
+
def wbuf_write(c, buf)
# try to bypass the VFS layer and write directly to the socket
# if we're all caught up
@@ -54,7 +59,7 @@ class Yahns::Wbuf # :nodoc:
end until @busy
@tmpio ||= Yahns::TmpIO.new(@tmpdir)
- @sf_count += String === buf ? @tmpio.write(buf) : @tmpio.kgio_writev(buf)
+ @sf_count += String === buf ? @tmpio.write(buf) : wbuf_writev(buf)
# we spent some time copying to the FS, try to write to
# the socket again in case some space opened up...
diff --git a/test/test_proxy_pass.rb b/test/test_proxy_pass.rb
index f5ae12f..e4e97d1 100644
--- a/test/test_proxy_pass.rb
+++ b/test/test_proxy_pass.rb
@@ -2,6 +2,7 @@
# License: GPLv3 or later (https://www.gnu.org/licenses/gpl-3.0.txt)
require_relative 'server_helper'
require 'json'
+require 'digest'
class TestProxyPass < Testcase
ENV["N"].to_i > 1 and parallelize_me!
@@ -17,6 +18,8 @@ class TestProxyPass < Testcase
BIG_HEADER = [%w(Content-Type text/plain), %W(Content-Length #{OMFG.size})]
3000.times { |i| BIG_HEADER << %W(X-#{i} BIG-HEADER!!!!!!!!!!!!!!) }
BIG_HEADER.freeze
+ STR4 = 'abcd' * (256 * 1024)
+ NCHUNK = 50
class ProxiedApp
def call(env)
@@ -27,6 +30,19 @@ class TestProxyPass < Testcase
when '/giant-body'
h = [ %W(Content-Length #{OMFG.size}), %w(Content-Type text/plain) ]
[ 200, h, [ OMFG ] ]
+ when '/giant-chunky-body'
+ h = [ %w(content-type text/pain), %w(transfer-encoding chunked) ]
+ chunky = Object.new
+ def chunky.each
+ head = STR4.size.to_s(16) << "\r\n"
+ NCHUNK.times do
+ yield head
+ yield STR4
+ yield "\r\n".freeze
+ end
+ yield "0\r\n\r\n"
+ end
+ [ 200, h, chunky ]
when '/big-headers'
[ 200, BIG_HEADER, [ OMFG ] ]
when '/oversize-headers'
@@ -281,6 +297,17 @@ class TestProxyPass < Testcase
assert_equal 200, res.code.to_i
assert_equal OMFG, res.body
+ # giant chunky body
+ sha1 = Digest::SHA1.new
+ http.request(Net::HTTP::Get.new('/giant-chunky-body')) do |response|
+ response.read_body do |chunk|
+ sha1.update(chunk)
+ end
+ end
+ check = Digest::SHA1.new
+ NCHUNK.times { check.update(STR4) }
+ assert_equal check.hexdigest, sha1.hexdigest
+
# giant PUT content-length
req = Net::HTTP::Put.new('/')
req.body_stream = StringIO.new(OMFG)
--
EW
reply other threads:[~2015-04-07 22:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/yahns/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428444523-8333-1-git-send-email-e@80x24.org \
--to=e@80x24.org \
--cc=yahns-public@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/yahns.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).