passenger 2.1.3 → 2.2.0

data/ext/nginx/ngx_http_passenger_module.h

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) Igor Sysoev
+ * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
+ * Copyright (C) 2008 Phusion
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _PASSENGER_NGINX_MODULE_H_
+#define _PASSENGER_NGINX_MODULE_H_
+
+#include <ngx_core.h>
+#include "../common/CachedFileStat.h"
+
+/**
+ * The Nginx version number as an integer.
+ * For example, on nginx 1.7.30 this value is 1007030.
+ */
+#define NGINX_VERSION_NUM \
+    (1000000 * PASSENGER_NGINX_MAJOR_VERSION + \
+     1000   * PASSENGER_NGINX_MINOR_VERSION + \
+     PASSENGER_NGINX_MICRO_VERSION)
+
+extern ngx_module_t ngx_http_passenger_module;
+
+/**
+ * The folder in which Passenger temp files are to be stored. This folder
+ * is created during Nginx initialization and removed during Nginx shutdown.
+ */
+extern const char   passenger_temp_dir[NGX_MAX_PATH];
+
+/**
+ * A static schema string to be assigned to Nginx 'upstream' strctures.
+ */
+extern ngx_str_t    passenger_schema_string;
+
+/**
+ * An autogenerated password, used for authenticating with the helper server.
+ */
+extern ngx_str_t    passenger_helper_server_password;
+
+/**
+ * The filename of the Unix socket on which the helper server is listening.
+ */
+extern const char   passenger_helper_server_socket[NGX_MAX_PATH];
+
+/**
+ * A CachedMultiFileStat object used for caching stat() calls.
+ */
+extern CachedMultiFileStat *passenger_stat_cache;
+
+#endif /* _PASSENGER_NGINX_MODULE_H_ */
+

data/ext/oxt/backtrace.cpp

@@ -27,6 +27,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/tss.hpp>
 #include <sstream>
+#include <cstring>
 #include "backtrace.hpp"
 
 namespace oxt {
@@ -142,7 +143,13 @@ format_backtrace(Iterable backtrace_list) {
 			
 			result << "     in '" << p->function << "'";
 			if (p->source != NULL) {
-				result << " (" << p->source << ":" << p->line << ")";
+				const char *source = strrchr(p->source, '/');
+				if (source != NULL) {
+					source++;
+				} else {
+					source = p->source;
+				}
+				result << " (" << source << ":" << p->line << ")";
 			}
 			result << endl;
 		}

data/ext/oxt/system_calls.cpp

@@ -104,6 +104,26 @@ syscalls::close(int fd) {
 	return ret;
 }
 
+int
+syscalls::accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) {
+	int ret;
+	CHECK_INTERRUPTION(
+		ret == -1,
+		ret = ::accept(sockfd, addr, addrlen)
+	);
+	return ret;
+}
+
+int
+syscalls::bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen) {
+	int ret;
+	CHECK_INTERRUPTION(
+		ret == -1,
+		ret = ::bind(sockfd, addr, addrlen)
+	);
+	return ret;
+}
+
 int
 syscalls::connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen) {
 	int ret;
@@ -114,6 +134,16 @@ syscalls::connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrle
 	return ret;
 }
 
