passenger 4.0.60 → 5.0.0.beta1

data/build/preprocessor.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013-2015 Phusion
+#  Copyright (c) 2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -182,9 +182,7 @@ private
 		"quantal"  => "12.10",
 		"raring"   => "13.04",
 		"saucy"    => "13.10",
-		"trusty"   => "14.04",
-		"utopic"   => "14.10",
-		"vivid"    => "15.05"
+		"trusty"   => "14.04"
 	}
 	DEBIAN_DISTRIBUTIONS = {
 		"squeeze"  => "20110206",

data/build/ruby_tests.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -23,32 +23,13 @@
 
 ### Ruby components tests ###
 
-dependencies = [NATIVE_SUPPORT_TARGET, AGENT_OUTPUT_DIR + 'PassengerLoggingAgent'].compact
+dependencies = [NATIVE_SUPPORT_TARGET, AGENT_OUTPUT_DIR + AGENT_EXE].compact
 desc "Run unit tests for the Ruby libraries"
 task 'test:ruby' => dependencies do
-	if PlatformInfo.rspec.nil?
-		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
-	else
-		if maybe_grep = string_option('E')
-			require 'shellwords'
-			maybe_grep = "-e #{Shellwords.escape(maybe_grep)}"
-		end
-		command = "#{PlatformInfo.rspec} -c -f s -P 'dont-autoload-anything' #{maybe_grep} ruby/*_spec.rb ruby/*/*_spec.rb"
-		sh "cd test && exec #{command}"
-	end
-end
-
-dependencies = [NATIVE_SUPPORT_TARGET].compact
-desc "Run coverage tests for the Ruby libraries"
-task 'test:rcov' => dependencies do
-	if PlatformInfo.rspec.nil?
-		abort "RSpec is not installed for Ruby interpreter '#{PlatformInfo.ruby_command}'. Please install it."
-	else
-		Dir.chdir("test") do
-			sh "rcov", "--exclude",
-				"lib\/spec,\/spec$,_spec\.rb$,support\/,platform_info,integration_tests",
-				PlatformInfo.rspec, "--", "-c", "-f", "s",
-				*Dir["ruby/*.rb", "ruby/*/*.rb", "integration_tests.rb"]
-		end
+	if maybe_grep = string_option('E')
+		require 'shellwords'
+		maybe_grep = "-e #{Shellwords.escape(maybe_grep)}"
 	end
+	command = "rspec -c -f s --tty -P 'dont-autoload-anything' #{maybe_grep} ruby/*_spec.rb ruby/*/*_spec.rb"
+	sh "cd test && exec bundle exec #{command}"
 end

data/build/test_basics.rb

@@ -47,36 +47,35 @@ task 'test:install_deps' do
 	gem_install = PlatformInfo.gem_command + " install --no-rdoc --no-ri"
 	gem_install = "#{PlatformInfo.ruby_sudo_command} #{gem_install}" if boolean_option('SUDO')
 	default = boolean_option('DEVDEPS_DEFAULT', true)
+	install_base_deps = boolean_option('BASE_DEPS', default)
+	install_doctools  = boolean_option('DOCTOOLS', default)
 
-	if boolean_option('BASE_DEPS', default)
-		sh "#{gem_install} rails -v 2.3.15"
-		sh "#{gem_install} mime-types -v 1.25"
-		sh "#{gem_install} rspec -v 2.14.1"
-		sh "#{gem_install} bundler daemon_controller json rack"
+	if deps_target = string_option('DEPS_TARGET')
+		bundle_args = " --path #{deps_target}"
 	end
-	if boolean_option('DOCTOOLS', default)
-		begin
-			require 'nokogiri'
-		rescue LoadError
-			if RUBY_VERSION < '1.9'
-				sh "#{gem_install} nokogiri -v 1.5.9"
-			else
-				sh "#{gem_install} nokogiri"
-			end
+
+	if !PlatformInfo.locate_ruby_tool('bundle')
+		sh "#{gem_install} bundler"
+	end
+
+	if install_base_deps && install_doctools
+		sh "bundle install #{bundle_args} --without="
+	else
+		if install_base_deps
+			sh "bundle install #{bundle_args} --without doc"
+		end
+		if install_doctools
+			sh "bundle install #{bundle_args} --without base"
 		end
-		sh "#{gem_install} mizuho bluecloth"
 	end
 	if boolean_option('RAILS_BUNDLES', default)
-		sh "cd test/stub/rails3.0 && bundle install"
-		sh "cd test/stub/rails3.1 && bundle install"
-		sh "cd test/stub/rails3.2 && bundle install"
-
-		ruby_version_int = RUBY_VERSION.split('.')[0..2].join.to_i
-
-		if ruby_version_int >= 190
-		    sh "cd test/stub/rails4.0 && bundle install"
-		    sh "cd test/stub/rails4.1 && bundle install"
-                end
+		sh "cd test/stub/rails3.0 && bundle install #{bundle_args}"
+		sh "cd test/stub/rails3.1 && bundle install #{bundle_args}"
+		sh "cd test/stub/rails3.2 && bundle install #{bundle_args}"
+		if RUBY_VERSION >= '1.9'
+			sh "cd test/stub/rails4.0 && bundle install #{bundle_args}"
+			sh "cd test/stub/rails4.1 && bundle install #{bundle_args}"
+		end
 	end
 	if boolean_option('NODE_MODULES', default)
 		sh "npm install"

data/debian.template/control.template

@@ -28,8 +28,8 @@ XS-Ruby-Versions: all
 Package: passenger
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- ruby2.4 | ruby2.3 | ruby2.2 | ruby2.1 | ruby2.0 | ruby1.9.1 | ruby1.8 | ruby-interpreter,
- rubygems-integration (>= 1.8) | rubygems1.9.1 | rubygems1.9 | rubygems (>= 1.2),
+ ruby2.2 | ruby2.1 | ruby2.0 | ruby1.9.1 | ruby1.8 | ruby-interpreter,
+ rubygems1.9.1 | rubygems1.9 | rubygems (>= 1.2),
 #if is_distribution?('<= lucid') || is_distribution?('<= squeeze')
      librack-ruby,
 #else

data/debian.template/locations.ini.template

@@ -1,8 +1,7 @@
 [locations]
-natively_packaged=true
-native_packaging_method=deb
+packaging_method=deb
 bin_dir=/usr/bin
-agents_dir=/usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/agents
+support_binaries_dir=/usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/support-binaries
 lib_dir=/usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>
 helper_scripts_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/helper-scripts
 resources_dir=/usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>

data/debian.template/passenger.install.template

@@ -1,5 +1,5 @@
-usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/agents/
-nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %>/objs/PassengerWebHelper usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/
+usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/support-binaries/
+nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %>/objs/nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %> usr/lib/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/support-binaries/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/helper-scripts/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/templates/
 usr/share/<%= PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME %>/standalone_default_root/

data/debian.template/rules.template

@@ -41,7 +41,7 @@ override_dh_auto_build:
 		<%= PhusionPassenger::STANDALONE_NGINX_CONFIGURE_OPTIONS %> \
 		--add-module=`pwd`/../ext/nginx && \
 		make && \
-		mv objs/nginx objs/PassengerWebHelper
+		mv objs/nginx objs/nginx-<%= PhusionPassenger::PREFERRED_NGINX_VERSION %>
 
 override_dh_auto_install:
 	mkdir debian/tmp/

data/dev/ci/run_jenkins.sh

@@ -61,7 +61,6 @@ run_exec docker run --rm \
 	-e "TEST_RUBY=$TEST_RUBY" \
 	-e "TEST_NODE=$TEST_NODE" \
 	-e "TEST_RUBY_VERSION=$TEST_RUBY_VERSION" \
-	-e "TEST_CLASSIC_RAILS=$TEST_CLASSIC_RAILS" \
 	-e "TEST_RUBYGEMS_VERSION=$TEST_RUBYGEMS_VERSION" \
 	-e "TEST_NGINX=$TEST_NGINX" \
 	-e "TEST_APACHE2=$TEST_APACHE2" \

data/dev/ci/run_rpm_tests.sh

@@ -61,6 +61,9 @@ perl -pi -e 's:/etc/hosts:/cte/hosts:g' /lib64/libnss_files.so.2 /lib64/libc.so.
 sed -i 's|/etc/hosts|/cte/hosts|g' /usr/lib/ruby/1.8/resolv.rb
 chown -R app: /var/log/nginx /var/lib/nginx
 
+yum_install gdb
+gem install crash-watch --no-rdoc --no-ri
+
 
 cd /passenger
 retry_run 3 /system/internal/setuser app \

data/dev/ci/run_travis.sh

@@ -14,11 +14,14 @@ else
 	CACHE_DIR_ON_DOCKER_HOST=/tmp
 fi
 
+COMPILE_CONCURRENCY=${COMPILE_CONCURRENCY:-2}
+
 export VERBOSE=1
 export TRACE=1
 export DEVDEPS_DEFAULT=no
 export rvmsudo_secure_path=1
 export LC_CTYPE=C.UTF-8
+unset BUNDLE_GEMFILE
 
 if [[ -e /etc/workaround-docker-2267/hosts ]]; then
 	HOSTS_FILE=/etc/workaround-docker-2267/hosts
@@ -85,11 +88,32 @@ function apt_get_update() {
 	fi
 }
 
+function rake_test_install_deps()
+{
+	# We do not use Bundler here because the goal might be to
+	# install the Rake version as specified in the Gemfile,
+	# which we may not have yet.
+	run env NOEXEC_DISABLE=1 rake test:install_deps "$@"
+	local code=$?
+	if [[ $code != 0 ]]; then
+		return $code
+	fi
+
+	local bundle_path
+	if ! bundle_path=`bundle show rake`; then
+		bundle_path=`bundle show nokogiri`
+	fi
+	bundle_path=`dirname "$bundle_path"`
+	bundle_path=`dirname "$bundle_path"`
+	echo "Adding bundle path $bundle_path to GEM_PATH"
+	export GEM_PATH="$bundle_path:$GEM_PATH"
+}
+
 function install_test_deps_with_doctools()
 {
 	if [[ "$install_test_deps_with_doctools" = "" ]]; then
 		install_test_deps_with_doctools=1
-		retry_run 3 rake test:install_deps BASE_DEPS=yes DOCTOOLS=yes
+		retry_run 3 rake_test_install_deps BASE_DEPS=yes DOCTOOLS=yes
 	fi
 }
 
@@ -97,7 +121,7 @@ function install_base_test_deps()
 {
 	if [[ "$install_base_test_deps" = "" ]]; then
 		install_base_test_deps=1
-		retry_run 3 rake test:install_deps BASE_DEPS=yes
+		retry_run 3 rake_test_install_deps BASE_DEPS=yes
 	fi
 }
 
@@ -105,10 +129,18 @@ function install_node_and_modules()
 {
 	if [[ "$install_node_and_modules" = "" ]]; then
 		install_node_and_modules=1
-		run curl --fail -O http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
-		run tar xzf node-v0.10.20-linux-x64.tar.gz
+		if [[ -e /host_cache ]]; then
+			if [[ ! -e /host_cache/node-v0.10.20-linux-x64.tar.gz ]]; then
+				run curl --fail -o /host_cache/node-v0.10.20-linux-x64.tar.gz \
+					http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
+			fi
+			run tar xzf /host_cache/node-v0.10.20-linux-x64.tar.gz
+		else
+			run curl --fail -O http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
+			run tar xzf node-v0.10.20-linux-x64.tar.gz
+		fi
 		export PATH=`pwd`/node-v0.10.20-linux-x64/bin:$PATH
-		retry_run 3 rake test:install_deps NODE_MODULES=yes
+		retry_run 3 rake_test_install_deps NODE_MODULES=yes
 	fi
 }
 
@@ -139,27 +171,35 @@ if [[ "$TEST_RUBYGEMS_VERSION" != "" ]]; then
 	run gem --version
 fi
 
+ORIG_GEM_PATH="$GEM_PATH"
+
+
+if [[ "$INSTALL_ALL_DEPS" = 1 ]]; then
+	run rake_test_install_deps DEVDEPS_DEFAULT=yes
+	INSTALL_DEPS=0
+fi
+
 if [[ "$TEST_CXX" = 1 ]]; then
 	install_base_test_deps
-	run rake test:cxx
-	run rake test:oxt
+	run bundle exec drake -j$COMPILE_CONCURRENCY test:cxx
+	run bundle exec rake test:oxt
 fi
 
 if [[ "$TEST_RUBY" = 1 ]]; then
-	retry_run 3 rake test:install_deps BASE_DEPS=yes RAILS_BUNDLES=yes
-	run rake test:ruby
+	retry_run 3 rake_test_install_deps BASE_DEPS=yes RAILS_BUNDLES=yes
+	run bundle exec drake -j$COMPILE_CONCURRENCY test:ruby
 fi
 
 if [[ "$TEST_NODE" = 1 ]]; then
 	install_node_and_modules
-	run rake test:node
+	run bundle exec drake -j$COMPILE_CONCURRENCY test:node
 fi
 
 if [[ "$TEST_NGINX" = 1 ]]; then
 	install_base_test_deps
 	install_node_and_modules
 	run ./bin/passenger-install-nginx-module --auto --prefix=/tmp/nginx --auto-download
-	run rake test:integration:nginx
+	run bundle exec drake -j$COMPILE_CONCURRENCY test:integration:nginx
 fi
 
 if [[ "$TEST_APACHE2" = 1 ]]; then
@@ -170,12 +210,12 @@ if [[ "$TEST_APACHE2" = 1 ]]; then
 	install_node_and_modules
 	run ./bin/passenger-install-apache2-module --auto #--no-update-config
 	run rvmsudo ./bin/passenger-install-apache2-module --auto --no-compile
-	run rake test:integration:apache2
+	run bundle exec drake -j$COMPILE_CONCURRENCY test:integration:apache2
 fi
 
 if [[ "$TEST_STANDALONE" = 1 ]]; then
 	install_base_test_deps
-	run rake test:integration:standalone
+	run bundle exec drake -j$COMPILE_CONCURRENCY test:integration:standalone
 fi
 
 if [[ "$TEST_DEBIAN_PACKAGING" = 1 ]]; then
@@ -192,10 +232,16 @@ if [[ "$TEST_DEBIAN_PACKAGING" = 1 ]]; then
 	fi
 	install_test_deps_with_doctools
 	install_node_and_modules
-	run rake debian:dev debian:dev:reinstall
-	run rake test:integration:native_packaging SUDO=1
+	run bundle exec rake debian:dev debian:dev:reinstall
+	run bundle exec drake -j$COMPILE_CONCURRENCY test:integration:native_packaging SUDO=1 PRINT_FAILED_COMMAND_OUTPUT=1
+	(
+		export GEM_PATH="$ORIG_GEM_PATH"
+		if ! env NOEXEC_DISABLE=1 rvmsudo -E ruby -rrack -e '' 2>/dev/null; then
+			retry_run 3 gem install rack --no-rdoc --no-ri
+		fi
+	)
 	run env PASSENGER_LOCATION_CONFIGURATION_FILE=/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini \
-		rake test:integration:apache2 SUDO=1
+		bundle exec drake -j$COMPILE_CONCURRENCY test:integration:apache2 SUDO=1
 fi
 
 if [[ "$TEST_RPM_PACKAGING" = 1 ]]; then
@@ -235,5 +281,5 @@ if [[ "$TEST_SOURCE_PACKAGING" = 1 ]]; then
 	apt_get_update
 	run sudo apt-get install -y --no-install-recommends source-highlight
 	install_test_deps_with_doctools
-	run rspec -f s -c test/integration_tests/source_packaging_test.rb
+	run bundle exec rspec -f s -c test/integration_tests/source_packaging_test.rb
 fi

data/dev/copy_boost_headers

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -31,11 +31,17 @@ ESSENTIALS = [
 	"boost/smart_ptr/detail/atomic_count*",
 	"boost/smart_ptr/detail/spinlock*",
 	"boost/atomic",
+	"boost/pool",
 	"boost/unordered*",
 	"boost/thread",
+	"boost/intrusive",
+	"boost/heap",
+	"boost/container",
 	"libs/thread/src",
 	"libs/system/src",
 	"libs/regex/src",
+	"boost/preprocessor",
+	"boost/parameter",
 	"boost/date_time/gregorian/formatters_limited.hpp",
 	"boost/date_time/date_formatting_limited.hpp",
 	"boost/type_traits/make_signed.hpp",
@@ -60,15 +66,19 @@ PROGRAM_SOURCE = %q{
 	#include <boost/weak_ptr.hpp>
 	#include <boost/make_shared.hpp>
 	#include <boost/enable_shared_from_this.hpp>
+	#include <boost/intrusive_ptr.hpp>
 	#include <boost/thread.hpp>
 	#include <boost/noncopyable.hpp>
 	#include <boost/function.hpp>
 	#include <boost/bind.hpp>
+	#include <boost/container/vector.hpp>
+	#include <boost/heap/d_ary_heap.hpp>
 	#include <boost/date_time/posix_time/posix_time.hpp>
 	#include <boost/foreach.hpp>
 	#include <boost/unordered_map.hpp>
-	#include <boost/cregexp.hpp>
-	#include <boost/regexp.hpp>
+	#include <boost/cregex.hpp>
+	#include <boost/regex.hpp>
+	#include <boost/pool/object_pool.hpp>
 }
 
 require 'fileutils'
@@ -143,11 +153,17 @@ end
 def copy_dependencies
 	done = false
 	while !done
-		missing_headers = `g++ -DBOOST_MPL_PREPROCESSING_MODE test.cpp -c -I. 2>&1`.
+		missing_headers = `c++ test.cpp -c -I. 2>&1`.
 		  split("\n").
-		  grep(/error: .*: No such file/).
+		  grep(/(error: .*: No such file|fatal error: '.*' file not found)/).
 		  map do |line|
-			file = line.sub(/.*error: (.*): .*/, '\1')
+		  	if line =~ /error: (.*): No such file/
+		  		file = $1
+		  	elsif line =~ /fatal error: '(.*)' file not found/
+		  		file = $1
+		  	else
+		  		abort "Bug"
+		  	end
 			if file =~ /^boost\//
 				file
 			else

data/dev/ruby_server.rb

@@ -0,0 +1,244 @@
+#!/usr/bin/env ruby
+# A simple pure-Ruby HTTP server, meant as a helper tool in benchmarks.
+# It supports HTTP keep-alive and it supports forwarding the request to
+# another server.
+
+require 'thread'
+require 'socket'
+require 'optparse'
+
+class TestServer
+	REQUEST =
+		"GET / HTTP/1.1\r\n" <<
+		"Connection: Keep-Alive\r\n" <<
+		"Host: 127.0.0.1:3001\r\n" <<
+		"User-Agent: ApacheBench/2.3\r\n" <<
+		"Accept: */*\r\n\r\n"
+
+	RESPONSE =
+		"HTTP/1.1 200 OK\r\n" <<
+		"Status: 200 OK\r\n" <<
+		"Content-Type: text/plain\r\n" <<
+		"Content-Length: 3\r\n" <<
+		"Connection: keep-alive\r\n" <<
+		"\r\n" <<
+		"ok\n"
+
+	def initialize(options = {})
+		@options = options
+		@options[:transport] ||= :tcp
+		@options[:protocol] ||= :http
+		@options[:port] ||= 3000
+		@options[:file] ||= './socket'
+		@options[:threads] ||= 2
+		@options[:processes] ||= 2
+		@forward = @options[:forward]
+		@forward_transport = @options[:forward_transport]
+		@forward_file = @options[:forward_file]
+		@forward_port = @options[:forward_port]
+		@forward_keep_alive = @options[:forward_keep_alive]
+	end
+
+	def run
+		case @options[:transport]
+		when :tcp
+			@server = TCPServer.new('127.0.0.1', @options[:port])
+			@server.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+			puts "Listening on http://127.0.0.1:#{@options[:port]}/"
+		when :unix
+			File.unlink(@options[:file]) rescue nil
+			@server = UNIXServer.new(@options[:file])
+			puts "Listening on Unix domain socket: #{@options[:file]}"
+		else
+			abort "Unknown transport #{@options[:transport]}"
+		end
+		@server.listen(100)
+
+		case @options[:protocol]
+		when :http
+			puts "Using HTTP protocol"
+			@protocol = :http
+		when :session
+			puts "Using session protocol"
+			@protocol = :session
+		else
+			abort "Unknown protocol #{@options[:protocol]}"
+		end
+
+		if @forward
+			case @forward_transport
+			when :tcp
+				puts "Forwarding to http://127.0.0.1:#{@forward_port}/"
+			when :unix
+				puts "Forwarding to Unix domain socket: #{@forward_file}"
+			end
+		end
+
+		puts "Using #{@options[:processes]} processes"
+		puts "Using #{@options[:threads]} threads per process"
+		fork_children
+		threads = []
+		@options[:threads].times { threads << start_thread }
+		begin
+			threads.each { |t| t.join }
+		rescue Interrupt
+		end
+	end
+
+private
+	def fork_children
+		if @options[:processes] == 1
+			return
+		end
+
+		children = []
+		@options[:processes].times do
+			pid = fork
+			if pid
+				# Parent
+				puts "Spawned child process: #{pid}"
+				children << pid
+			else
+				return
+			end
+		end
+		if !children.empty?
+			# Parent
+			begin
+				sleep 999999
+			rescue Interrupt
+				exit
+			ensure
+				children.each do |pid|
+					puts "Reaping child process: #{pid}"
+					Process.kill('INT', pid)
+				end
+				children.each do |pid|
+					Process.waitpid(pid)
+				end
+			end
+		end
+	end
+
+	def start_thread
+		Thread.new do
+			Thread.current.abort_on_exception = true
+			if @forward && @forward_keep_alive
+				forward_connection = connect_to_forwarding_target
+			end
+			while true
+				handle_next_client(forward_connection)
+			end
+		end
+	end
+
+	def handle_next_client(forward_connection)
+		client = @server.accept
+		begin
+			buffer = "".force_encoding("binary")
+			while true
+				begin
+					read_header(client, buffer)
+
+					if @forward
+						forward(forward_connection)
+					end
+
+					# Write response
+					client.write(RESPONSE)
+				rescue EOFError, Errno::ECONNRESET
+					break
+				end
+			end
+		ensure
+			client.close
+		end
+	end
+
+	def read_header(client, buffer)
+		if @protocol == :http
+			while client.readline != "\r\n"
+				# Do nothing.
+			end
+		else
+			temp = client.read(4, buffer)
+			raise EOFError if temp.nil?
+			size = temp.unpack('N')[0]
+			temp = client.read(size, buffer)
+			raise EOFError if temp.nil?
+		end
+	end
+
+	def forward(target_connection)
+		if target_connection
+			io = target_connection
+		else
+			io = connect_to_forwarding_target
+		end
+		begin
+			io.write(REQUEST)
+			while io.readline != "ok\n"
+				# Do nothing
+			end
+		ensure
+			if !target_connection
+				io.close
+			end
+		end
+	end
+
+	def connect_to_forwarding_target
+		if @forward_transport == :unix
+			UNIXSocket.new(@forward_file)
+		else
+			TCPSocket.new('127.0.0.1', @forward_port)
+		end
+	end
+end
+
+options = {}
+parser = OptionParser.new do |opts|
+	opts.banner = "Usage: ./ruby.rb [options]"
+	opts.separator ""
+
+	opts.separator "Options:"
+	opts.on("--port PORT", Integer, "Listen on the given TCP port. Default: 3000") do |val|
+		options[:transport] = :tcp
+		options[:port] = val
+	end
+	opts.on("--file PATH", String, "Listen on the given Unix domain socket file") do |val|
+		options[:transport] = :unix
+		options[:file] = val
+	end
+	opts.on("--session-protocol", "Accept session protocol instead of HTTP") do
+		options[:protocol] = :session
+	end
+	opts.on("--threads N", Integer, "Number of threads to use. Default: 2") do |val|
+		options[:threads] = val
+	end
+	opts.on("--processes N", Integer, "Number of processes to use. Default: 2") do |val|
+		options[:processes] = val
+	end
+	opts.on("--forward-tcp PORT", Integer, "Forward request to another TCP server") do |val|
+		options[:forward] = true
+		options[:forward_transport] = :tcp
+		options[:forward_port] = val
+	end
+	opts.on("--forward-file PATH", String, "Forward request to another Unix domain socket server") do |val|
+		options[:forward] = true
+		options[:forward_transport] = :unix
+		options[:forward_file] = val
+	end
+	opts.on("--forward-keep-alive", "Use keep-alive when forwarding") do
+		options[:forward_keep_alive] = true
+	end
+end
+begin
+	parser.parse!
+rescue OptionParser::ParseError => e
+	puts e
+	puts
+	puts "Please see '--help' for valid options."
+	exit 1
+end
+TestServer.new(options).run