passenger 4.0.30 → 4.0.31

data/test/ruby/shared/rails/analytics_logging_extensions_sharedspec.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'socket'
 require 'fileutils'
-require 'phusion_passenger/analytics_logger'
-require 'phusion_passenger/utils/tmpdir'
+PhusionPassenger.require_passenger_lib 'analytics_logger'
+PhusionPassenger.require_passenger_lib 'utils/tmpdir'
 
 module PhusionPassenger
 

data/test/ruby/spec_helper.rb

@@ -38,12 +38,12 @@ $LOAD_PATH.unshift("#{source_root}/test")
 require 'thread'
 require 'timeout'
 require 'fileutils'
-require 'support/test_helper'
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
-require 'phusion_passenger/debug_logging'
-require 'phusion_passenger/utils'
-require 'phusion_passenger/utils/tmpdir'
+PhusionPassenger.require_passenger_lib 'debug_logging'
+PhusionPassenger.require_passenger_lib 'utils'
+PhusionPassenger.require_passenger_lib 'utils/tmpdir'
+require 'support/test_helper'
 
 include TestHelper
 

data/test/ruby/standalone/runtime_installer_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'phusion_passenger/standalone/runtime_installer'
+PhusionPassenger.require_passenger_lib 'standalone/runtime_installer'
 require 'tmpdir'
 require 'fileutils'
 require 'stringio'

data/test/ruby/standalone/runtime_locator_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'phusion_passenger/standalone/runtime_locator'
+PhusionPassenger.require_passenger_lib 'standalone/runtime_locator'
 require 'tmpdir'
 require 'fileutils'
 require 'json'

data/test/ruby/utils/file_system_watcher_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'phusion_passenger/utils/file_system_watcher'
+PhusionPassenger.require_passenger_lib 'utils/file_system_watcher'
 
 module PhusionPassenger
 

data/test/ruby/utils/hosts_file_parser.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'phusion_passenger/utils/hosts_file_parser'
+PhusionPassenger.require_passenger_lib 'utils/hosts_file_parser'
 require 'stringio'
 
 module PhusionPassenger

data/test/ruby/utils/unseekable_socket_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'phusion_passenger/utils/unseekable_socket'
+PhusionPassenger.require_passenger_lib 'utils/unseekable_socket'
 
 module PhusionPassenger
 

data/test/ruby/utils_spec.rb

@@ -3,10 +3,10 @@ require 'tmpdir'
 require 'fileutils'
 require 'stringio'
 require 'etc'
-require 'phusion_passenger/message_channel'
-require 'phusion_passenger/platform_info/ruby'
-require 'phusion_passenger/loader_shared_helpers'
-require 'phusion_passenger/utils'
+PhusionPassenger.require_passenger_lib 'message_channel'
+PhusionPassenger.require_passenger_lib 'platform_info/ruby'
+PhusionPassenger.require_passenger_lib 'loader_shared_helpers'
+PhusionPassenger.require_passenger_lib 'utils'
 
 module PhusionPassenger
 

data/test/stub/apache2/httpd.conf.erb

@@ -1,5 +1,10 @@
 ServerRoot "<%= @server_root %>"
 Listen 127.0.0.1:<%= @port %>
+<% if PhusionPassenger::PlatformInfo.os_name =~ /freebsd/ %>
+	Mutex default:/tmp
+	AcceptFilter http none
+	AcceptFilter https none
+<% end %>
 
 <% if @www_user %>
 	User <%= @www_user %>

data/test/stub/index.html

@@ -0,0 +1 @@
+This is the stub directory.

data/test/stub/rack/config.ru

@@ -1,36 +1,83 @@
+# encoding: binary
+
+def text_response(body)
+	body = binary_string(body.to_s)
+	return [200, { "Content-Type" => "text/plain", "Content-Length" => body.size.to_s }, [body]]
+end
+
+if "".respond_to?(:force_encoding)
+	def binary_string(str)
+		return str.force_encoding("binary")
+	end
+else
+	def binary_string(str)
+		return str
+	end
+end
+
 app = lambda do |env|
