passenger 4.0.20 → 4.0.21

data/node_lib/phusion_passenger/session_protocol_parser.js

@@ -0,0 +1,113 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2012-2013 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.
+ */
+
+const SPP_PARSING_SIZE    = SessionProtocolParser.SPP_PARSING_SIZE = 0;
+const SPP_PARSING_HEADERS = SessionProtocolParser.SPP_PARSING_HEADERS = 1;
+const SPP_DONE            = SessionProtocolParser.SPP_DONE = 10;
+const SPP_ERROR           = SessionProtocolParser.SPP_ERROR = 11;
+
+const ENCODING = 'binary';
+
+function SessionProtocolParser() {
+	this.state = SPP_PARSING_SIZE;
+	this.processed = 0;
+	this.size = 0;
+	this.keys = [];
+}
+
+SessionProtocolParser.prototype.feed = function(buffer) {
+	var consumed = 0;
+	var locallyConsumed;
+
+	while (consumed < buffer.length && this.state != SPP_ERROR && this.state != SPP_DONE) {
+		switch (this.state) {
+		case SPP_PARSING_SIZE:
+			this.size += buffer[consumed] * Math.pow(256, 3 - this.processed);
+			locallyConsumed = 1;
+			this.processed++;
+			if (this.processed == 4) {
+				this.state = SPP_PARSING_HEADERS;
+				this.buffer = new Buffer(this.size);
+				this.processed = 0;
+			}
+			break;
+
+		case SPP_PARSING_HEADERS:
+			locallyConsumed = Math.min(buffer.length - consumed, this.buffer.length - this.processed);
+			buffer.copy(this.buffer, this.processed, consumed, consumed + locallyConsumed);
+			this.processed += locallyConsumed;
+			if (this.processed == this.buffer.length) {
+				this.state = SPP_DONE;
+				this.parse();
+			}
+			break;
+
+		default:
+			console.assert(false);
+			break;
+		}
+
+		consumed += locallyConsumed;
+	}
+
+	return consumed;
+}
+
+SessionProtocolParser.prototype.parse = function() {
+	function findZero(buffer, start) {
+		while (start < buffer.length) {
+			if (buffer[start] == 0) {
+				return start;
+			} else {
+				start++;
+			}
+		}
+		return -1;
+	}
+
+	var start = 0;
+	var key, value;
+
+	while (start < this.buffer.length) {
+		var keyEnd = findZero(this.buffer, start);
+		if (keyEnd != -1 && keyEnd + 1 < this.buffer.length) {
+			var valueStart = keyEnd + 1;
+			var valueEnd   = findZero(this.buffer, valueStart);
+			if (valueEnd != -1) {
+				key = this.buffer.toString(ENCODING, start, keyEnd);
+				value = this.buffer.toString(ENCODING, valueStart, valueEnd);
+				start = valueEnd + 1;
+				this.keys.push(key);
+				this[key] = value;
+			} else {
+				start = this.buffer.length;
+			}
+		} else {
+			start = this.buffer.length;
+		}
+	}
+}
+
+exports.SessionProtocolParser = SessionProtocolParser;

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

@@ -18,7 +18,8 @@ Apache configuration file and set its DocumentRoot to <b>/somewhere/public</b>:
 And that's it! You may also want to check the Users Guide for security and
 optimization tips, troubleshooting and other useful information:
 
-  <yellow><%= @users_guide %></yellow>
+  <yellow><%= @users_guide_path %></yellow>
+  <yellow><%= @users_guide_url %></yellow>
 
 Enjoy Phusion Passenger, a product of Phusion (<b><%= @phusion_website %></b>) :-)
 <b><%= @passenger_website %></b>

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

