passenger 4.0.14 → 4.0.16

data/test/cxx/RequestHandlerTest.cpp

@@ -31,6 +31,7 @@ namespace tut {
 		BackgroundEventLoop bg;
 		SpawnerFactoryPtr spawnerFactory;
 		PoolPtr pool;
+		Pool::DebugSupportPtr debug;
 		shared_ptr<RequestHandler> handler;
 		FileDescriptor connection;
 		map<string, string> defaultHeaders;
@@ -73,6 +74,11 @@ namespace tut {
 			bg.start();
 		}
 
+		void initPoolDebugging() {
+			pool->initDebugging();
+			debug = pool->debugSupport;
+		}
+
 		FileDescriptor &connect() {
 			connection = connectToUnixServer(serverFilename);
 			return connection;
@@ -802,9 +808,9 @@ namespace tut {
 		// Get a reference to the orignal process and verify oobw has been requested.
 		ProcessPtr origProcess;
 		{
-			unique_lock<boost::mutex> lock(pool->syncher);
+			LockGuard l(pool->syncher);
 			origProcess = pool->superGroups.get(wsgiAppPath)->defaultGroup->disablingProcesses.front();
-			ensure(origProcess->oobwStatus == Process::OOBW_REQUESTED);
+			ensure("OOBW requested", origProcess->oobwStatus == Process::OOBW_IN_PROGRESS);
 		}
 		ensure("sanity check", origPid == origProcess->pid); // just a sanity check
 		
@@ -817,7 +823,7 @@ namespace tut {
 				"PATH_INFO", "/pid",
 				NULL);
 			string response = readAll(connection);
-			ensure(containsSubstring(response, "Status: 200 OK\r\n"));
+			ensure("status is 200", containsSubstring(response, "Status: 200 OK\r\n"));
 			pid = atoi(stripHeaders(response));
 			result = (pid != origPid);
 		);
@@ -851,6 +857,63 @@ namespace tut {
 		ensure(result.find("Date: ") != string::npos);
 	}
 
+	TEST_METHOD(48) {
+		set_test_name("It should write an appropriate response if the request queue is overflown");
+
+		initPoolDebugging();
+		debug->restarting = false;
+		debug->spawning = false;
+		debug->testOverflowRequestQueue = true;
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/",
+			NULL);
+		string response = readAll(connection);
+		ensure(response.find("Status: 503 Service Unavailable") != string::npos);
+		ensure(response.find("This website is under heavy load") != string::npos);
+	}
+
+	TEST_METHOD(49) {
+		set_test_name("It should use the status code dictated by PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE "
+			"if the request queue is overflown");
+
+		initPoolDebugging();
+		debug->restarting = false;
+		debug->spawning = false;
+		debug->testOverflowRequestQueue = true;
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/",
+			"PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE", "504",
+			NULL);
+		string response = readAll(connection);
+		ensure(response.find("Status: 504 Gateway Timeout") != string::npos);
+		ensure(response.find("This website is under heavy load") != string::npos);
+	}
+
+	TEST_METHOD(50) {
+		set_test_name("PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE should work even if it is an unknown code");
+
+		initPoolDebugging();
+		debug->restarting = false;
+		debug->spawning = false;
+		debug->testOverflowRequestQueue = true;
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/",
+			"PASSENGER_REQUEST_QUEUE_OVERFLOW_STATUS_CODE", "604",
+			NULL);
+		string response = readAll(connection);
+		ensure(response.find("Status: 604 Unknown Reason-Phrase") != string::npos);
+		ensure(response.find("This website is under heavy load") != string::npos);
+	}
+
 	// Test small response buffering.
 	// Test large response buffering.
 }

data/test/integration_tests/native_packaging_spec.rb

