passenger 4.0.20 → 4.0.21

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -115,8 +115,12 @@ protected
 		return [specs, ids]
 	end
 	
-	def users_guide
-		return "#{PhusionPassenger.doc_dir}/Users guide Standalone.html"
+	def users_guide_path
+		return PhusionPassenger.standalone_doc_path
+	end
+
+	def users_guide_url
+		return STANDALONE_DOC_URL
 	end
 
 	def run_steps

data/lib/phusion_passenger/standalone/start_command.rb

@@ -26,6 +26,7 @@ require 'etc'
 require 'phusion_passenger'
 require 'phusion_passenger/plugin'
 require 'phusion_passenger/standalone/command'
+require 'phusion_passenger/platform_info/operating_system'
 
 # We lazy load as many libraries as possible not only to improve startup performance,
 # but also to ensure that we don't require libraries before we've passed the dependency
@@ -228,6 +229,11 @@ private
 				wrap_desc("Where to store the PID file")) do |value|
 				@options[:pid_file] = value
 			end
+			opts.on("--temp-dir PATH", String,
+				wrap_desc("Use the given temp dir")) do |value|
+				ENV['TMPDIR'] = value
+				@options[:temp_dir] = value
+			end
 
 			opts.separator ""
 			opts.on("--nginx-bin FILENAME", String,
@@ -359,7 +365,7 @@ private
 							socket.connect_nonblock(sockaddr)
 						rescue Errno::EISCONN
 						rescue Errno::EINVAL
-							if RUBY_PLATFORM =~ /freebsd/i
+							if PlatformInfo.os_name =~ /freebsd/i
 								raise Errno::ECONNREFUSED
 							else
 								raise
@@ -481,7 +487,6 @@ private
 		puts "PID file: #{@options[:pid_file]}"
 		puts "Log file: #{@options[:log_file]}"
 		puts "Environment: #{@options[:env]}"
-
 		puts "Accessible via: #{listen_url}"
 
 		puts
@@ -490,6 +495,7 @@ private
 		else
 			puts "You can stop Phusion Passenger Standalone by pressing Ctrl-C."
 		end
+		puts "Problems? Check #{STANDALONE_DOC_URL}#troubleshooting"
 		puts "==============================================================================="
 	end
 

data/lib/phusion_passenger/utils/ansi_colors.rb

@@ -53,6 +53,15 @@ module AnsiColors
 		text.gsub!(%r{<banner>(.*?)</banner>}m, "#{BOLD}#{BLUE_BG}#{YELLOW}\\1#{DEFAULT_TERMINAL_COLOR}")
 		return text
 	end
+
+	def strip_color_tags(text)
+		text = text.gsub(%r{<b>(.*?)</b>}m, "\\1")
+		text.gsub!(%r{<red>(.*?)</red>}m, "\\1")
+		text.gsub!(%r{<green>(.*?)</green>}m, "\\1")
+		text.gsub!(%r{<yellow>(.*?)</yellow>}m, "\\1")
+		text.gsub!(%r{<banner>(.*?)</banner>}m, "\\1")
+		return text
+	end
 end
 
 end # module Utils

data/lib/phusion_passenger/utils/hosts_file_parser.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
+#  Copyright (c) 2010-2013 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,13 +22,15 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require 'phusion_passenger/platform_info/operating_system'
+
 module PhusionPassenger
 module Utils
 
 # A /etc/hosts parser. Also supports writing groups of data to the file.
 class HostsFileParser
 	def self.flush_dns_cache!
-		if RUBY_PLATFORM =~ /darwin/
+		if PlatformInfo.os_name == "macosx"
 			system("dscacheutil -flushcache")
 		end
 	end

data/node_lib/phusion_passenger/httplib_emulation.js

@@ -0,0 +1,141 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 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.
+ */
+
+/**
+ * Provides helper functions for emulating the http.Server API.
+ */
+
+var http = require('http');
+
+const HTTP_HEADERS_WITHOUT_PREFIX = {
+	'CONTENT_LENGTH': true,
+	'CONTENT_TYPE': true
+};
+
+function cgiKeyToHttpHeader(key) {
+	if (HTTP_HEADERS_WITHOUT_PREFIX[key]) {
+		return key.toLowerCase().replace(/_/g, '-');
+	} else if (key.match(/^HTTP_/)) {
+		return key.replace(/^HTTP_/, '').toLowerCase().replace(/_/g, '-');
+	} else {
+		return undefined;
+	}
+}
+
+function setHttpHeaders(httpHeaders, cgiHeaders) {
+	for (var i = 0; i < cgiHeaders.keys.length; i++) {
+		var key = cgiHeaders.keys[i];
+		var httpHeader = cgiKeyToHttpHeader(key);
+		if (httpHeader !== undefined) {
+			httpHeaders[httpHeader] = cgiHeaders[key];
+		}
+	}
+
+	if (cgiHeaders['HTTPS']) {
+		httpHeaders['x-forwarded-proto'] = 'https';
+	}
+	if (!httpHeaders['x-forwarded-for']) {
+		httpHeaders['x-forwarded-for'] = cgiHeaders['REMOTE_ADDR'];
+	}
+}
+
+function inferHttpVersion(protocolDescription) {
+	var match = protocolDescription.match(/^HTTP\/(.+)/);
+	if (match) {
+		return match[1];
+	}
+}
+
+function mayHaveRequestBody(headers) {
+	return headers['REQUEST_METHOD'] != 'GET' || headers['HTTP_UPGRADE'];
+}
+
+function createIncomingMessage(headers, socket, bodyBegin) {
+	var message = new http.IncomingMessage(socket);
+	setHttpHeaders(message.headers, headers);
+	message.cgiHeaders = headers;
+	message.httpVersion = inferHttpVersion(headers['SERVER_PROTOCOL']);
+	message.method = headers['REQUEST_METHOD'];
+	message.url    = headers['REQUEST_URI'];
+	message.connection.remoteAddress = headers['REMOTE_ADDR'];
+	message.connection.remotePort = parseInt(headers['REMOTE_PORT']);
+
+	function onSocketData(chunk) {
+		message.emit('data', chunk);
+	}
+
+	function onSocketEnd() {
+		message.emit('end');
+	}
+
+	socket.on('drain', function() {
+		message.emit('drain');
+	});
+	socket.on('timeout', function() {
+		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 (mayHaveRequestBody(headers)) {
+		socket.on('data', onSocketData);
+		socket.on('end', onSocketEnd);
+		if (bodyBegin.length > 0) {
+			process.nextTick(function() {
+				// TODO: we should check here whether the socket hasn't already been closed
+				socket.emit('data', bodyBegin);
+			});
+		}
+	} else {
+		// TODO: we should check in the next tick whether the socket hasn't already been closed
+		process.nextTick(onSocketEnd);
+	}
+
+	return message;
+}
+
+function createServerResponse(req) {
+	var res = new http.ServerResponse(req);
+	res.assignSocket(req.socket);
+	res.shouldKeepAlive = false;
+	req.socket.on('drain', function() {
+		res.emit('drain');
+	});
+	req.socket.on('timeout', function() {
+		res.emit('timeout');
+	});
+	res.once('finish', function() {
+		req.socket.destroySoon();
+	});
+	return res;
+}
+
+exports.createIncomingMessage = createIncomingMessage;
+exports.createServerResponse  = createServerResponse;

data/node_lib/phusion_passenger/line_reader.js

@@ -0,0 +1,154 @@
+/*
+ *  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.
+ */
+
+/**
+ * Class for reading a stream line-by-line.
+ * Usage:
+ *
+ * reader = new LineReader(stream);
+ * reader.readLine(function(line) {
+ *     ...
+ *     // When done:
+ *     reader.close();
+ * });
+ */
+function LineReader(stream) {
+	var self = this;
+	this.stream = stream;
+
+	this.buffer = '';
+	this.lines = [];
+	this.callbacks = [];
+	this.paused = false;
+
+	function handleLineBuffer() {
+		if (self.lineBufferIsFull()) {
+			stream.pause();
+			self.paused = true;
+		}
+
+		while (self.buffer != undefined && self.lines.length > 0 && self.callbacks.length > 0) {
+			line = self.lines.shift();
+			callback = self.callbacks.shift();
+			callback(line);
+		}
+
+		self._autoPauseOrResume();
+	}
+
+	function onData(data) {
+		var index, line, callback;
+
+		if (self.buffer == undefined) {
+			// Already closed.
+			return;
+		}
+
+		self.buffer += data;
+		while ((index = self.buffer.indexOf("\n")) != -1) {
+			line = self.buffer.substr(0, index + 1);
+			self.buffer = self.buffer.substr(index + 1);
+			self.lines.push(line);
+		}
+		handleLineBuffer();
+	}
+
+	function onEnd() {
+		if (self.buffer != undefined) {
+			self.lines.push(self.buffer);
+			self.buffer = '';
+			self.eof = true;
+			handleLineBuffer();
+		}
+	}
+
+	this.onData = onData;
+	this.onEnd  = onEnd;
+	stream.on('data', onData);
+	stream.on('end', onEnd);
+	stream.resume();
+}
+
+LineReader.prototype.close = function() {
+	this.stream.removeListener('data', this.onData);
+	this.stream.removeListener('end', this.onEnd);
+	this._pause();
+	this.buffer = undefined;
+	this.lines = undefined;
+}
+
+LineReader.prototype.isClosed = function() {
+	return this.buffer === undefined;
+}
+
+LineReader.prototype.endReached = function() {
+	return this.eof;
+}
+
+LineReader.prototype.lineBufferIsFull = function() {
+	return this.lines.length > 0;
+}
+
+LineReader.prototype.readLine = function(callback) {
+	if (this.lines.length > 0) {
+		var line = this.lines.shift();
+		if (!this.lineBufferIsFull() && this.paused) {
+			this.paused = false;
+			this.stream.resume();
+		}
+		callback(line);
+		this._autoPauseOrResume();
+	} else if (this.eof) {
+		callback(undefined);
+	} else {
+		this.callbacks.push(callback);
+	}
+}
+
+LineReader.prototype._autoPauseOrResume = function() {
+	if (this.buffer != undefined) {
+		if (this.lineBufferIsFull() || this.eof) {
+			this._pause();
+		} else {
+			this._resume();
+		}
+	}
+}
+
+LineReader.prototype._pause = function() {
+	if (!this.paused) {
+		this.paused = true;
+		this.stream.pause();
+	}
+}
+
+LineReader.prototype._resume = function() {
+	if (this.paused) {
+		this.paused = false;
+		this.stream.resume();
+	}
+}
+
+exports.LineReader = LineReader;

data/node_lib/phusion_passenger/request_handler.js

@@ -0,0 +1,65 @@
+/*
+ *  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.
+ */
+
+var net = require('net');
+var SessionProtocolParser = require('./session_protocol_parser').SessionProtocolParser;
+
+/**
+ * Handles incoming Phusion Passenger requests and emits events.
+ */
+function RequestHandler(readyCallback, clientCallback) {
+	var self = this;
+
+	function handleNewClient(socket) {
+		var state = 'PARSING_HEADER';
+		var parser = new SessionProtocolParser();
+
+		function handleData(data) {
+			if (state == 'PARSING_HEADER') {
+				var consumed = parser.feed(data);
+				if (parser.state == SessionProtocolParser.SPP_DONE) {
+					state = 'HEADER_SEEN';
+					socket.removeListener('data', handleData);
+					PhusionPassenger.emit('request', parser, socket, data.slice(consumed));
+				} else if (parser.state == SessionProtocolParser.SPP_ERROR) {
+					console.error('Header parse error');
+					socket.destroySoon();
+				}
+			} else {
+				// Do nothing.
+			}
+		}
+
+		socket.on('data', handleData);
+	}
+
+	var server = net.createServer({ allowHalfOpen: true }, handleNewClient);
+	this.server = server;
+	server.listen(0, function() {
+		readyCallback(self);
+	});
+}
+
+exports.RequestHandler = RequestHandler;