-    case env['PATH_INFO']
-    when '/hello'
-        [200, { "Content-Type" => "text/html" }, "hello world"]
-    when '/chunked'
-        chunks = ["7\r\nchunk1\n\r\n", "7\r\nchunk2\n\r\n", "7\r\nchunk3\n\r\n", "0\r\n\r\n"]
-        [200, { "Content-Type" => "text/html", "Transfer-Encoding" => "chunked" }, chunks]
-    when '/pid'
-        [200, { "Content-Type" => "text/plain" }, [$$]]
-    when '/env'
-        body = ''
-        env.each_pair do |key, value|
-            body << "#{key} = #{value}\n"
-        end
-        [200, { "Content-Type" => "text/plain" }, [body]]
-    when '/upload'
-        File.open(env['HTTP_X_OUTPUT'], 'w') do |f|
-            while line = env['rack.input'].gets
-                f.write(line)
-                f.flush
-            end
-        end
-        [200, { "Content-Type" => "text/html" }, ["ok"]]
-    when '/print_stderr'
-        STDERR.puts "hello world!"
-        [200, { "Content-Type" => "text/html" }, ["ok"]]
-    when '/print_stdout_and_stderr'
-        STDOUT.puts "hello stdout!"
-        sleep 0.1  # Give HelperAgent the time to process stdout first.
-        STDERR.puts "hello stderr!"
-        [200, { "Content-Type" => "text/html" }, ["ok"]]
-    else
-        [200, { "Content-Type" => "text/html" }, ["hello <b>world</b>"]]
-    end
+	case env['PATH_INFO']
+	when '/'
+		if File.exist?("front_page.txt")
+			text_response(File.read("front_page.txt"))
+		else
+			text_response("front page")
+		end
+	when '/parameters'
+		req = Rack::Request.new(env)
+		method = env["REQUEST_METHOD"]
+		first = req.params["first"]
+		second = req.params["second"]
+		text_response("Method: #{method}\nFirst: #{first}\nSecond: #{second}\n")
+	when '/chunked'
+		chunks = ["7\r\nchunk1\n\r\n", "7\r\nchunk2\n\r\n", "7\r\nchunk3\n\r\n", "0\r\n\r\n"]
+		[200, { "Content-Type" => "text/html", "Transfer-Encoding" => "chunked" }, chunks]
+	when '/pid'
+		text_response(Process.pid)
+	when /^\/env/
+		body = ''
+		env.sort.each do |key, value|
+			body << "#{key} = #{value}\n"
+		end
+		text_response(body)
+	when '/touch_file'
+		req = Rack::Request.new(env)
+		filename = req.params["file"]
+		File.open(filename, "w").close
+		text_response("ok")
+	when '/extra_header'
+		[200, { "Content-Type" => "text/html", "X-Foo" => "Bar" }, ["ok"]]
+	when '/cached'
+		text_response("This is the uncached version of /cached")
+	when '/upload_with_params'
+		req = Rack::Request.new(env)
+		name1 = binary_string(req.params["name1"])
+		name2 = binary_string(req.params["name2"])
+		file = req.params["data"][:tempfile]
+		file.binmode
+		text_response(
+			"name 1 = #{name1}\n" <<
+			"name 2 = #{name2}\n" <<
+			"data = #{file.read}")
+	when '/raw_upload_to_file'
+		File.open(env['HTTP_X_OUTPUT'], 'w') do |f|
+			while line = env['rack.input'].gets
+				f.write(line)
+				f.flush
+			end
+		end
+		text_response("ok")
+	when '/print_stderr'
+		STDERR.puts "hello world!"
+		text_response("ok")
+	when '/print_stdout_and_stderr'
+		STDOUT.puts "hello stdout!"
+		sleep 0.1  # Give HelperAgent the time to process stdout first.
+		STDERR.puts "hello stderr!"
+		text_response("ok")
+	else
+		[404, { "Content-Type" => "text/plain" }, ["Unknown URI"]]
+	end
 end
+
 run app

data/test/stub/rails2.3/app/controllers/foo_controller.rb

@@ -1,6 +1,6 @@
 class FooController < ActionController::Base
 	def new