@@ -35,6 +35,9 @@ abort "Please set the LOCATIONS_INI environment variable to the right locations.
 source_root = File.expand_path("../..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
+require 'tmpdir'
+require 'fileutils'
+require 'open-uri'
 
 BINDIR = "/usr/bin"
 SBINDIR = "/usr/sbin"
@@ -60,6 +63,12 @@ describe "A natively packaged Phusion Passenger" do
 		return capture_output("which #{command}")
 	end
 
+	def sh(*command)
+		if !system(*command)
+			abort "Command failed: #{command.join(' ')}"
+		end
+	end
+
 	specify "locations.ini only refers to existent filesystem locations" do
 		File.read(LOCATIONS_INI).split("\n").each do |line|
 			if line =~ /=/
@@ -199,4 +208,36 @@ describe "A natively packaged Phusion Passenger" do
 			output.should include("PassengerRoot #{LOCATIONS_INI}")
 		end
 	end
+
+	describe "Passenger Standalone" do
+		it "is in #{BINDIR}" do
+			which("passenger").should == "#{BINDIR}/passenger"
+		end
+
+		it "works" do
+			Dir.mktmpdir do |dir|
+				File.chmod(0755, dir)
+				Dir.chdir(dir) do
+					File.open("config.ru", "w") do |f|
+						f.write(%Q{
+							app = lambda do |env|
+								[200, { "Content-Type" => "text/plain" }, ["ok"]]
+							end
+							run app
+						})
+					end
+					Dir.mkdir("public")
+					Dir.mkdir("tmp")
+					sh("passenger start --no-compile-runtime -p 4000 -d >/dev/null")
+					begin
+						open("http://127.0.0.1:4000/") do |f|
+							f.read.should == "ok"
+						end
+					ensure
+						sh("passenger stop -p 4000")
+					end
+				end
+			end
+		end
+	end
 end

data/test/integration_tests/nginx_tests.rb

@@ -281,6 +281,7 @@ describe "Phusion Passenger for Nginx" do
 			create_nginx_controller
 			@server = "http://passenger.test:#{@nginx.port}"
 			@stub = RackStub.new('rack')
+			@nginx.set(:max_pool_size => 2)
 			@nginx.add_server do |server|
 				server[:server_name] = "passenger.test"
 				server[:root]        = "#{@stub.full_app_root}/public"

data/test/integration_tests/standalone_tests.rb

@@ -13,6 +13,8 @@ ENV['PATH'] = "#{PhusionPassenger.bin_dir}:#{ENV['PATH']}"
 # This environment variable changes Passenger Standalone's behavior,
 # so ensure that it's not set.
 ENV.delete('PASSENGER_DEBUG')
+ENV['PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY'] = '0'
+ENV['PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY']  = '0'
 
 describe "Passenger Standalone" do
 	after :each do
@@ -234,7 +236,9 @@ describe "Passenger Standalone" do
 						File.exist?("#{PhusionPassenger.source_root}/buildout").should be_false
 						
 						test_serving_application("#{command} --no-compile-runtime")
+						File.exist?("#{PhusionPassenger.source_root}/buildout").should be_false
 					ensure
+						FileUtils.rm_rf("#{PhusionPassenger.source_root}/buildout")
 						File.rename("#{PhusionPassenger.source_root}/buildout.renamed",
 							"#{PhusionPassenger.source_root}/buildout")
 					end

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

@@ -167,6 +167,28 @@ shared_examples_for "analytics logging extensions for Rails" do
 				log =~ /END: DB BENCHMARK: .* \(.*\)$/
 		end
 	end
+
+	it "applies event preprocessor to log events" do
+		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
+			class FooController < ActionController::Base
+				def index
+					db = ActiveRecord::Base.connection
+					db.execute("CREATE TABLE foobar (id INT)--secret")
+					db.execute("INSERT INTO foobar VALUES (1)")
+					render :nothing => true
+				end
+			end
+		})
+		start!(@options.merge("active_record" => true))
+		send_request_to_app("PATH_INFO" => "/foo")
+		extra_info_regex = Regexp.escape(base64("SQL\nCREATE TABLE foobar (id INT)--PASSWORD"))
+		eventually(5) do
+			flush_logging_agent(@logging_agent_password, @socket_address)
+			log = read_log
+			log =~ /BEGIN: DB BENCHMARK: .* \(.*\) #{extra_info_regex}$/ &&
+				log =~ /END: DB BENCHMARK: .* \(.*\)$/
+		end
+	end
 	
 	it "logs failed SQL queries" do
 		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{

data/test/stub/rails3.0/config/initializers/passenger.rb

@@ -1 +1,2 @@
-PhusionPassenger.install_framework_extensions! if defined?(PhusionPassenger)
+event_preprocessor = lambda { |e| e.payload[:sql].gsub!("secret","PASSWORD") if e.payload[:sql] }
+PhusionPassenger.install_framework_extensions!(:event_preprocessor => event_preprocessor ) if defined?(PhusionPassenger)

data/test/stub/rails3.1/config/initializers/passenger.rb

@@ -1 +1,2 @@
-PhusionPassenger.install_framework_extensions! if defined?(PhusionPassenger)
+event_preprocessor = lambda { |e| e.payload[:sql].gsub!("secret","PASSWORD") if e.payload[:sql] }
+PhusionPassenger.install_framework_extensions!(:event_preprocessor => event_preprocessor ) if defined?(PhusionPassenger)

data/test/stub/rails3.2/config/initializers/passenger.rb

@@ -1 +1,2 @@
-PhusionPassenger.install_framework_extensions! if defined?(PhusionPassenger)
+event_preprocessor = lambda { |e| e.payload[:sql].gsub!("secret","PASSWORD") if e.payload[:sql] }
+PhusionPassenger.install_framework_extensions!(:event_preprocessor => event_preprocessor ) if defined?(PhusionPassenger)

data/test/stub/rails4.0/config/initializers/passenger.rb

@@ -1 +1,5 @@
-PhusionPassenger.install_framework_extensions! if defined?(PhusionPassenger)
+if defined?(PhusionPassenger)
+	PhusionPassenger.install_framework_extensions!(
+		event_preprocessor: ->(e) { e.payload[:sql].gsub!("secret","PASSWORD") if e.payload[:sql] }
+	)
+end

data/test/stub/wsgi/passenger_wsgi.py

@@ -60,6 +60,11 @@ def application(env, start_response):
 				i += 1
 		start_response(status, [('Content-Type', 'text/html'), ('Transfer-Encoding', 'chunked')])
 		return body()
+	elif path == '/sleep':
+		sleep_time = float(env.get('HTTP_X_SLEEP', 5))
+		time.sleep(sleep_time)
+		status = 200
+		body = 'ok'
 	elif path == '/blob':
 		size = int(env.get('HTTP_X_SIZE', 1024 * 1024 * 10))
 		def body():

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.14
+  version: 4.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,6 +109,7 @@ files:
 - lib/phusion_passenger/admin_tools/server_instance.rb
 - lib/phusion_passenger/admin_tools.rb
 - lib/phusion_passenger/analytics_logger.rb
+- lib/phusion_passenger/apache2/config_options.rb
 - lib/phusion_passenger/classic_rails/cgi_fixed.rb
 - lib/phusion_passenger/classic_rails/thread_handler_extension.rb
 - lib/phusion_passenger/common_library.rb
@@ -119,6 +120,7 @@ files:
 - lib/phusion_passenger/message_channel.rb
 - lib/phusion_passenger/message_client.rb
 - lib/phusion_passenger/native_support.rb
+- lib/phusion_passenger/nginx/config_options.rb
 - lib/phusion_passenger/packaging.rb
 - lib/phusion_passenger/platform_info/apache.rb
 - lib/phusion_passenger/platform_info/apache_detector.rb
@@ -182,8 +184,8 @@ files:
 - doc/DebuggingAndStressTesting.md
 - doc/definitions.h
 - doc/images/by_sa.png
-- doc/images/conservative_spawning.png
-- doc/images/conservative_spawning.svg
+- doc/images/direct_spawning.png
+- doc/images/direct_spawning.svg
 - doc/images/glyphicons-halflings-white.png
 - doc/images/glyphicons-halflings.png
 - doc/images/icons/callouts/1.png
@@ -256,13 +258,14 @@ files:
 - doc/users_guide_snippets/support_information.txt
 - doc/users_guide_snippets/tips.txt
 - doc/users_guide_snippets/under_the_hood/page_caching_support.txt
+- doc/users_guide_snippets/under_the_hood/relationship_with_ruby.txt
 - man/passenger-config.1
 - man/passenger-memory-stats.8
 - man/passenger-status.8
 - man/passenger-stress-test.1
 - debian.template/changelog
 - debian.template/compat
-- debian.template/control
+- debian.template/control.template
 - debian.template/copyright
 - debian.template/libapache2-mod-passenger.install
 - debian.template/libapache2-mod-passenger.postinst
@@ -308,11 +311,13 @@ files:
 - helper-scripts/classic-rails-loader.rb
 - helper-scripts/classic-rails-preloader.rb
 - helper-scripts/download_binaries/extconf.rb
+- helper-scripts/meteor-loader.rb
 - helper-scripts/node-loader.js
 - helper-scripts/prespawn
 - helper-scripts/rack-loader.rb
 - helper-scripts/rack-preloader.rb
 - helper-scripts/system-memory-stats.py
+- helper-scripts/touch-dir.sh
 - helper-scripts/wsgi-loader.py
 - helper-scripts/wsgi-preloader.py
 - ext/common/agents/Base.cpp
@@ -440,21 +445,41 @@ files:
 - ext/common/Constants.h.erb
 - ext/apache2/Bucket.cpp
 - ext/apache2/Configuration.cpp
+- ext/apache2/ConfigurationCommands.cpp
+- ext/apache2/ConfigurationSetters.cpp
+- ext/apache2/CreateDirConfig.cpp
 - ext/apache2/Hooks.cpp
+- ext/apache2/MergeDirConfig.cpp
 - ext/apache2/Bucket.h
 - ext/apache2/Configuration.h
 - ext/apache2/DirectoryMapper.h
 - ext/apache2/Hooks.h
 - ext/apache2/Configuration.hpp
+- ext/apache2/ConfigurationFields.hpp
 - ext/apache2/mod_passenger.c
+- ext/apache2/ConfigurationCommands.cpp.erb
+- ext/apache2/ConfigurationFields.hpp.erb
+- ext/apache2/ConfigurationSetters.cpp.erb
+- ext/apache2/CreateDirConfig.cpp.erb
+- ext/apache2/MergeDirConfig.cpp.erb
+- ext/nginx/CacheLocationConfig.c
 - ext/nginx/Configuration.c
+- ext/nginx/ConfigurationCommands.c
 - ext/nginx/ContentHandler.c
+- ext/nginx/CreateLocationConfig.c
+- ext/nginx/MergeLocationConfig.c
 - ext/nginx/ngx_http_passenger_module.c
 - ext/nginx/StaticContentHandler.c
 - ext/nginx/Configuration.h
+- ext/nginx/ConfigurationFields.h
 - ext/nginx/ContentHandler.h
 - ext/nginx/ngx_http_passenger_module.h
 - ext/nginx/StaticContentHandler.h
+- ext/nginx/CacheLocationConfig.c.erb
+- ext/nginx/ConfigurationCommands.c.erb
+- ext/nginx/ConfigurationFields.h.erb
+- ext/nginx/CreateLocationConfig.c.erb
+- ext/nginx/MergeLocationConfig.c.erb
 - ext/nginx/config
 - ext/boost/algorithm/string/case_conv.hpp
 - ext/boost/algorithm/string/compare.hpp
@@ -2256,26 +2281,26 @@ files:
 - resources/templates/apache2/deployment_example.txt.erb
 - resources/templates/apache2/no_write_permission_to_passenger_root.txt.erb
 - resources/templates/apache2/possible_solutions_for_compilation_and_installation_problems.txt.erb
-- resources/templates/apache2/run_installer_as_root.txt.erb
 - resources/templates/apache2/welcome.txt.erb
 - resources/templates/error_layout.css
 - resources/templates/error_layout.html.template
 - resources/templates/general_error.html.template
 - resources/templates/general_error_with_html.html.template
 - resources/templates/installer_common/low_amount_of_memory_warning.txt.erb
+- resources/templates/installer_common/run_installer_as_root.txt.erb
 - resources/templates/nginx/ask_for_extra_configure_flags.txt.erb
 - resources/templates/nginx/cannot_write_to_dir.txt.erb
 - resources/templates/nginx/config_snippets.txt.erb
 - resources/templates/nginx/config_snippets_inserted.txt.erb
 - resources/templates/nginx/confirm_extra_configure_flags.txt.erb
 - resources/templates/nginx/deployment_example.txt.erb
+- resources/templates/nginx/nginx_module_sources_not_available.txt.erb
 - resources/templates/nginx/pcre_checksum_could_not_be_verified.txt.erb
 - resources/templates/nginx/pcre_could_not_be_downloaded.txt.erb
 - resources/templates/nginx/pcre_could_not_be_extracted.txt.erb
 - resources/templates/nginx/possible_solutions_for_compilation_and_installation_problems.txt.erb
 - resources/templates/nginx/possible_solutions_for_download_and_extraction_problems.txt.erb
 - resources/templates/nginx/query_download_and_install.txt.erb
-- resources/templates/nginx/run_installer_as_root.txt.erb
 - resources/templates/nginx/welcome.txt.erb
 - resources/templates/standalone/cannot_write_to_dir.txt.erb
 - resources/templates/standalone/config.erb

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSEm1+AAoJECrHRaUKISqMbS8H/AqQwpqtfJ2nzmQTlLg9ePVV
-Z1BJbm4OFlbjONYhdtNxg6fCqj5AVIN1qa+pQSnXXMYdIqk8wZbCWjzOpYGFpZpS
-N9ZRiVdFXoCVd/yYE/o9CStTXA5C7p/VFYespyL8qrqrgcjC6OncMOTQnnRl0TJT
-hnMo/MIHS6CoD+0+mvBjyJWzxcgyiWpEShNJ0hPeWsNET/UsQCt8WwTJ99luI+Q7
-SFOZF+PnCg+xkPYkrfxVl4+lCNmV5+KbSuuL9Oa1BJCSsRvu5SMpTgJw2eKVYVy/
-JqfWbTFGWIdlBZuH2VhHCvX5NAJwnZsLze7oTmHOOTYGUKpsZ3WvIMFsuEAsTEA=
-=vDNO
+iQEcBAABAgAGBQJSKZrGAAoJECrHRaUKISqMSgEH/0piSIDZIAab2vN4/ds5hfCC
+FcOPzSBreoKcCGVZlY+HBnS5DIRMpYr9OYhIUtJUHWxAcyfdSvU5MoaCRHFvVFEK
+s2j+gtX22SccQBfukx50d6EVBOTh8r7Aq0/Uq8EDqkq8Zd/1UcB3xcfRDhQ73OXW
+Tqe/KC7zlXw4JEClvw3s9gFOUepXWCTQex2fnkmDLNm3PQIGVc+ePuCFAbZK97gj
+L7O8Ug3lYJ1WdLQKPTx64Z2GXq5IWPnq6zTvCfzDvuSnI+UCC5K7ZBtpKk5973el
+V8Ii+y0/wdLxeWztBdDHEeQAhnEqZHRRAaDCAUhXSmFeD5nJM+dcLCZQCexvnCM=
+=0YE2
 -----END PGP SIGNATURE-----

data/resources/templates/apache2/run_installer_as_root.txt.erb

@@ -1,8 +0,0 @@
-<red>Permission problems</red>
-
-This installer must be able to write to the following directory:
-
-  <b><%= @path || ::PASSENGER_ROOT %></b>
-
-But it can't do that, because you're running the installer as <b><%= `whoami`.strip %></b>.
-Please re-run this installer as <b>root</b>.