passenger 4.0.36 → 4.0.37

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.36'
+	VERSION_STRING = '4.0.37'
 	
 	PREFERRED_NGINX_VERSION = '1.4.4'
 	NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'

data/lib/phusion_passenger/config/detach_process_command.rb

@@ -0,0 +1,96 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2014 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+require 'optparse'
+PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'admin_tools/server_instance'
+PhusionPassenger.require_passenger_lib 'config/command'
+PhusionPassenger.require_passenger_lib 'config/utils'
+
+module PhusionPassenger
+module Config
+
+class DetachProcessCommand < Command
+	include PhusionPassenger::Config::Utils
+
+	def self.description
+		return "Detach an application process from the process pool"
+	end
+
+	def run
+		parse_options
+		select_passenger_instance
+		@admin_client = connect_to_passenger_admin_socket(:role => :passenger_status)
+		perform_detach
+	end
+
+private
+	def self.create_option_parser(options)
+		OptionParser.new do |opts|
+			nl = "\n" + ' ' * 37
+			opts.banner = "Usage: passenger-config detach-process [OPTIONS] <PID>\n"
+			opts.separator ""
+			opts.separator "  Remove an application process from the #{PROGRAM_NAME} process pool."
+			opts.separator "  Has a similar effect to killing the application process directly with"
+			opts.separator "  `kill <PID>`, but killing directly may cause the HTTP client to see an"
+			opts.separator "  error, while using this command guarantees that clients see no errors."
+			opts.separator ""
+
+			opts.separator "Options:"
+			opts.on("--instance INSTANCE_PID", Integer, "The #{PROGRAM_NAME} instance to select") do |value|
+				options[:instance] = value
+			end
+			opts.on("-h", "--help", "Show this help") do
+				options[:help] = true
+			end
+		end
+	end
+
+	def help
+		puts @parser
+	end
+
+	def parse_options
+		super
+		if @argv.empty?
+			abort "Please pass a PID. " +
+				"See --help for more information."
+		elsif @argv.size == 1
+			@pid = @argv[0].to_i
+		elsif @argv.size > 1
+			help
+			abort
+		end
+	end
+
+	def perform_detach
+		if @admin_client.pool_detach_process(@pid)
+			puts "Process #{@pid} detached."
+		else
+			abort "Could not detach process #{@pid}."
+		end
+	end
+end
+
+end # module Config
+end # module PhusionPassenger

data/lib/phusion_passenger/config/main.rb

@@ -28,6 +28,7 @@ module PhusionPassenger
 # Core of the `passenger-config` command. Dispatches a subcommand to a specific class.
 module Config
 	KNOWN_COMMANDS = [
+		["detach-process", "DetachProcessCommand"],
 		["restart-app", "RestartAppCommand"],
 		["validate-install", "ValidateInstallCommand"],
 		["about", "AboutCommand"]

data/lib/phusion_passenger/request_handler.rb

@@ -95,6 +95,11 @@ class RequestHandler
 			"analytics_logger",
 			"pool_account_username"
 		)
+
+		@force_http_session = ENV["_PASSENGER_FORCE_HTTP_SESSION"] == "true"
+		if @force_http_session
+			@connect_password = nil
+		end
 		@thread_handler = options["thread_handler"] || ThreadHandler
 		@concurrency = 1
 		if options["pool_account_password_base64"]
@@ -114,7 +119,7 @@ class RequestHandler
 		@server_sockets[:main] = {
 			:address     => @main_socket_address,
 			:socket      => @main_socket,
-			:protocol    => :session,
+			:protocol    => @force_http_session ? :http_session : :session,
 			:concurrency => @concurrency
 		}
 
@@ -125,7 +130,7 @@ class RequestHandler
 			:protocol    => :http,
 			:concurrency => 1
 		}
-		
+
 		@owner_pipe = owner_pipe
 		@options = options
 		@previous_signal_handlers = {}
@@ -308,7 +313,7 @@ private
 		# is still bugged as of version 1.7.0. They can
 		# cause unexplicable freezes when used in combination
 		# with threading.
-		return ruby_engine != "jruby"
+		return !@force_http_session && ruby_engine != "jruby"
 	end
 
 	def create_unix_socket_on_filesystem
@@ -400,7 +405,9 @@ private
 		main_socket_options = common_options.merge(
 			:server_socket => @main_socket,
 			:socket_name => "main socket",
-			:protocol => :session
+			:protocol => @server_sockets[:main][:protocol] == :session ?
+				:session :
+				:http
 		)
 		http_socket_options = common_options.merge(
 			:server_socket => @http_socket,

data/node_lib/phusion_passenger/httplib_emulation.js

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013 Phusion
+ *  Copyright (c) 2013-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -68,11 +68,15 @@ function inferHttpVersion(protocolDescription) {
 	}
 }
 