@@ -0,0 +1,14 @@
+<% @other_installs.each do |result| %>
+ * To compile against <yellow>Apache <%= result.version %> (<%= result.apxs2 %>)</yellow>:
+   Re-run this installer with: <b>--apxs2-path "<%= result.apxs2 %>"</b>
+<% end %>
+You may also want to read the "Installation" section of the manual for
+installation troubleshooting:
+
+  <%= PhusionPassenger.apache2_doc_path %>
+  <%= APACHE2_DOC_URL %>
+
+If you keep having problems installing, please visit the following website for
+support:
+
+  <%= SUPPORT_URL %>

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

@@ -0,0 +1,15 @@
+<yellow>Multiple Apache installations detected!</yellow>
+
+You are about to install <%= PhusionPassenger::PROGRAM_NAME %> against the following
+Apache installation:
+
+  <b>Apache <%= @current.version %></b>
+  apxs2     : <%= @current.apxs2 %>
+  Executable: <%= @current.httpd %>
+
+However, <%= @other_installs.size %> other Apache installation(s) have been found on your system:
+<% @other_installs.each do |result| %>
+  * Apache <%= result.version %>
+    apxs2     : <%= result.apxs2 %>
+    Executable: <%= result.httpd %>
+<% end %>

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

@@ -2,10 +2,9 @@
 
 Please read our Users guide for troubleshooting tips:
 
-   <b><%= @users_guide %></b>
+   <b><%= @users_guide_path %></b>
+   <b><%= @users_guide_url %></b>
 
-If that doesn't help, please use our support facilities at:
+If that doesn't help, please use our support facilities. We'll do our best to help you.
 
-   <b><%= @passenger_website %></b>
-
-We'll do our best to help you.
+   <b><%= @support_url %></b>

data/resources/templates/general_error_with_html.html.template

@@ -1 +1 @@
-{{MESSAGE}}
+{{MESSAGE|raw}}

data/resources/templates/installer_common/gem_install_permission_problems.txt.erb

@@ -0,0 +1,17 @@
+<red>Permission problems in your gem directory detected</red>
+
+Your gem directory is <%= Gem.dir %>, and the
+files within are supposed to be owned by the '<%= `whoami`.strip %>' user.
+However, it looks like you installed the Phusion Passenger gem with 'sudo',
+causing some files within to be owned by the 'root' user. This will cause
+permission problems later on.
+
+Please run the following command to fix the permissions:
+
+  <b>sudo chown -R <%= `whoami`.strip %> "<%= Gem.dir %>"</b>
+
+Also, please remember to run 'gem install' commands <b>without sudo</b> in the
+future. Sudo is only necessary if the gem directory is located outside the
+home directory.
+
+After having fixed the permissions, please <yellow>re-run this installer</yellow>.

data/resources/templates/installer_common/low_amount_of_memory_warning.txt.erb

@@ -1,6 +1,6 @@
 <banner>Your system does not have a lot of virtual memory</banner>
 
-Compiling Phusion Passenger works best when you have at least <%= @required %> MB of virtual
+Compiling <%= PROGRAM_NAME %> works best when you have at least <%= @required %> MB of virtual
 memory. However your system only has <%= @current %> MB of total virtual memory (<%= @ram %> MB
 RAM, <%= @swap %> MB swap). It is recommended that you temporarily add more swap space
 before proceeding. You can do it as follows:
