passenger 4.0.38 → 4.0.39

data/ext/ruby/extconf.rb

@@ -35,7 +35,9 @@ if RUBY_PLATFORM =~ /solaris/
 end
 
 have_header('alloca.h')
+have_header('ruby/version.h')
 have_header('ruby/io.h')
+have_var('ruby_version')
 have_func('rb_thread_io_blocking_region')
 
 with_cflags($CFLAGS) do
@@ -48,5 +50,15 @@ with_cflags($CFLAGS) do
 		File.open("Makefile", "w") do |f|
 			f.write(makefile)
 		end
+	elsif RUBY_PLATFORM =~ /darwin/
+		# The OS X Clang 503.0.38 update (circa March 15 2014) broke
+		# /usr/bin/ruby's mkmf. mkmf inserts -multiply_definedsuppress
+		# into the Makefile, but that flag is no longer supported by
+		# Clang. We remove this manually.
+		makefile = File.read("Makefile")
+		makefile.sub!(/-multiply_definedsuppress/, "")
+		File.open("Makefile", "w") do |f|
+			f.write(makefile)
+		end
 	end
 end

data/ext/ruby/passenger_native_support.c

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2013 Phusion
+ *  Copyright (c) 2010-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -27,12 +27,15 @@
 	/* Ruby 1.9 */
 	#include "ruby/intern.h"
 	#include "ruby/io.h"
-	#include "ruby/version.h"
 #else
+	/* Ruby 1.8 */
 	#include "rubysig.h"
 	#include "rubyio.h"
 	#include "version.h"
 #endif
