From d2f240d7ea11738ba889668a669ffb7845d06e7b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 6 Jul 2010 09:58:40 +0000 Subject: fix string slicing under 1.9 after short writes Fortunately this only affects the hardly-used FiberSpawn and FiberPool concurrency models, and also unreleased revisions of Rev. 1.9 encoding is tricky to handle right when doing I/O in Ruby... --- t/t0016-onenine-encoding-is-tricky.sh | 28 ++++++++++++++++++++++++++++ t/t0016.rb | 15 +++++++++++++++ 2 files changed, 43 insertions(+) create mode 100755 t/t0016-onenine-encoding-is-tricky.sh create mode 100644 t/t0016.rb (limited to 't') diff --git a/t/t0016-onenine-encoding-is-tricky.sh b/t/t0016-onenine-encoding-is-tricky.sh new file mode 100755 index 0000000..8757e43 --- /dev/null +++ b/t/t0016-onenine-encoding-is-tricky.sh @@ -0,0 +1,28 @@ +#!/bin/sh +. ./test-lib.sh +t_plan 4 "proper handling of onenine encoding for $model" + +t_begin "setup and startup" && { + rainbows_setup $model + rainbows -D ./t0016.rb -c $unicorn_config + rainbows_wait_start + expect_sha1=8ff79d8115f9fe38d18be858c66aa08a1cc27a66 +} + +t_begin "response matches expected" && { + rm -f $ok + ( + curl -sSf http://$listen/ && echo ok > $ok + ) | rsha1 > $tmp + test x$expect_sha1 = x"$(cat $tmp)" +} + +t_begin "shutdown server" && { + kill -QUIT $rainbows_pid +} + +dbgcat r_err + +t_begin "check stderr" && check_stderr + +t_done diff --git a/t/t0016.rb b/t/t0016.rb new file mode 100644 index 0000000..98c9a2e --- /dev/null +++ b/t/t0016.rb @@ -0,0 +1,15 @@ +# -*- encoding: utf-8 -*- +module T0016 + CHUNK = '©' * 1024 * 1024 + BODY = (1..50).map { CHUNK } + HEADER = { + # BODY.inject(0) { |m,c| m += c.bytesize }.to_s, + 'Content-Length' => '104857600', + 'Content-Type' => 'text/plain', + } + + def self.call(env) + [ 200, HEADER, BODY ] + end +end +$0 == __FILE__ and T0016::BODY.each { |x| $stdout.syswrite(x) } -- cgit v1.2.3-24-ge0c7