unicorn 4.6.0pre1 → 4.6.0

data/Documentation/unicorn.1.txt

@@ -61,6 +61,10 @@ with rackup(1) but strongly discouraged.
     For production deployments, specifying the "listen" directive in
     CONFIG_FILE is recommended as it allows fine-tuning of socket
     options.
+-N, \--no-default-middleware
+:   Disables loading middleware implied by RACK_ENV.  This bypasses the
+    configuration documented in the RACK ENVIRONMENT section, but still
+    allows RACK_ENV to be used for application/framework-specific purposes.
 
 # RACKUP COMPATIBILITY OPTIONS
 -o, \--host HOST
@@ -144,10 +148,10 @@ As of Unicorn 0.94.0, RACK_ENV is exported as a process-wide environment
 variable as well.  While not current a part of the Rack specification as
 of Rack 1.0.1, this has become a de facto standard in the Rack world.
 
-Note that the Rack::ContentLength and Rack::Chunked middlewares
-are never loaded by default.  If needed, they should be
-individually specified in the RACKUP_FILE, some frameworks do
-not require them.
+Note the Rack::ContentLength and Rack::Chunked middlewares are also
+loaded by "deployment" and "development", but no other values of
+RACK_ENV.  If needed, they must be individually specified in the
+RACKUP_FILE, some frameworks do not require them.
 
 # ENVIRONMENT VARIABLES
 

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v4.6.0.pre1
+DEF_VER=v4.6.0
 
 LF='
 '

data/t/t0000-http-basic.sh

