From dc77752eb7bfe528c60dc0ac028717877342e22a Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 30 Dec 2010 08:32:21 +0000
Subject: coolio_thread_*: fix 416 response handling

After beefing up and enabling byte range tests for "sendfile"
(and no just IO.copy_stream), we noticed threaded-Coolio
variants did not handle invalid byte ranges correctly.
---
 t/t0023-sendfile-byte-range.sh | 34 ++--------------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

(limited to 't/t0023-sendfile-byte-range.sh')

diff --git a/t/t0023-sendfile-byte-range.sh b/t/t0023-sendfile-byte-range.sh
index 419d89a..89fbd7a 100755
--- a/t/t0023-sendfile-byte-range.sh
+++ b/t/t0023-sendfile-byte-range.sh
@@ -17,7 +17,7 @@ EventMachine|NeverBlock)
 *) ;;
 esac
 
-t_plan 7 "sendfile byte range response for $model"
+t_plan 12 "sendfile byte range response for $model"
 
 t_begin "setup and startup" && {
 	rtmpfiles out err
@@ -28,36 +28,6 @@ t_begin "setup and startup" && {
 	# can't load Rack::Lint here since it clobbers body#to_path
 	rainbows -E none -D large-file-response.ru -c $unicorn_config
 	rainbows_wait_start
-	range_head=-r-365
-	range_tail=-r155-
-	range_mid=-r200-300
 }
 
-t_begin "read random blob sha1s" && {
-	sha1_head=$(curl -sSf $range_head file://random_blob | rsha1)
-	sha1_tail=$(curl -sSf $range_tail file://random_blob | rsha1)
-	sha1_mid=$(curl -sSf $range_mid file://random_blob | rsha1)
-}
-
-t_begin "head range matches" && {
-	sha1="$(curl -sSv $range_head http://$listen/random_blob | rsha1)"
-	test x"$sha1_head" = x"$sha1"
-}
-
-t_begin "tail range matches" && {
-	sha1="$(curl -sS $range_tail http://$listen/random_blob | rsha1)"
-	test x"$sha1_tail" = x"$sha1"
-}
-
-t_begin "mid range matches" && {
-	sha1="$(curl -sS $range_mid http://$listen/random_blob | rsha1)"
-	test x"$sha1_mid" = x"$sha1"
-}
-
-t_begin "shutdown server" && {
-	kill -QUIT $rainbows_pid
-}
-
-t_begin "check stderr" && check_stderr
-
-t_done
+. ./byte-range-common.sh
-- 
cgit v1.2.3-24-ge0c7