+#ifdef HAVE_RUBY_VERSION_H
+	#include "ruby/version.h"
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -920,17 +923,19 @@ Init_passenger_native_support() {
 			#define ESTIMATED_RUBY_MINOR_VERSION '8'
 		#endif
 
-		if (strlen(ruby_version) < sizeof("1.8.7") - 1
-		 || ruby_version[0] != '1'
-		 || ruby_version[1] != '.'
-		 || ruby_version[2] != ESTIMATED_RUBY_MINOR_VERSION)
-		{
-			fprintf(stderr, " --> passenger_native_support was compiled for Ruby %s, "
-				"but you're currently running Ruby %s\n",
-				ESTIMATED_RUBY_VERSION, ruby_version);
-			fprintf(stderr, "     Refusing to load existing passenger_native_support.\n");
-			return;
-		}
+		#ifdef HAVE_RUBY_VERSION
+			if (strlen(ruby_version) < sizeof("1.8.7") - 1
+			 || ruby_version[0] != '1'
+			 || ruby_version[1] != '.'
+			 || ruby_version[2] != ESTIMATED_RUBY_MINOR_VERSION)
+			{
+				fprintf(stderr, " --> passenger_native_support was compiled for Ruby %s, "
+					"but you're currently running Ruby %s\n",
+					ESTIMATED_RUBY_VERSION, ruby_version);
+				fprintf(stderr, "     Refusing to load existing passenger_native_support.\n");
+				return;
+			}
+		#endif
 	#endif
 
 	mPassenger = rb_define_module("PhusionPassenger");

data/helper-scripts/wsgi-loader.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,7 +22,7 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-import sys, os, re, imp, traceback, socket, select, struct, logging, errno
+import sys, os, re, imp, threading, signal, traceback, socket, select, struct, logging, errno
 
 options = {}
 
@@ -68,6 +68,28 @@ def create_server_socket():
 	s.listen(1000)
 	return (filename, s)
 
+def install_signal_handlers():
+	def debug(sig, frame):
+		id2name = dict([(th.ident, th.name) for th in threading.enumerate()])
+		code = []
+		for thread_id, stack in sys._current_frames().items():
+			code.append("\n# Thread: %s(%d)" % (id2name.get(thread_id,""), thread_id))
+			for filename, lineno, name, line in traceback.extract_stack(stack):
+				code.append('  File: "%s", line %d, in %s' % (filename, lineno, name))
+				if line:
+					code.append("    %s" % (line.strip()))
+		print("\n".join(code))
+
+	def debug_and_exit(sig, frame):
+		debug(sig, frame)
+		sys.exit(1)
+
+	# Unfortunately, there's no way to install a signal handler that prints
+	# the backtrace without interrupting the current system call. os.siginterrupt()
+	# doesn't seem to work properly either. That is why we only have a SIGABRT
+	# handler and no SIGQUIT handler.
+	signal.signal(signal.SIGABRT, debug_and_exit)
+
 def advertise_sockets(socket_filename):
 	print("!> socket: main;unix:%s;session;1" % socket_filename)
 	print("!> ")
@@ -270,6 +292,7 @@ if __name__ == "__main__":
 	handshake_and_read_startup_request()
 	app_module = load_app()
 	socket_filename, server_socket = create_server_socket()
+	install_signal_handlers()
 	handler = RequestHandler(server_socket, sys.stdin, app_module.application)
 	print("!> Ready")
 	advertise_sockets(socket_filename)

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.38'
+	VERSION_STRING = '4.0.39'
 	
 	PREFERRED_NGINX_VERSION = '1.4.6'
 	NGINX_SHA256_CHECKSUM = '7a8b5b15d708b5b9c61e723bd93faa247b06c8b90babb76f612c128edb5812c6'

data/lib/phusion_passenger/config/about_command.rb

@@ -42,6 +42,7 @@ class AboutCommand < Command
 		puts "  includedir               Show the Nginx runtime library headers directory."
 		puts "  nginx-addon-dir          Show #{PROGRAM_NAME}'s Nginx addon directory."
 		puts "  nginx-libs               Show Nginx runtime library flags."
+		puts "  resourcesdir             Show #{PROGRAM_NAME}'s resources directory."
 		puts "  compiled                 Check whether runtime libraries are compiled."
 		puts "  natively-packaged        Check whether Phusion Passenger is natively"
 		puts "                           packaged."
@@ -77,6 +78,8 @@ class AboutCommand < Command
 			puts PhusionPassenger.nginx_module_source_dir
 		when "--nginx-libs"
 			puts "#{common_library.link_objects_as_string} #{PhusionPassenger.lib_dir}/common/libboost_oxt.a"
+		when "--resourcesdir"
+			puts PhusionPassenger.resources_dir
 		when "--compiled"
 			common_library.link_objects.each do |filename|
 				if !File.exist?(filename)

data/lib/phusion_passenger/rack/thread_handler_extension.rb

@@ -67,10 +67,7 @@ module ThreadHandlerExtension
 			end
 			env[RACK_HIJACK_P] = true
 			env[RACK_HIJACK] = lambda do
-				env[RACK_HIJACK_IO] ||= begin
-					connection.stop_simulating_eof!
-					connection
-				end
+				env[RACK_HIJACK_IO] ||= connection
 			end
 			
 			begin

data/lib/phusion_passenger/request_handler/thread_handler.rb

@@ -46,7 +46,6 @@ class ThreadHandler
 	OOBW           = 'OOBW'.freeze
 	PASSENGER_CONNECT_PASSWORD  = 'PASSENGER_CONNECT_PASSWORD'.freeze
 	CONTENT_LENGTH = 'CONTENT_LENGTH'.freeze
-	HTTP_TRANSFER_ENCODING = 'HTTP_TRANSFER_ENCODING'.freeze
 
 	MAX_HEADER_SIZE = 128 * 1024
 
@@ -277,10 +276,6 @@ private
 #	end
 
 	def prepare_request(connection, headers)
-		if !may_have_request_body?(headers)
-			connection.simulate_eof!
-		end
-
 		if @analytics_logger && headers[PASSENGER_TXN_ID]
 			txn_id = headers[PASSENGER_TXN_ID]
 			union_station_key = headers[PASSENGER_UNION_STATION_KEY]
@@ -310,10 +305,6 @@ private
 	end
 	
 	def finalize_request(connection, headers, has_error)
-		if connection
-			connection.stop_simulating_eof!
-		end
-
 		log = headers[PASSENGER_ANALYTICS_WEB_LOG]
 		if log && !log.closed?
 			exception_occurred = false
@@ -385,18 +376,6 @@ private
 		end
 	end
 
-	def may_have_request_body?(headers)
-		if headers[REQUEST_METHOD] == GET
-			if content_length = headers[CONTENT_LENGTH]
-				return content_length != 0
-			else
-				return headers.has_key?(HTTP_TRANSFER_ENCODING)
-			end
-		else
-			return true
-		end
-	end
-
 	def should_reraise_error?(e)
 		# Stubable by unit tests.
 		return true

data/lib/phusion_passenger/standalone/command.rb

@@ -217,10 +217,8 @@ private
 		
 		File.open(@config_filename, 'w') do |f|
 			f.chmod(0644)
-			template_filename = File.join(PhusionPassenger.resources_dir,
-				"templates", "standalone", "config.erb")
 			require_erb
-			erb = ERB.new(File.read(template_filename))
+			erb = ERB.new(File.read(nginx_config_template_filename))
 			current_user = Etc.getpwuid(Process.uid).name
 			
 			# The template requires some helper methods which are defined in start_command.rb.
@@ -230,6 +228,15 @@ private
 		end
 	end
 
+	def nginx_config_template_filename
+		if @options[:nginx_config_template]
+			return @options[:nginx_config_template]
+		else
+			return File.join(PhusionPassenger.resources_dir,
+				"templates", "standalone", "config.erb")
+		end
+	end
+
 	def serialize_strset(*items)
 		if "".respond_to?(:force_encoding)
 			items = items.map { |x| x.force_encoding('binary') }

data/lib/phusion_passenger/standalone/start_command.rb

@@ -270,6 +270,10 @@ private
 				          "be used instead of downloading from the Internet")) do |value|
 				@options[:nginx_tarball] = File.expand_path(value)
 			end
+			opts.on("--nginx-config-template FILENAME", String,
+				wrap_desc("The template to use for generating the Nginx config file")) do |value|
+				@options[:nginx_config_template] = File.expand_path(value)
+			end
 			opts.on("--binaries-url-root URL", String,
 				wrap_desc("If Nginx needs to be installed, then the specified URL will be " +
 				          "checked for binaries prior to a local build.")) do |value|