@@ -26,7 +26,7 @@ t_begin "HTTP/0.9 request should not return headers" && {
 }
 
 t_begin "env.inspect should've put everything on one line" && {
-	test 1 -eq $(wc -l < $tmp)
+	test 1 -eq $(count_lines < $tmp)
 }
 
 t_begin "no headers in output" && {

data/t/t0004-heartbeat-timeout.sh

@@ -23,9 +23,9 @@ t_begin "sleep for a bit, ensure worker PID does not change" && {
 
 t_begin "block the worker process to force it to die" && {
 	rm $ok
-	t0=$(date +%s)
+	t0=$(unix_time)
 	err="$(curl -sSf http://$listen/block-forever 2>&1 || > $ok)"
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(($t1 - $t0))
 	t_info "elapsed=$elapsed err=$err"
 	test x"$err" != x"Should never get here"
@@ -34,7 +34,7 @@ t_begin "block the worker process to force it to die" && {
 
 t_begin "ensure worker was killed" && {
 	test -e $ok
-	test 1 -eq $(grep timeout $r_err | grep killing | wc -l)
+	test 1 -eq $(grep timeout $r_err | grep killing | count_lines)
 }
 
 t_begin "ensure timeout took at least 3 seconds" && {

data/t/t0006-reopen-logs.sh

@@ -62,11 +62,11 @@ t_begin "rotated stderr is clean" && {
 }
 
 t_begin "server is now writing logs to new stderr" && {
-	before_rot=$(wc -c < $r_rot)
-	before_err=$(wc -c < $r_err)
+	before_rot=$(count_bytes < $r_rot)
+	before_err=$(count_bytes < $r_err)
 	test xtrue = x$(curl -sSf http://$listen/ 2> $curl_err)
-	after_rot=$(wc -c < $r_rot)
-	after_err=$(wc -c < $r_err)
+	after_rot=$(count_bytes < $r_rot)
+	after_err=$(count_bytes < $r_err)
 	test $after_rot -eq $before_rot
 	test $after_err -gt $before_err
 }

data/t/t0019-max_header_len.sh

@@ -5,7 +5,7 @@ t_plan 5 "max_header_len setting (only intended for Rainbows!)"
 t_begin "setup and start" && {
 	unicorn_setup
 	req='GET / HTTP/1.0\r\n\r\n'
-	len=$(printf "$req" | wc -c)
+	len=$(printf "$req" | count_bytes)
 	echo Unicorn::HttpParser.max_header_len = $len >> $unicorn_config
 	unicorn -D -c $unicorn_config env.ru
 	unicorn_wait_start

data/t/t0100-rack-input-tests.sh

@@ -8,9 +8,9 @@ t_begin "setup and startup" && {
 	rtmpfiles curl_out curl_err
 	unicorn_setup
 	unicorn -E none -D rack-input-tests.ru -c $unicorn_config
-        blob_sha1=$(rsha1 < random_blob)
-	blob_size=$(wc -c < random_blob)
-        t_info "blob_sha1=$blob_sha1"
+	blob_sha1=$(rsha1 < random_blob)
+	blob_size=$(count_bytes < random_blob)
+	t_info "blob_sha1=$blob_sha1"
 	unicorn_wait_start
 }
 
@@ -24,7 +24,7 @@ t_begin "corked identity request" && {
 		wait
 		echo ok > $ok
 	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
-	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test 1 -eq $(grep $blob_sha1 $tmp |count_lines)
 	test x"$(cat $ok)" = xok
 }
 
@@ -36,7 +36,7 @@ t_begin "corked chunked request" && {
 		wait
 		echo ok > $ok
 	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
-	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test 1 -eq $(grep $blob_sha1 $tmp |count_lines)
 	test x"$(cat $ok)" = xok
 }
 
@@ -50,7 +50,7 @@ t_begin "corked identity request (input#size first)" && {
 		wait
 		echo ok > $ok
 	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
-	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test 1 -eq $(grep $blob_sha1 $tmp |count_lines)
 	test x"$(cat $ok)" = xok
 }
 
@@ -64,7 +64,7 @@ t_begin "corked identity request (input#rewind first)" && {
 		wait
 		echo ok > $ok
 	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
-	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test 1 -eq $(grep $blob_sha1 $tmp |count_lines)
 	test x"$(cat $ok)" = xok
 }
 
@@ -81,8 +81,8 @@ t_begin "corked chunked request (input#size first)" && {
 		wait
 		echo ok > $ok
 	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
-	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
-	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test 1 -eq $(grep $blob_sha1 $tmp |count_lines)
+	test 1 -eq $(grep $blob_sha1 $tmp |count_lines)
 	test x"$(cat $ok)" = xok
 }
 
@@ -99,7 +99,7 @@ t_begin "corked chunked request (input#rewind first)" && {
 		wait
 		echo ok > $ok
 	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
-	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test 1 -eq $(grep $blob_sha1 $tmp |count_lines)
 	test x"$(cat $ok)" = xok
 }
 

data/t/t9000-preread-input.sh

@@ -26,7 +26,7 @@ t_begin "sha1 matches" && {
 }
 
 t_begin "app only dispatched twice" && {
-	test 2 -eq "$(grep 'app dispatch:' < $r_err | wc -l )"
+	test 2 -eq "$(grep 'app dispatch:' < $r_err | count_lines )"
 }
 
 t_begin "aborted chunked request" && {
@@ -38,7 +38,7 @@ t_begin "aborted chunked request" && {
 }
 
 t_begin "app only dispatched twice" && {
-	test 2 -eq "$(grep 'app dispatch:' < $r_err | wc -l )"
+	test 2 -eq "$(grep 'app dispatch:' < $r_err | count_lines )"
 }
 
 t_begin "killing succeeds" && {

data/t/test-lib.sh

@@ -32,6 +32,21 @@ wait_for_pid () {
 	done
 }
 
+# "unix_time" is not in POSIX, but in GNU, and FreeBSD 9.0 (possibly earlier)
+unix_time () {
+	$RUBY -e 'puts Time.now.to_i'
+}
+
+# "wc -l" outputs leading whitespace on *BSDs, filter it out for portability
+count_lines () {
+	wc -l | tr -d '[:space:]'
+}
+
+# "wc -c" outputs leading whitespace on *BSDs, filter it out for portability
+count_bytes () {
+	wc -c | tr -d '[:space:]'
+}
+
 # given a list of variable names, create temporary files and assign
 # the pathnames to those variables
 rtmpfiles () {
@@ -49,7 +64,7 @@ rtmpfiles () {
 			;;
 		*socket)
 			_tmp="$(mktemp -t $id.$$.XXXXXXXX)"
-			if test $(printf "$_tmp" |wc -c) -gt 108
+			if test $(printf "$_tmp" |count_bytes) -gt 108
 			then
 				echo >&2 "$_tmp too long, tests may fail"
 				echo >&2 "Try to set TMPDIR to a shorter path"

metadata

@@ -2,15 +2,15 @@
 name: !binary |-
   dW5pY29ybg==
 version: !ruby/object:Gem::Version
-  version: 4.6.0pre1
-  prerelease: 5
+  version: 4.6.0
+  prerelease: 
 platform: ruby
 authors:
 - Unicorn hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: !binary |-
@@ -250,7 +250,6 @@ files:
 - t/bin/content-md5-put
 - t/bin/sha1sum.rb
 - t/bin/unused_listen
-- t/bin/utee
 - t/broken-app.ru
 - t/detach.ru
 - t/env.ru
@@ -351,9 +350,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: !binary |-
   bW9uZ3JlbA==

data/t/bin/utee

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-# -*- encoding: binary -*-
-# tee(1) as distributed on most(all?) systems is buffered in luserspace
-# this only does unbuffered writes (with line-buffered input) to make
-# test output appear in real-time
-$stdin.binmode
-$stdout.binmode
-fp = File.open(ARGV.shift, "wb")
-$stdin.each_line do |line|
-  fp.syswrite line
-  $stdout.syswrite line
-end