-		render :text => 'hello world'
+		render :text => 'front page'
 	end
 	
 	def rails_env

data/test/stub/rails2.3/config/routes.rb

@@ -25,12 +25,11 @@ ActionController::Routing::Routes.draw do |map|
   #   end
 
   # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
-  # map.root :controller => "welcome"
+  map.root :controller => 'foo', :action => 'new'
 
   # See how all your routes lay out with "rake routes"
 
   # Install the default routes as the lowest priority.
-  map.connect '/hello', :controller => 'foo', :action => 'new'
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'
 end

data/test/stub/wsgi/passenger_wsgi.py

@@ -1,4 +1,4 @@
-import os, time
+import os, time, cgi
 
 def file_exist(filename):
 	try:
@@ -23,14 +23,51 @@ def application(env, start_response):
 			time.sleep(0.01)
 	
 	path = env['PATH_INFO']
-	if path == '/pid':
+	if path == '/':
+		if file_exist("front_page.txt"):
+			with file("front_page.txt", "r") as f:
+				body = f.read()
+		else:
+			body = "front page"
+	elif path == '/parameters':
+		method = env['REQUEST_METHOD']
+		params = cgi.parse(env['wsgi.input'], env)
+		first  = params['first'][0]
+		second = params['second'][0]
+		body = "Method: %s\nFirst: %s\nSecond: %s\n" % (method, first, second)
+	elif path == '/chunked':
+		chunks = [str("7\r\nchunk1\n\r\n"), str("7\r\nchunk2\n\r\n"),
+			str("7\r\nchunk3\n\r\n"), str("0\r\n\r\n")]
+		start_response(status, [('Content-Type', 'text/html'), ('Transfer-Encoding', 'chunked')])
+		return chunks
+	elif path == '/pid':
 		body = os.getpid()
-	elif path == '/env':
+	elif path.startswith('/env'):
 		body = ''
 		for pair in env.iteritems():
 			body += pair[0] + ' = ' + str(pair[1]) + "\n"
 		body = body
-	elif path == '/upload':
+	elif path == '/touch_file':
+		params = cgi.parse(env['wsgi.input'], env)
+		filename = params["file"][0]
+		file(filename, 'w').close()
+		body = "ok"
+	elif path == '/extra_header':
+		start_response(status, [('Content-Type', 'text/html'), ('X-Foo', 'Bar')])
+		return ["ok"]
+	elif path == '/cached':
+		body = "This is the uncached version of /cached"
+	elif path == '/upload_with_params':
+		params = cgi.FieldStorage(fp = env['wsgi.input'], environ = env)
+		name1 = params["name1"].value
+		name2 = params["name2"].value
+		data  = params["data"].value
+		format = \
+			b"name 1 = %s\n" + \
+			b"name 2 = %s\n" + \
+			b"data = %s"
+		body = format % (name1, name2, data)
+	elif path == '/raw_upload_to_file':
 		sleep_time = float(env.get('HTTP_X_SLEEP', 0))
 		f = open(env['HTTP_X_OUTPUT'], 'w')
 		try:
@@ -60,7 +97,7 @@ def application(env, start_response):
 				i += 1
 		start_response(status, [('Content-Type', 'text/html'), ('Transfer-Encoding', 'chunked')])
 		return body()
-	elif path == '/chunked':
+	elif path == '/chunked_stream':
 		sleep_time = float(env.get('HTTP_X_SLEEP', 0.05))
 		count = float(env.get('HTTP_X_COUNT', 3))
 		def body():
@@ -95,7 +132,9 @@ def application(env, start_response):
 		start_response(status, [('Content-Type', 'text/plain'), ('X-Passenger-Request-OOB-Work', 'true')])
 		return [str(os.getpid())]
 	else:
-		body = 'hello <b>world</b>'
+		status = "404 Not Found"
+		body = "Unknown URI"
 	
-	start_response(status, [('Content-Type', 'text/html')])
-	return [str(body)]
+	body = str(body)
+	start_response(status, [('Content-Type', 'text/plain'), ('Content-Length', len(body))])
+	return [body]