-function mayHaveRequestBody(headers) {
-	return headers['REQUEST_METHOD'] != 'GET' || headers['HTTP_UPGRADE'];
-}
-
 function createIncomingMessage(headers, socket, bodyBegin) {
+	/* Node's HTTP parser simulates an 'end' event if it determines that
+	 * the request should not have a request body. Currently (Node 0.10.18),
+	 * it thinks GET requests without an Upgrade header should not have a
+	 * request body, even though technically such GET requests are allowed
+	 * to have a request body. For compatibility reasons we implement the
+	 * same behavior as Node's HTTP parser.
+	 */
+
 	var message = new http.IncomingMessage(socket);
 	setHttpHeaders(message.headers, headers);
 	message.cgiHeaders = headers;
@@ -81,7 +85,14 @@ function createIncomingMessage(headers, socket, bodyBegin) {
 	message.url    = headers['REQUEST_URI'];
 	message.connection.remoteAddress = headers['REMOTE_ADDR'];
 	message.connection.remotePort = parseInt(headers['REMOTE_PORT']);
-	message._mayHaveRequestBody = mayHaveRequestBody(headers);
+	message.upgrade = !!headers['HTTP_UPGRADE'];
+
+	if (message.upgrade) {
+		// Emit end event as described above.
+		message.push(null);
+		return message;
+	}
+
 	message._emitEndEvent = IncomingMessage_emitEndEvent;
 	resetIncomingMessageOverridedMethods(message);
 
@@ -95,14 +106,7 @@ function createIncomingMessage(headers, socket, bodyBegin) {
 		message.emit('timeout');
 	});
 
-	/* Node's HTTP parser simulates an 'end' event if it determines that
-	 * the request should not have a request body. Currently (Node 0.10.18),
-	 * it thinks GET requests without an Upgrade header should not have a
-	 * request body, even though technically such GET requests are allowed
-	 * to have a request body. For compatibility reasons we implement the
-	 * same behavior as Node's HTTP parser.
-	 */
-	if (message._mayHaveRequestBody) {
+	if (headers['REQUEST_METHOD'] != 'GET') {
 		if (bodyBegin.length > 0) {
 			message.push(bodyBegin);
 		}
@@ -112,6 +116,7 @@ function createIncomingMessage(headers, socket, bodyBegin) {
 			}
 		}
 	} else {
+		// Emit end event as described above.
 		message.push(null);
 	}
 
@@ -139,6 +144,7 @@ function IncomingMessage_on(event, listener) {
 	}
 	this._orig_on.call(this, event, listener);
 	resetIncomingMessageOverridedMethods(this);
+	return this;
 }
 
 function IncomingMessage_emitEndEvent() {

data/test/cxx/RequestHandlerTest.cpp

@@ -6,6 +6,7 @@
 #include <Utils/json.h>
 #include <Utils/IOUtils.h>
 #include <Utils/Timer.h>
+#include <Utils/BufferedIO.h>
 
 #include <boost/shared_array.hpp>
 #include <string>
@@ -51,6 +52,7 @@ namespace tut {
 			setPrintAppOutputAsDebuggingMessages(true);
 
 			agentOptions.passengerRoot = resourceLocator->getRoot();
+			agentOptions.defaultRubyCommand = DEFAULT_RUBY;
 			agentOptions.defaultUser   = testConfig["default_user"].asString();
 			agentOptions.defaultGroup  = testConfig["default_group"].asString();
 			root = resourceLocator->getRoot();
@@ -972,6 +974,84 @@ namespace tut {
 		ensure(containsSubstring(response, "Counter: 2\n"));
 	}
 
+	TEST_METHOD(53) {
+		set_test_name("It supports switching protocols when communicating over application session sockets");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"PASSENGER_APP_ROOT", wsgiAppPath.c_str(),
+			"PATH_INFO", "/switch_protocol",
+			"HTTP_UPGRADE", "raw",
+			"HTTP_CONNECTION", "Upgrade",
+			NULL
+		);
+
+		BufferedIO io(connection);
+		string header;
+		bool done = false;
+
+		ensure_equals(io.readLine(), "HTTP/1.1 101 Switching Protocols\r\n");
+
+		do {
+			string line = io.readLine();
+			done = line.empty() || line == "\r\n";
+			if (!done) {
+				header.append(line);
+			}
+		} while (!done);
+
+		ensure("(1)", containsSubstring(header, "Upgrade: raw\r\n"));
+		ensure("(2)", containsSubstring(header, "Connection: Upgrade\r\n"));
+
+		writeExact(connection, "hello\n");
+		ensure_equals(io.readLine(), "Echo: hello\n");
+	}
+
+	TEST_METHOD(54) {
+		set_test_name("It supports switching protocols when communication over application http_session sockets");
+
+		init();
+		connect();
+		sendHeaders(defaultHeaders,
+			"_PASSENGER_FORCE_HTTP_SESSION", "true",
+			"PASSENGER_APP_ROOT", rackAppPath.c_str(),
+			"PASSENGER_APP_TYPE", "rack",
+			"REQUEST_URI", "/switch_protocol",
+			"PATH_INFO", "/switch_protocol",
+			"HTTP_UPGRADE", "raw",
+			"HTTP_CONNECTION", "Upgrade",
+			NULL
+		);
+
+		BufferedIO io(connection);
+		string header;
+		bool done = false;
+		vector<ProcessPtr> processes;
+
+		ensure_equals(io.readLine(), "HTTP/1.1 101 Switching Protocols\r\n");
+		processes = pool->getProcesses();
+		{
+			LockGuard l(pool->syncher);
+			ProcessPtr process = processes[0];
+			ensure_equals(process->sessionSockets.top()->protocol, "http_session");
+		}
+
+		do {
+			string line = io.readLine();
+			done = line.empty() || line == "\r\n";
+			if (!done) {
+				header.append(line);
+			}
+		} while (!done);
+
+		ensure("(1)", containsSubstring(header, "Upgrade: raw\r\n"));
+		ensure("(2)", containsSubstring(header, "Connection: Upgrade\r\n"));
+
+		writeExact(connection, "hello\n");
+		ensure_equals(io.readLine(), "Echo: hello\n");
+	}
+
 	// Test small response buffering.
 	// Test large response buffering.
 }