@@ -14,9 +14,11 @@ the swap file on Linux.
 
 If you cannot activate a swap file (e.g. because you're on OpenVZ, or if you
 don't have root privileges) then you should install Phusion Passenger through
-DEB/RPM packages. Please refer to the manual for more information:
-<b><%= @doc %></b>, section
-"Installation".
+DEB/RPM packages. For more information, please refer to the manual, section
+"Installation":
+
+  <%= @doc_path %>
+  <%= @doc_url %>
 
 <b>Press Ctrl-C to abort this installer (recommended).</b>
 <b>Press Enter if you want to continue with installation anyway.</b>

data/resources/templates/installer_common/world_inaccessible_directories.txt.erb

@@ -0,0 +1,16 @@
+<yellow>Warning: some directories may be inaccessible by the web server!</yellow>
+
+The web server typically runs under a separate user account for security
+reasons. That user must be able to access the <%= PROGRAM_NAME %> files.
+However, it appears that some directories have too strict permissions. This
+may prevent the web server user from accessing <%= PROGRAM_NAME %> files.
+
+It is recommended that you relax permissions as follows:
+
+<% for dir in @directories -%>
+  sudo chmod o+x "<%= dir %>"
+<% end %>
+<b>Press Ctrl-C to return to the shell. (Recommended)</b>
+After relaxing permissions, re-run this installer.
+  -OR-
+<b>Press Enter to continue anyway.</b>

data/resources/templates/nginx/deployment_example.txt.erb

@@ -14,7 +14,8 @@ to your Nginx configuration file, set its <b>root</b> to <b>/somewhere/public</b
 And that's it! You may also want to check the Users Guide for security and
 optimization tips and other useful information:
 
-  <yellow><%= @users_guide %></yellow>
+  <yellow><%= @users_guide_path %></yellow>
+  <yellow><%= @users_guide_url %></yellow>
 
 Enjoy Phusion Passenger, a product of Phusion (<b><%= @phusion_website %></b>) :-)
 <b><%= @passenger_website %></b>

data/resources/templates/nginx/possible_solutions_for_compilation_and_installation_problems.txt.erb

@@ -2,10 +2,9 @@
 
 Please read our Users guide for troubleshooting tips:
 
-   <b><%= @users_guide %></b>
+   <b><%= @users_guide_path %></b>
+   <b><%= @users_guide_url %></b>
 
-If that doesn't help, please use our support facilities at:
+If that doesn't help, please use our support facilities. We'll do our best to help you.
 
-   <b><%= @passenger_website %></b>
-
-We'll do our best to help you.
+   <b><%= @support_url %></b>

data/resources/templates/standalone/config.erb