+int
+syscalls::listen(int sockfd, int backlog) {
+	int ret;
+	CHECK_INTERRUPTION(
+		ret == -1,
+		ret = ::listen(sockfd, backlog)
+	);
+	return ret;
+}
+
 int
 syscalls::socket(int domain, int type, int protocol) {
 	int ret;
@@ -202,6 +232,16 @@ syscalls::fclose(FILE *fp) {
 	return ret;
 }
 
+int
+syscalls::unlink(const char *pathname) {
+	int ret;
+	CHECK_INTERRUPTION(
+		ret == -1,
+		ret = ::unlink(pathname)
+	);
+	return ret;
+}
+
 int
 syscalls::stat(const char *path, struct stat *buf) {
 	int ret;

data/ext/oxt/system_calls.hpp

@@ -49,12 +49,15 @@
  * boost::thread_interrupted upon interruption, instead of returning an EINTR
  * error.
  *
- * System call interruption is disabled by default. As long as system call
- * interruption is disabled, the replacement functions in oxt::syscalls will
- * never throw boost::thread_interrupted, and they will ignore any EINTR errors.
- * You can enable or disable system call interruption in the current scope
- * by creating instances of boost::this_thread::enable_syscall_interruption
- * and similar objects. This is similar to Boost thread interruption.
+ * Once setup_syscall_interruption_support() has been called, system call
+ * interruption is enabled by default. You can enable or disable system call
+ * interruption in the current scope by creating instances of
+ * boost::this_thread::enable_syscall_interruption or
+ * boost::this_thread::disable_syscall_interruption, respectively. When system
+ * call interruption is disabled, the oxt::syscall wrapper functions will
+ * ignore interruption requests -- that is, they will never throw
+ * boost::thread_interrupted, nor will they return EINTR errors. This is similar
+ * to Boost thread interruption.
  *
  * <h2>How to interrupt</h2>
  * Generally, oxt::thread::interrupt() and oxt::thread::interrupt_and_join()
@@ -93,7 +96,7 @@
 // This is one of the things that Java is good at and C++ sucks at. Sigh...
 
 namespace oxt {
-	static const int INTERRUPTION_SIGNAL = SIGINT;
+	static const int INTERRUPTION_SIGNAL = SIGUSR2;
 	
 	/**
 	 * Setup system call interruption support.
@@ -121,7 +124,10 @@ namespace oxt {
 		ssize_t write(int fd, const void *buf, size_t count);
 		int close(int fd);
 		
+		int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen);
+		int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
 		int connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen);
+		int listen(int sockfd, int backlog);
 		int socket(int domain, int type, int protocol);
 		int socketpair(int d, int type, int protocol, int sv[2]);
 		ssize_t recvmsg(int s, struct msghdr *msg, int flags);
@@ -132,6 +138,7 @@ namespace oxt {
 		
 		FILE *fopen(const char *path, const char *mode);
 		int fclose(FILE *fp);
+		int unlink(const char *pathname);
 		int stat(const char *path, struct stat *buf);
 		
 		time_t time(time_t *t);

data/ext/phusion_passenger/extconf.rb

@@ -1,20 +1,25 @@
 #  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
+#  Copyright (c) 2008, 2009 Phusion
 #
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
+#  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:
 #
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
 #
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#  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 'mkmf'
 $LIBS=""
 

data/ext/phusion_passenger/native_support.c

@@ -1,21 +1,26 @@
 /*
  *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (C) 2008  Phusion
+ *  Copyright (c) 2008, 2009 Phusion
  *
- *  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
+ *  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:
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
  *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  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.
  */
 #include "ruby.h"
 #include <sys/types.h>
@@ -277,6 +282,8 @@ disable_stdio_buffering() {
 	return Qnil;
 }
 
+/***************************/
+
 void
 Init_native_support() {
 	struct sockaddr_un addr;

data/lib/phusion_passenger/abstract_installer.rb

@@ -0,0 +1,196 @@
+#  Phusion Passenger - http://www.modrails.com/
+#  Copyright (c) 2008, 2009 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 'phusion_passenger/constants'
+require 'phusion_passenger/packaging'
+require 'phusion_passenger/console_text_template'
+
+module PhusionPassenger
+
+# Abstract base class for installers. Used by passenger-install-apache2-module
+# and passenger-install-nginx-module.
+class AbstractInstaller
+	PASSENGER_WEBSITE = "http://www.modrails.com/"
+	PHUSION_WEBSITE = "www.phusion.nl"
+
+	def initialize(options = {})
+		options.each_pair do |key, value|
+			instance_variable_set(:"@#{key}", value)
+		end
+	end
+	
+	def start
+		install!
+	ensure
+		reset_terminal_colors
+	end
+
+private
+	def reset_terminal_colors
+		STDOUT.write("\e[0m")
+		STDOUT.flush
+	end
+	
+	def color_print(text)
+		STDOUT.write(ConsoleTextTemplate.new(:text => text).result)
+		STDOUT.flush
+	end
+	
+	def color_puts(text)
+		color_print("#{text}\n")
+	end
+	
+	def render_template(name, options = {})
+		puts ConsoleTextTemplate.new({ :file => name }, options).result
+	end
+	
+	def new_screen
+		puts
+		line
+		puts
+	end
+	
+	def line
+		puts "--------------------------------------------"
+	end
+	
+	def prompt(message)
+		done = false
+		while !done
+			color_print "#{message}: "
+			begin
+				result = STDIN.readline
+			rescue EOFError
+				exit 2
+			end
+			result.strip!
+			done = !block_given? || yield(result)
+		end
+		return result
+	rescue Interrupt
+		exit 2
+	end
+	
+	def wait(timeout = nil)
+		return if @auto
+		begin
+			if timeout
+				require 'timeout' unless defined?(Timeout)
+				begin
+					Timeout.timeout(timeout) do
+						STDIN.readline
+					end
+				rescue Timeout::Error
+					# Do nothing.
+				end
+			else
+				STDIN.readline
+			end
+		rescue Interrupt
+			exit 2
+		end
+	end
+	
+	def sh(*args)
+		puts "# #{args.join(' ')}"
+		result = system(*args)
+		if result
+			return true
+		elsif $?.signaled? && $?.termsig == Signal.list["INT"]
+			raise Interrupt
+		else
+			return false
+		end
+	end
+	
+	def dependencies
+		return []
+	end
+	
+	def check_dependencies
+		new_screen
+		missing_dependencies = []
+		color_puts "<banner>Checking for required software...</banner>"
+		puts
+		dependencies.each do |dep|
+			color_print " * #{dep.name}... "
+			result = dep.check
+			if result.found?
+				if result.found_at
+					color_puts "<green>found at #{result.found_at}</green>"
+				else
+					color_puts "<green>found</green>"
+				end
+			else
+				color_puts "<red>not found</red>"
+				missing_dependencies << dep
+			end
+		end
+		
+		if missing_dependencies.empty?
+			return true
+		else
+			puts
+			color_puts "<red>Some required software is not installed.</red>"
+			color_puts "But don't worry, this installer will tell you how to install them.\n"
+			color_puts "<b>Press Enter to continue, or Ctrl-C to abort.</b>"
+			if PhusionPassenger.natively_packaged?
+				wait(10)
+			else
+				wait
+			end
+			
+			line
+			puts
+			color_puts "<banner>Installation instructions for required software</banner>"
+			puts
+			missing_dependencies.each do |dep|
+				print_dependency_installation_instructions(dep)
+				puts
+			end
+			color_puts "If the aforementioned instructions didn't solve your problem, then please take"
+			color_puts "a look at the Users Guide:"
+			puts
+			color_puts "  <yellow>#{users_guide}</yellow>"
+			return false
+		end
+	end
+	
+	def print_dependency_installation_instructions(dep)
+		color_puts " * To install <yellow>#{dep.name}</yellow>:"
+		if !dep.install_command.nil?
+			color_puts "   Please run <b>#{dep.install_command}</b> as root."
+		elsif !dep.install_instructions.nil?
+			color_puts "   " << dep.install_instructions
+		elsif !dep.website.nil?
+			color_puts "   Please download it from <b>#{dep.website}</b>"
+			if !dep.website_comments.nil?
+				color_puts "   (#{dep.website_comments})"
+			end
+		else
+			color_puts "   Search Google."
+		end
+	end
+end
+
+end # module PhusionPassenger