passenger 4.0.14 → 4.0.16

data/ext/nginx/config

@@ -34,6 +34,10 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
     ${ngx_addon_dir}/StaticContentHandler.c"
 NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
     ${ngx_addon_dir}/Configuration.h \
+    ${ngx_addon_dir}/ConfigurationCommands.c \
+    ${ngx_addon_dir}/CreateLocationConfig.c \
+    ${ngx_addon_dir}/MergeLocationConfig.c \
+    ${ngx_addon_dir}/CacheLocationConfig.c \
     ${ngx_addon_dir}/ContentHandler.h \
     ${ngx_addon_dir}/StaticContentHandler.h \
     ${ngx_addon_dir}/ngx_http_passenger_module.h \

data/ext/oxt/detail/tracable_exception_disabled.hpp

@@ -2,7 +2,7 @@
  * OXT - OS eXtensions for boosT
  * Provides important functionality necessary for writing robust server software.
  *
- * Copyright (c) 2010 Phusion
+ * Copyright (c) 2010-2013 Phusion
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,6 +33,26 @@ namespace oxt {
 
 class tracable_exception: public std::exception {
 public:
+	struct no_backtrace { };
+
+	tracable_exception()
+		: std::exception()
+	{
+		// Do nothing.
+	}
+
+	tracable_exception(const tracable_exception &other)
+		: std::exception(other)
+	{
+		// Do nothing.
+	}
+
+	tracable_exception(const no_backtrace &tag)
+		: std::exception()
+	{
+		// Do nothing.
+	}
+
 	virtual std::string backtrace() const throw() {
 		return "     (backtrace support disabled during compile time)\n";
 	}

data/ext/oxt/detail/tracable_exception_enabled.hpp

@@ -2,7 +2,7 @@
  * OXT - OS eXtensions for boosT
  * Provides important functionality necessary for writing robust server software.
  *
- * Copyright (c) 2010 Phusion
+ * Copyright (c) 2010-2013 Phusion
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -37,8 +37,11 @@ class tracable_exception: public std::exception {
 private:
 	std::vector<trace_point *> backtrace_copy;
 public:
+	struct no_backtrace { };
+
 	tracable_exception();
 	tracable_exception(const tracable_exception &other);
+	tracable_exception(const no_backtrace &tag);
 	virtual ~tracable_exception() throw();
 	virtual std::string backtrace() const throw();
 	virtual const char *what() const throw();

data/ext/oxt/implementation.cpp

@@ -2,7 +2,7 @@
  * OXT - OS eXtensions for boosT
  * Provides important functionality necessary for writing robust server software.
  *
- * Copyright (c) 2008-2012 Phusion
+ * Copyright (c) 2008-2013 Phusion
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -204,6 +204,12 @@ tracable_exception::tracable_exception(const tracable_exception &other)
 	}
 }
 
+tracable_exception::tracable_exception(const no_backtrace &tag)
+	: std::exception()
+{
+	// Do nothing.
+}
+
 tracable_exception::~tracable_exception() throw() {
 	vector<trace_point *>::iterator it, end = backtrace_copy.end();
 	for (it = backtrace_copy.begin(); it != end; it++) {

data/ext/oxt/macros.hpp

@@ -98,13 +98,15 @@
  * On MacOS X, neither gcc nor llvm-gcc support the __thread keyword, but Clang
  * does. It works on at least clang >= 3.0.
  */
-#if defined(__APPLE__)
-	#if defined(__clang__) && __clang_major__ >= 3
-		#define OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
-	#endif
-#elif defined(__GNUC__) && OXT_GCC_VERSION >= 40102
-	#if !defined(__SOLARIS__) && !defined(__OpenBSD__)
-		#define OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
+#ifndef PASSENGER_DISABLE_THREAD_LOCAL_STORAGE
+	#if defined(__APPLE__)
+		#if defined(__clang__) && __clang_major__ >= 3
+			#define OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
+		#endif
+	#elif defined(__GNUC__) && OXT_GCC_VERSION >= 40102
+		#if !defined(__SOLARIS__) && !defined(__OpenBSD__)
+			#define OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
+		#endif
 	#endif
 #endif
 

data/helper-scripts/backtrace-sanitizer.rb

@@ -1,4 +1,27 @@
 #!/usr/bin/env ruby
+#  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.
+
 # Parses output of the glibc backtrace() function and
 # translates addresses into function names and source
 # file locations.

data/helper-scripts/classic-rails-loader.rb

@@ -1,4 +1,27 @@
 #!/usr/bin/env ruby
+#  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.
+
 module PhusionPassenger
 module App
 	def self.options

data/helper-scripts/classic-rails-preloader.rb

@@ -1,5 +1,28 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
+#  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.
+
 GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
 
 module PhusionPassenger

data/helper-scripts/download_binaries/extconf.rb

@@ -24,11 +24,6 @@
 
 # This script is called during 'gem install'. Its role is to download
 # Phusion Passenger binaries.
-source_root = File.expand_path("../..", File.dirname(__FILE__))
-$LOAD_PATH.unshift("#{source_root}/lib")
-require 'phusion_passenger'
-PhusionPassenger.locate_directories
-require 'fileutils'
 
 # Create a dummy Makefile to prevent 'gem install' from borking out.
 File.open("Makefile", "w") do |f|
@@ -38,6 +33,16 @@ File.open("Makefile", "w") do |f|
 	f.puts "	true"
 end
 
+# Don't do anything on Windows. We don't support Windows but exiting now
+# will at least prevent the gem from being not installable on Windows.
+exit if RUBY_PLATFORM =~ /mswin/i || RUBY_PLATFORM =~ /win32/i
+
+source_root = File.expand_path("../..", File.dirname(__FILE__))
+$LOAD_PATH.unshift("#{source_root}/lib")
+require 'phusion_passenger'
+PhusionPassenger.locate_directories
+require 'fileutils'
+
 if PhusionPassenger.natively_packaged?
 	puts "Binary downloading is only available when originally packaged. Stopping."
 	exit 0

data/helper-scripts/meteor-loader.rb

@@ -0,0 +1,127 @@
+#!/usr/bin/env ruby
+# encoding: binary
+#  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.
+
+require 'socket'
+
+module PhusionPassenger
+module App
+	def self.options
+		return @@options
+	end
+	
+	def self.exit_code_for_exception(e)
+		if e.is_a?(SystemExit)
+			return e.status
+		else
+			return 1
+		end
+	end
+	
+	def self.handshake_and_read_startup_request
+		STDOUT.sync = true
+		STDERR.sync = true
+		puts "!> I have control 1.0"
+		abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
+		
+		@@options = {}
+		while (line = STDIN.readline) != "\n"
+			name, value = line.strip.split(/: */, 2)
+			@@options[name] = value
+		end
+	end
+
+	def self.ping_port(port)
+		socket_domain = Socket::Constants::AF_INET
+		sockaddr = Socket.pack_sockaddr_in(port, '127.0.0.1')
+		begin
+			socket = Socket.new(socket_domain, Socket::Constants::SOCK_STREAM, 0)
+			begin
+				socket.connect_nonblock(sockaddr)
+			rescue Errno::ENOENT, Errno::EINPROGRESS, Errno::EAGAIN, Errno::EWOULDBLOCK
+				if select(nil, [socket], nil, 0.1)
+					begin
+						socket.connect_nonblock(sockaddr)
+					rescue Errno::EISCONN
+					end
+				else
+					raise Errno::ECONNREFUSED
+				end
+			end
+			return true
+		rescue Errno::ECONNREFUSED, Errno::ENOENT
+			return false
+		ensure
+			socket.close if socket
+		end
+	end
+	
+	def self.load_app
+		port = nil
+		tries = 0
+		while port.nil? && tries < 200
+			port = 1024 + rand(9999)
+			if ping_port(port) || ping_port(port + 1) || ping_port(port + 2)
+				port = nil
+				tries += 1
+			end
+		end
+		if port.nil?
+			abort "Cannot find a suitable port to start Meteor on"
+		end
+
+		production = options["environment"] == "production" ? "production" : ""
+		pid = fork do
+			Process.setpgrp
+			exec("meteor run -p #{port} #{production}")
+		end
+		$0 = options["process_title"] if options["process_title"]
+		$0 = "#{$0} (#{pid})"
+		return [pid, port]
+	end
+	
+	
+	################## Main code ##################
+	
+	
+	handshake_and_read_startup_request
+	pid, port = load_app
+	begin
+		while !ping_port(port)
+			sleep 0.01
+		end
+		puts "!> Ready"
+		puts "!> socket: main;tcp://127.0.0.1:#{port};http_session;0"
+		puts "!> "
+		begin
+			STDIN.readline
+		rescue EOFError
+		end
+	ensure
+		Process.kill('INT', -pid) rescue nil
+		Process.waitpid(pid) rescue nil
+	end
+	
+end # module App
+end # module PhusionPassenger

data/helper-scripts/node-loader.js

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2012 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *

data/helper-scripts/rack-preloader.rb

@@ -1,5 +1,28 @@
 #!/usr/bin/env ruby
 # encoding: binary
+#  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.
+
 GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
 
 module PhusionPassenger

data/helper-scripts/system-memory-stats.py

@@ -1,4 +1,26 @@
 #!/usr/bin/env python
+#  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.
 import sys
 
 if sys.version_info[0] >= 3:

data/helper-scripts/touch-dir.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+#  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.
+
+# This script touches everything in a directory every 30 minutes to prevent
+# /tmp cleaners from removing it.
+
+set -e
+
+dir="$1"
+while true; do
+	# Sleep for approx 1800 seconds, quit if directory no longer exists.
+	i=0
+	while test $i -lt 900; do
+		sleep 2
+		if ! test -e "$dir"; then
+			exit
+		fi
+		i=$((i+1))
+	done
+
+	# Touch directory, then try loop again.
+	if test -e "$dir"; then
+		find "$dir" | xargs touch
+	else
+		exit
+	fi
+done