@@ -45,6 +45,7 @@ http {
         passenger_analytics_log_user <%= current_user %>;
     <% end %>
     <% if debugging? %>passenger_log_level 2;<% end %>
+    <% if @options[:temp_dir] %>passenger_temp_dir '<%= @options[:temp_dir] %>';<% end %>
     <% if @options[:rolling_restarts] %>passenger_rolling_restarts on;<% end %>
     <% if @options[:resist_deployment_errors] %>passenger_resist_deployment_errors on;<% end %>
 

data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp

@@ -30,8 +30,8 @@ namespace tut {
 			PipeWatcher::onData = PipeWatcher::DataCallback();
 		}
 		
-		shared_ptr<DirectSpawner> createSpawner(const Options &options) {
-			return make_shared<DirectSpawner>(bg.safe,
+		boost::shared_ptr<DirectSpawner> createSpawner(const Options &options) {
+			return boost::make_shared<DirectSpawner>(bg.safe,
 				*resourceLocator, generation);
 		}
 		
@@ -94,7 +94,7 @@ namespace tut {
 			fail("SpawnException expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
-				SpawnException::APP_STARTUP_PROTOCOL_ERROR);
+				SpawnException::APP_STARTUP_ERROR);
 			ensure(e.getErrorPage().find("hello world\n") != string::npos);
 		}
 	}

data/test/cxx/ApplicationPool2/PoolTest.cpp

@@ -34,10 +34,10 @@ namespace tut {
 		ApplicationPool2_PoolTest() {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
 			retainSessions = false;
-			spawnerConfig = make_shared<SpawnerConfig>();
-			spawnerFactory = make_shared<SpawnerFactory>(bg.safe, *resourceLocator,
+			spawnerConfig = boost::make_shared<SpawnerConfig>();
+			spawnerFactory = boost::make_shared<SpawnerFactory>(bg.safe, *resourceLocator,
 				generation, spawnerConfig);
-			pool = make_shared<Pool>(bg.safe.get(), spawnerFactory);
+			pool = boost::make_shared<Pool>(bg.safe.get(), spawnerFactory);
 			pool->initialize();
 			bg.start();
 			callback = boost::bind(&ApplicationPool2_PoolTest::_callback, this, _1, _2);
@@ -1330,7 +1330,7 @@ namespace tut {
 		);
 
 		ensure(currentException != NULL);
-		shared_ptr<SpawnException> e = dynamic_pointer_cast<SpawnException>(currentException);
+		boost::shared_ptr<SpawnException> e = dynamic_pointer_cast<SpawnException>(currentException);
 		ensure(e->getErrorPage().find("Something went wrong!") != string::npos);
 	}
 

data/test/cxx/ApplicationPool2/ProcessTest.cpp

@@ -19,7 +19,7 @@ namespace tut {
 			
 			struct sockaddr_in addr;
 			socklen_t len = sizeof(addr);
-			sockets = make_shared<SocketList>();
+			sockets = boost::make_shared<SocketList>();
 			
 			server1 = createTcpServer("127.0.0.1", 0);
 			getsockname(server1, (struct sockaddr *) &addr, &len);
@@ -48,7 +48,7 @@ namespace tut {
 	
 	TEST_METHOD(1) {
 		// Test initial state.
-		ProcessPtr process = make_shared<Process>(bg.safe,
+		ProcessPtr process = boost::make_shared<Process>(bg.safe,
 			123, "", "", adminSocket[0],
 			errorPipe[0], sockets, 0, 0);
 		process->dummy = true;
@@ -59,7 +59,7 @@ namespace tut {
 	
 	TEST_METHOD(2) {
 		// Test opening and closing sessions.
-		ProcessPtr process = make_shared<Process>(bg.safe,
+		ProcessPtr process = boost::make_shared<Process>(bg.safe,
 			123, "", "", adminSocket[0],
 			errorPipe[0], sockets, 0, 0);
 		process->dummy = true;
@@ -76,7 +76,7 @@ namespace tut {
 	TEST_METHOD(3) {
 		// newSession() checks out the socket with the smallest utilization number
 		// and sessionClosed() restores the session utilization statistics.
-		ProcessPtr process = make_shared<Process>(bg.safe,
+		ProcessPtr process = boost::make_shared<Process>(bg.safe,
 			123, "", "", adminSocket[0],
 			errorPipe[0], sockets, 0, 0);
 		process->dummy = true;
@@ -121,7 +121,7 @@ namespace tut {
 	
 	TEST_METHOD(4) {
 		// If all sockets are at their full capacity then newSession() will fail.
-		ProcessPtr process = make_shared<Process>(bg.safe,
+		ProcessPtr process = boost::make_shared<Process>(bg.safe,
 			123, "", "", adminSocket[0],
 			errorPipe[0], sockets, 0, 0);
 		process->dummy = true;

data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp

@@ -35,7 +35,7 @@ namespace tut {
 			PipeWatcher::onData = PipeWatcher::DataCallback();
 		}
 		
-		shared_ptr<SmartSpawner> createSpawner(const Options &options, bool exitImmediately = false) {
+		boost::shared_ptr<SmartSpawner> createSpawner(const Options &options, bool exitImmediately = false) {
 			char buf[PATH_MAX + 1];
 			getcwd(buf, PATH_MAX);
 			
@@ -46,7 +46,7 @@ namespace tut {
 				command.push_back("exit-immediately");
 			}
 			
-			return make_shared<SmartSpawner>(bg.safe,
+			return boost::make_shared<SmartSpawner>(bg.safe,
 				*resourceLocator,
 				generation,
 				command,
@@ -77,7 +77,7 @@ namespace tut {
 		options.appRoot      = "stub/rack";
 		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
-		shared_ptr<SmartSpawner> spawner = createSpawner(options);
+		boost::shared_ptr<SmartSpawner> spawner = createSpawner(options);
 		process = spawner->spawn(options);
 		process->requiresShutdown = false;
 		
@@ -99,7 +99,7 @@ namespace tut {
 		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		setLogLevel(-1);
-		shared_ptr<SmartSpawner> spawner = createSpawner(options, true);
+		boost::shared_ptr<SmartSpawner> spawner = createSpawner(options, true);
 		try {
 			process = spawner->spawn(options);
 			process->requiresShutdown = false;
@@ -169,7 +169,7 @@ namespace tut {
 			fail("SpawnException expected");
 		} catch (const SpawnException &e) {
 			ensure_equals(e.getErrorKind(),
-				SpawnException::PRELOADER_STARTUP_PROTOCOL_ERROR);
+				SpawnException::PRELOADER_STARTUP_ERROR);
 			ensure(e.getErrorPage().find("hello world\n") != string::npos);
 		}
 	}

data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp

@@ -30,7 +30,7 @@
 		/* Avoid compiler warning. */ \
 		(void) uid; (void) gid; (void) groups
 
-	typedef shared_ptr<Spawner> SpawnerPtr;
+	typedef boost::shared_ptr<Spawner> SpawnerPtr;
 	
 	static void addUserSwitchingCode() {
 		FILE *f = fopen("tmp.wsgi/passenger_wsgi.py", "a");

data/test/cxx/EventedBufferedInputTest.cpp

@@ -14,7 +14,7 @@ namespace tut {
 	public:
 		boost::mutex syncher;
 		int readError;
-		function<void ()> onAfterProcessingBuffer;
+		boost::function<void ()> onAfterProcessingBuffer;
 
 		MyEventedBufferedInput(SafeLibev *libev, const FileDescriptor &fd)
 			: EventedBufferedInput<>(libev, fd)
@@ -42,7 +42,7 @@ namespace tut {
 		}
 
 		virtual void afterProcessingBuffer() {
-			function<void ()> onAfterProcessingBuffer;
+			boost::function<void ()> onAfterProcessingBuffer;
 			{
 				boost::lock_guard<boost::mutex> l(syncher);
 				onAfterProcessingBuffer = this->onAfterProcessingBuffer;
@@ -56,7 +56,7 @@ namespace tut {
 	struct EventedBufferedInputTest {
 		BackgroundEventLoop bg;
 		Pipe p;
-		shared_ptr<MyEventedBufferedInput> ebi;
+		boost::shared_ptr<MyEventedBufferedInput> ebi;
 		boost::mutex syncher;
 		string log;
 		ssize_t toConsume;
@@ -64,7 +64,7 @@ namespace tut {
 		
 		EventedBufferedInputTest() {
 			p = createPipe();
-			ebi = make_shared<MyEventedBufferedInput>(bg.safe.get(), p.first);
+			ebi = boost::make_shared<MyEventedBufferedInput>(bg.safe.get(), p.first);
 			ebi->onData = onData;
 			ebi->onError = onError;
 			ebi->userData = this;
@@ -137,7 +137,7 @@ namespace tut {
 			EventedBufferedInputTest *self = (EventedBufferedInputTest *) input->userData; \
 			boost::mutex &syncher = self->syncher; \
 			string &log = self->log; \
-			shared_ptr<MyEventedBufferedInput> &ebi = self->ebi; \
+			boost::shared_ptr<MyEventedBufferedInput> &ebi = self->ebi; \
 			/* Shut up compiler warning */  \
 			(void) syncher; \
 			(void) log; \
@@ -149,7 +149,7 @@ namespace tut {
 		static void name(EventedBufferedInputTest *self) { \
 			boost::mutex &syncher = self->syncher; \
 			string &log = self->log; \
-			shared_ptr<MyEventedBufferedInput> &ebi = self->ebi; \
+			boost::shared_ptr<MyEventedBufferedInput> &ebi = self->ebi; \
 			/* Shut up compiler warning */ \
 			(void) syncher; \
 			(void) log; \