From 549b25fd501b0df4a4a8b5edccde6101edb0cd63 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 19 Jul 2010 10:09:53 +0000 Subject: event_machine: avoid race in unchunked fast pipe responses Using EM.enable_proxy with EM.attach seems to cause EM::Connection#receive_data callbacks to be fired before the proxy has a chance to act, leading the first few chunks of data being lost in the default receive_data handler. Instead just rely on EM.watch like the chunked pipe. --- t/fast-pipe-response.ru | 12 ++++++++++++ t/t0030-fast-pipe-response.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 t/fast-pipe-response.ru create mode 100755 t/t0030-fast-pipe-response.sh (limited to 't') diff --git a/t/fast-pipe-response.ru b/t/fast-pipe-response.ru new file mode 100644 index 0000000..01f4d59 --- /dev/null +++ b/t/fast-pipe-response.ru @@ -0,0 +1,12 @@ +# must be run without Rack::Lint since that clobbers to_path +use Rainbows::DevFdResponse +run(lambda { |env| + env['rainbows.autochunk'] = false + [ 200, + { + 'X-Rainbows-Autochunk' => 'no', + 'Content-Length' => ::File.stat('random_blob').size.to_s, + 'Content-Type' => 'application/octet-stream', + }, + IO.popen('cat random_blob', 'rb') ] +}) diff --git a/t/t0030-fast-pipe-response.sh b/t/t0030-fast-pipe-response.sh new file mode 100755 index 0000000..5acbc01 --- /dev/null +++ b/t/t0030-fast-pipe-response.sh @@ -0,0 +1,36 @@ +#!/bin/sh +. ./test-lib.sh +test -r random_blob || die "random_blob required, run with 'make $0'" + +t_plan 6 "fast pipe response for $model" + +t_begin "setup and startup" && { + rtmpfiles err + rainbows_setup $model + rainbows -E none -D fast-pipe-response.ru -c $unicorn_config + rainbows_wait_start +} + +t_begin "read random blob sha1" && { + random_blob_sha1=$(rsha1 < random_blob) +} + +t_begin "single request matches" && { + sha1=$(curl -sSfv 2> $err http://$listen/ | rsha1) + test -n "$sha1" + test x"$sha1" = x"$random_blob_sha1" +} + +t_begin "Content-Length header preserved in response" && { + grep "^< Content-Length:" $err +} + +t_begin "shutdown server" && { + kill -QUIT $rainbows_pid +} + +dbgcat r_err + +t_begin "check stderr" && check_stderr + +t_done -- cgit v1.2.3-24-ge0c7