data/test/integration_tests/apache2_tests.rb

@@ -158,6 +158,63 @@ describe "Apache 2 module" do
 		end
 	end
 
+	describe "a Node.js app running on the root URI" do
+		before :all do
+			create_apache2_controller
+			@server = "http://1.passenger.test:#{@apache2.port}"
+			@stub = NodejsStub.new('node')
+			@apache2 << "RailsMaxPoolSize 1"
+			@apache2.set_vhost("1.passenger.test", "#{@stub.full_app_root}/public")
+			@apache2.start
+		end
+
+		after :all do
+			@stub.destroy
+			@apache2.stop if @apache2
+		end
+
+		before :each do
+			@stub.reset
+		end
+
+		it_should_behave_like "an example web app"
+	end
+
+	describe "a Node.js app running in a sub-URI" do
+		before :all do
+			create_apache2_controller
+			@server = "http://1.passenger.test:#{@apache2.port}/subapp"
+			@stub = NodejsStub.new('node')
+			@apache2 << "RailsMaxPoolSize 1"
+			@apache2.set_vhost("1.passenger.test", File.expand_path("stub")) do |vhost|
+				vhost << %Q{
+					Alias /subapp #{@stub.full_app_root}/public
+					<Location /subapp>
+						PassengerBaseURI /subapp
+						PassengerAppRoot #{@stub.full_app_root}
+					</Location>
+				}
+			end
+			@apache2.start
+		end
+
+		after :all do
+			@stub.destroy
+			@apache2.stop if @apache2
+		end
+
+		before :each do
+			@stub.reset
+		end
+
+		it_should_behave_like "an example web app"
+
+		it "does not interfere with the root website" do
+			@server = "http://1.passenger.test:#{@apache2.port}"
+			get('/').should == "This is the stub directory."
+		end
+	end
+
 	describe "compatibility with other modules" do
 		before :all do
 			create_apache2_controller

data/test/integration_tests/nginx_tests.rb

@@ -163,6 +163,68 @@ describe "Phusion Passenger for Nginx" do
 		end
 	end
 
+	describe "a Node.js app running on the root URI" do
+		before :all do
+			create_nginx_controller
+			@server = "http://1.passenger.test:#{@nginx.port}"
+			@stub = NodejsStub.new('node')
+			@nginx.add_server do |server|
+				server[:server_name] = "1.passenger.test"
+				server[:root]        = "#{@stub.full_app_root}/public"
+			end
+			@nginx.start
+		end
+
+		after :all do
+			@stub.destroy
+			@nginx.stop if @nginx
+		end
+
+		before :each do
+			@stub.reset
+		end
+
+		it_should_behave_like "an example web app"
+	end
+
+	describe "a Node.js app running in a sub-URI" do
+		before :all do
+			create_nginx_controller
+			@server = "http://1.passenger.test:#{@nginx.port}/subapp"
+			@stub = NodejsStub.new('node')
+			@nginx.add_server do |server|
+				server[:server_name] = "1.passenger.test"
+				server[:root]        = "#{PhusionPassenger.source_root}/test/stub"
+				server << %Q{
+					location ~ ^/subapp(/.*|$) {
+						alias #{@stub.full_app_root}/public$1;
+						passenger_base_uri /subapp;
+						passenger_document_root #{@stub.full_app_root}/public;
+						passenger_app_root #{@stub.full_app_root};
+						passenger_enabled on;
+					}
+				}
+			end
+			@nginx.start
+		end
+
+		after :all do
+			@stub.destroy
+			@nginx.stop if @nginx
+		end
+
+		before :each do
+			@stub.reset
+		end
+
+		it_should_behave_like "an example web app"
+
+		it "does not interfere with the root website" do
+			@server = "http://1.passenger.test:#{@nginx.port}"
+			get('/').should == "This is the stub directory."
+		end
+	end
+
 	describe "various features" do
 		before :all do
 			create_nginx_controller