data/lib/phusion_passenger/utils/tee_input.rb

@@ -72,6 +72,8 @@ module Utils
 # "rack.input" of the Rack environment.
 class TeeInput
   CONTENT_LENGTH = "CONTENT_LENGTH".freeze
+  HTTP_TRANSFER_ENCODING = "HTTP_TRANSFER_ENCODING".freeze
+  CHUNKED = "chunked".freeze
 
   # The maximum size (in +bytes+) to buffer in memory before
   # resorting to a temporary file.  Default is 112 kilobytes.
@@ -92,11 +94,18 @@ class TeeInput
   # Initializes a new TeeInput object.  You normally do not have to call
   # this unless you are writing an HTTP server.
   def initialize(socket, env)
-    @len = env[CONTENT_LENGTH]
-    @len = @len.to_i if @len
+    if @len = env[CONTENT_LENGTH]
+      @len = @len.to_i
+    elsif env[HTTP_TRANSFER_ENCODING] != CHUNKED
+      @len = 0
+    end
     @socket = socket
-    @tmp = @len && @len <= @@client_body_buffer_size ?
-           StringIO.new("") : TmpIO.new("PassengerTeeInput")
+    @bytes_read = 0
+    if @len && @len <= @@client_body_buffer_size
+      @tmp = StringIO.new("")
+    else
+      @tmp = TmpIO.new("PassengerTeeInput")
+    end
   end
 
   def close
@@ -104,18 +113,37 @@ class TeeInput
   end
 
   def size
-    @len and return @len
-    pos = @tmp.pos
-    consume!
-    @tmp.pos = pos
-    @len = @tmp.size
+    if @len
+      @len
+    else
+      pos = @tmp.pos
+      consume!
+      @tmp.pos = pos
+      @len = @tmp.size
+    end
   end
 
-  def read(*args)
-    if socket_drained?
-      @tmp.read(*args)
+  def read(len = nil, buf = "")
+    buf ||= ""
+    if len
+      if len < 0
+        raise ArgumentError, "negative length #{len} given"
+      elsif len == 0
+        buf.replace('')
+        buf
+      else
+        if socket_drained?
+          @tmp.read(len, buf)
+        else
+          tee(read_exact(len, buf))
+        end
+      end
     else
-      tee(@socket.read(*args))
+      if socket_drained?
+        @tmp.read(nil, buf)
+      else
+        tee(read_all(buf))
+      end
     end
   end
 
@@ -123,7 +151,18 @@ class TeeInput
     if socket_drained?
       @tmp.gets
     else
-      tee(@socket.gets)
+      if @bytes_read == @len
+        nil
+      elsif line = @socket.gets
+        if @len
+          max_len = @len - @bytes_read
+          line.slice!(max_len, line.size - max_len)
+        end
+        @bytes_read += line.size
+        tee(line)
+      else
+        nil
+      end
     end
   end
 
@@ -160,6 +199,7 @@ private
   def consume!
     junk = ""
     nil while read(16 * 1024, junk)
+    @socket = nil
   end
 
   def tee(buffer)
@@ -168,6 +208,34 @@ private
     end
     buffer
   end
+
+  def read_exact(len, buf)
+    if @len
+      max_len = @len - @bytes_read
+      len = max_len if len > max_len
+      return nil if len == 0
+    end
+    ret = @socket.read(len, buf)
+    @bytes_read += ret.size if ret
+    ret
+  end
+
+  def read_all(buf)
+    if @len
+      ret = @socket.read(@len - @bytes_read, buf)
+      if ret
+        @bytes_read += ret.size
+        ret
+      else
+        buf.replace("")
+        buf
+      end
+    else
+      ret = @socket.read(nil, buf)
+      @bytes_read += ret.size
+      ret
+    end
+  end
 end
 
 end # module Utils

data/lib/phusion_passenger/utils/terminal_choice_menu.rb

@@ -109,6 +109,9 @@ private
 		when " "
 			process_toggle
 			return false
+		when "!"
+			process_disable_utf8
+			return false
 		when "\r"
 			return true
 		else
@@ -131,6 +134,10 @@ private
 		@choices[@pointer].toggle!
 	end
 
+	def process_disable_utf8
+		ENV['UTF8_MENUS'] = '0'
+	end
+
 	def render_to_string
 		str = ""
 		@choices.each_with_index do |choice, i|
@@ -143,11 +150,11 @@ private
 	end
 
 	def render_pointer(index)
-		return @pointer == index ? "‣" : " "
+		return @pointer == index ? maybe_utf8("‣", ">") : " "
 	end
 
 	def render_checkbox(checked)
-		return checked ? "⬢" : "⬡"
+		return checked ? maybe_utf8("⬢", "(*)") : maybe_utf8("⬡", "( )")
 	end
 
 	def display(str)
@@ -163,6 +170,14 @@ private
 		end
 	end
 
+	def maybe_utf8(utf8, plain)
+		if ENV['UTF8_MENUS'] == '0'
+			return plain
+		else
+			return utf8
+		end
+	end
+
 	def hide_cursor
 		display("\x1b[?25l")
 	end