passenger 4.0.37 → 4.0.38

data/ext/common/Utils.h

@@ -65,8 +65,6 @@ typedef enum {
 	FT_REGULAR,
 	/** A directory. */
 	FT_DIRECTORY,
-	/** A symlink. Only returned by getFileTypeNoFollowSymlinks(), not by getFileType(). */
-	FT_SYMLINK,
 	/** Something else, e.g. a pipe or a socket. */
 	FT_OTHER
 } FileType;
@@ -123,10 +121,6 @@ bool fileExists(const StaticString &filename, CachedFileStat *cstat = 0,
  */
 FileType getFileType(const StaticString &filename, CachedFileStat *cstat = 0,
                      unsigned int throttleRate = 0);
-/**
- * Like getFileType(), but does not follow symlinks.
- */
-FileType getFileTypeNoFollowSymlinks(const StaticString &filename);
 
 /**
  * Create the given file with the given contents, permissions and ownership.

data/ext/common/Utils/ProcessMetricsCollector.h

@@ -450,14 +450,19 @@ public:
 		if (pidsArg[pidsArg.size() - 1] == ',') {
 			pidsArg.resize(pidsArg.size() - 1);
 		}
+
+		// The list of format arguments must also follow -o
+		// without a space.
+		// https://github.com/phusion/passenger/pull/94
+		string fmtArg = "-o";
+		#if defined(sun) || defined(__sun)
+			fmtArg.append("pid,ppid,pcpu,rss,vsz,pgid,uid,args");
+		#else
+			fmtArg.append("pid,ppid,%cpu,rss,vsize,pgid,uid,command");
+		#endif
 		
 		const char *command[] = {
-			"ps", "-o",
-			#if defined(sun) || defined(__sun)
-				"pid,ppid,pcpu,rss,vsz,pgid,uid,args",
-			#else
-				"pid,ppid,%cpu,rss,vsize,pgid,uid,command",
-			#endif
+			"ps", fmtArg.c_str(),
 			#ifdef PS_SUPPORTS_MULTIPLE_PIDS
 				pidsArg.c_str(),
 			#endif
@@ -469,6 +474,7 @@ public:
 			psOutput = runCommandAndCaptureOutput(command);
 		}
 		pidsArg.resize(0);
+		fmtArg.resize(0);
 		ProcessMetricMap result = parsePsOutput<Collection, ConstIterator>(psOutput, pids);
 		psOutput.resize(0);
 		if (canMeasureRealMemory) {

data/ext/nginx/ContentHandler.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010-2013 Phusion
+ * Copyright (C) 2010-2014 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -305,6 +305,21 @@ create_key(ngx_http_request_t *r)
 
 #endif
 
+/**
+ * Checks whether the given header is "Transfer-Encoding".
+ * We do not pass Transfer-Encoding headers to the HelperAgent because
+ * Nginx always buffers the request body and always sets Content-Length
+ * in the request headers.
+ */
+static int
+header_is_transfer_encoding(ngx_str_t *key)
+{
+    return key->len == sizeof("transfer-encoding") - 1 &&
+        ngx_tolower(key->data[0]) == (u_char) 't' &&
+        ngx_tolower(key->data[sizeof("transfer-encoding") - 2]) == (u_char) 'g' &&
+        ngx_strncasecmp(key->data + 1, (u_char *) "ransfer-encodin", sizeof("ransfer-encodin") - 1) == 0;
+}
+
 
 static ngx_int_t
 create_request(ngx_http_request_t *r)
@@ -475,8 +490,10 @@ create_request(ngx_http_request_t *r)
                 i = 0;
             }
 
-            len += sizeof("HTTP_") - 1 + header[i].key.len + 1
-                + header[i].value.len + 1;
+            if (!header_is_transfer_encoding(&header[i].key)) {
+                len += sizeof("HTTP_") - 1 + header[i].key.len + 1
+                    + header[i].value.len + 1;
+            }
         }
     }
 
@@ -656,6 +673,10 @@ create_request(ngx_http_request_t *r)
                 i = 0;
             }
 
+            if (header_is_transfer_encoding(&header[i].key)) {
+                continue;
+            }
+
             b->last = ngx_cpymem(b->last, "HTTP_", sizeof("HTTP_") - 1);
 
             for (n = 0; n < header[i].key.len; n++) {

data/helper-scripts/meteor-loader.rb

@@ -107,7 +107,7 @@ module App
 			abort "Cannot find a suitable port to start Meteor on"
 		end
 
-		production = options["environment"] == "production" ? "production" : ""
+		production = options["environment"] == "production" ? "--production" : ""
 		pid = fork do
 			# Meteor is quite !@#$% here: if we kill its start script
 			# with *any* signal, it'll leave a ton of garbage processes

data/helper-scripts/prespawn

@@ -109,6 +109,8 @@ class TCPPrespawnLocation < PrespawnLocation
 
 	def connect
 		TCPSocket.new('127.0.0.1', request_port)
+	rescue Errno::ECONNREFUSED
+		TCPSocket.new('::1', request_port)
 	end
 end
 

data/helper-scripts/wsgi-loader.py

@@ -191,7 +191,7 @@ class RequestHandler:
 		env['wsgi.version']      = (1, 0)
 		env['wsgi.multithread']  = False
 		env['wsgi.multiprocess'] = True
-		env['wsgi.run_once']	 = True
+		env['wsgi.run_once']	 = False
 		if env.get('HTTPS','off') in ('on', '1', 'true', 'yes'):
 			env['wsgi.url_scheme'] = 'https'
 		else:

data/lib/phusion_passenger.rb

@@ -30,13 +30,13 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.37'
+	VERSION_STRING = '4.0.38'
 	
-	PREFERRED_NGINX_VERSION = '1.4.4'
-	NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'
+	PREFERRED_NGINX_VERSION = '1.4.6'
+	NGINX_SHA256_CHECKSUM = '7a8b5b15d708b5b9c61e723bd93faa247b06c8b90babb76f612c128edb5812c6'
 
-	PREFERRED_PCRE_VERSION  = '8.32'
-	PCRE_SHA256_CHECKSUM = 'd5d8634b36baf3d08be442a627001099583b397f456bc795304a013383b6423a'
+	PREFERRED_PCRE_VERSION  = '8.34'
+	PCRE_SHA256_CHECKSUM = '1dd78994c81e44ac41cf30b2a21d4b4cc6d76ccde7fc6e77713ed51d7bddca47'
 
 	STANDALONE_INTERFACE_VERSION  = 1
 	

data/lib/phusion_passenger/abstract_installer.rb

@@ -59,6 +59,7 @@ class AbstractInstaller
 	def initialize(options = {})
 		@stdout = STDOUT
 		@stderr = STDERR
+		@auto   = !STDIN.tty?
 		options.each_pair do |key, value|
 			instance_variable_set(:"@#{key}", value)
 		end

data/lib/phusion_passenger/native_support.rb

@@ -213,7 +213,6 @@ private
 
 		STDERR.puts " --> Compiling #{library_name} for the current Ruby interpreter..."
 		STDERR.puts "     (set PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0 to disable)"
-		STDERR.puts "     -------------------------------"
 
 		require 'fileutils'
 		require 'shellwords'
@@ -268,9 +267,17 @@ private
 		return PhusionPassenger::Utils::Download.download(url, filename, real_options)
 	end
 	
-	def mkdir(dir)
+	def log(message, options = {})
+		if logger = options[:logger]
+			logger.puts(message)
+		else
+			STDERR.puts "     #{message}"
+		end
+	end
+
+	def mkdir(dir, options = {})
 		begin
-			STDERR.puts "     # mkdir -p #{dir}"
+			log("# mkdir -p #{dir}", options)
 			FileUtils.mkdir_p(dir)
 		rescue Errno::EEXIST
 		end
@@ -282,39 +289,57 @@ private
 		end
 	end
 
-	def sh_nonfatal(command_string)
-		STDERR.puts "     # #{command_string}"
-		PhusionPassenger::Utils.mktmpdir("passenger-native-support-") do |tmpdir|
-			s_tmpdir = Shellwords.escape(tmpdir)
-			result = system("#{command_string} >#{s_tmpdir}/log 2>&1")
-			system("cat #{s_tmpdir}/log | sed 's/^/     /' >&2")
-			return result
+	def sh_nonfatal(command_string, options = {})
+		log("# #{command_string}", options)
+		if logger = options[:logger]
+			s_logpath = Shellwords.escape(logger.path)
+			return system("(#{command_string}) >>#{s_logpath} 2>&1")
+		else
+			Utils.mktmpdir("passenger-native-support-") do |tmpdir|
+				s_tmpdir = Shellwords.escape(tmpdir)
+				result = system("(#{command_string}) >#{s_tmpdir}/log 2>&1")
+				system("cat #{s_tmpdir}/log | sed 's/^/     /' >&2")
+				return result
+			end
 		end
 	end
 	
 	def compile(target_dirs)
-		try_directories(target_dirs) do |target_dir|
-			result =
-				sh_nonfatal("#{PlatformInfo.ruby_command} #{Shellwords.escape extconf_rb}") &&
-				sh_nonfatal("make clean && make")
-			if result
-				STDERR.puts "     Compilation succesful."
-				[target_dir, false]
-			else
-				STDERR.puts "     Compilation failed."
-				[nil, false]
+		logger = Utils::TmpIO.new('passenger_native_support',
+			:mode   => File::WRONLY | File::APPEND,
+			:binary => false,
+			:suffix => ".log",
+			:unlink_immediately => false)
+		options = { :logger => logger }
+		begin
+			try_directories(target_dirs, options) do |target_dir|
+				result =
+					sh_nonfatal("#{PlatformInfo.ruby_command} #{Shellwords.escape extconf_rb}",
+						options) &&
+					sh_nonfatal("make clean && make", options)
+				if result
+					log "Compilation succesful. The logs are here:"
+					log logger.path
+					[target_dir, false]
+				else
+					log "Warning: compilation didn't succeed. To learn why, read this file:"
+					log logger.path
+					[nil, false]
+				end
 			end
 		end
+	ensure
+		logger.close if logger
 	end
 
-	def try_directories(dirs)
+	def try_directories(dirs, options = {})
 		result = nil
 		dirs.each_with_index do |dir, i|
 			begin
-				mkdir(dir)
+				mkdir(dir, options)
 				File.open("#{dir}/.permission_test", "w").close
 				File.unlink("#{dir}/.permission_test")
-				STDERR.puts "     # cd #{dir}"
+				log("# cd #{dir}", options)
 				Dir.chdir(dir) do
 					result, should_retry = yield(dir)
 					return result if !should_retry
@@ -325,26 +350,30 @@ private
 				# error on the last one too then propagate the
 				# exception.
 				if i == dirs.size - 1
-					STDERR.puts "     Encountered permission error, " +
-						"but no more directories to try. Giving up."
-					STDERR.puts "     -------------------------------"
+					log("Encountered permission error, " +
+						"but no more directories to try. Giving up.",
+						options)
+					log("-------------------------------", options)
 					return nil
 				else
-					STDERR.puts "     Encountered permission error, " +
-						"trying a different directory..."
-					STDERR.puts "     -------------------------------"
+					log("Encountered permission error, " +
+						"trying a different directory...",
+						options)
+					log("-------------------------------", options)
 				end
 			rescue Errno::ENOTDIR
 				# This can occur when locations.ini set buildout_dir
 				# to an invalid path. Just ignore this error.
 				if i == dirs.size - 1
-					STDERR.puts "     Not a valid directory, " +
-						"but no more directories to try. Giving up."
-					STDERR.puts "     -------------------------------"
+					log("Not a valid directory, " +
+						"but no more directories to try. Giving up.",
+						options)
+					log("-------------------------------", options)
 					return nil
 				else
-					STDERR.puts "     Not a valid directory. Trying a different one..."
-					STDERR.puts "     -------------------------------"
+					log("Not a valid directory. Trying a different one...",
+						options)
+					log("-------------------------------", options)
 				end
 			end
 		end

data/lib/phusion_passenger/packaging.rb

@@ -74,6 +74,7 @@ module Packaging
 		'CONTRIBUTORS',
 		'CONTRIBUTING.md',
 		'LICENSE',
+		'CHANGELOG',
 		'INSTALL.md',
 		'NEWS',
 		'passenger.gemspec',

data/lib/phusion_passenger/rack/out_of_band_gc.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2012-2013 Phusion
+#  Copyright (c) 2012-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -28,34 +28,104 @@ module PhusionPassenger
 module Rack
 
 class OutOfBandGc
-  def initialize(app, frequency, logger = nil)
+  # Usage:
+  #
+  #   OutOfBandGc.new(app, frequency, logger = nil)
+  #   OutOfBandGc.new(app, options = {})
+  def initialize(app, *args)
     @app = app
-    @frequency = frequency
-    @request_count = 0
-    @mutex = Mutex.new
-    
-    ::PhusionPassenger.on_event(:oob_work) do
-      t0 = Time.now
-      disabled = GC.enable
-      GC.start
-      GC.disable if disabled
-      logger.info "Out Of Band GC finished in #{Time.now - t0} sec" if logger
+    if args.size == 0 || (args.size == 1 && args[0].is_a?(Hash))
+      # OutOfBandGc.new(app, options = {})
+      initialize_with_options(args[0] || {})
+    else
+      # OutOfBandGc.new(app, frequency, logger = nil)
+      initialize_legacy(*args)
     end
   end
 
   def call(env)
     status, headers, body = @app.call(env)
 
-    @mutex.synchronize do
-      @request_count += 1
-      if @request_count == @frequency
-        @request_count = 0
+    case @strategy
+    when :counting
+      @mutex.synchronize do
+        @request_count += 1
+        if @request_count == @frequency
+          @request_count = 0
+          headers['X-Passenger-Request-OOB-Work'] = 'true'
+        end
+      end
+
+    when :gctools_oobgc
+      if GC::OOB.dry_run
         headers['X-Passenger-Request-OOB-Work'] = 'true'
       end
+
+    else
+      raise "Unrecognized Out-Of-Band GC strategy #{@strategy.inspect}"
     end
-    
+
     [status, headers, body]
   end
+
+private
+  def initialize_with_options(options)
+    @strategy = options[:strategy]
+    @logger   = options[:logger]
+
+    case @strategy
+    when :counting
+      @frequency     = options[:frequency]
+      @request_count = 0
+      @mutex         = Mutex.new
+      if !@frequency || @frequency < 1
+        raise ArgumentError, "The :frequency option must be a number that is at least 1."
+      end
+      ::PhusionPassenger.on_event(:oob_work) do
+        t0 = Time.now
+        disabled = GC.enable
+        GC.start
+        GC.disable if disabled
+        @logger.info "Out Of Band GC finished in #{Time.now - t0} sec" if @logger
+      end
+
+    when :gctools_oobgc
+      if !defined?(::GC::OOB)
+        raise "To use the :gctools_oobgc strategy, " +
+          "first add 'gem \"gctools\"' to your Gemfile, " +
+          "then call 'require \"gctools/oobgc\"' and 'GC::OOB.setup' " +
+          "before using the #{self.class.name} middleware."
+      elsif !::GC::OOB.respond_to?(:dry_run)
+        raise "To use the :gctools_oobgc strategy, you must use a sufficiently " +
+          "recent version of the gctools gem. Please see this pull request: " +
+          "https://github.com/tmm1/gctools/pull/5"
+      elsif PhusionPassenger::App.options["spawn_method"] =~ /smart/
+        # Using GC::OOB with 'smart' currently results in a segfault.
+        raise "The :gctools_oobgc strategy cannot be used with the '" +
+          PhusionPassenger::App.options["spawn_method"] + "' spawning method. " +
+          "Please use 'direct'."
+      end
+
+      ::PhusionPassenger.on_event(:oob_work) do
+        t0 = Time.now
+        GC::OOB.run
+        @logger.info "Out Of Band GC finished in #{Time.now - t0} sec" if @logger
+      end
+
+    when nil
+      raise ArgumentError, "You must specify an Out-Of-Band GC strategy with the :strategy option."
+
+    else
+      raise ArgumentError, "Invalid Out-Of-Band GC strategy #{@strategy.inspect}"
+    end
+  end
+
+  def initialize_legacy(frequency, logger = nil)
+    initialize_with_options(
+      :strategy => :counting,
+      :frequency => frequency,
+      :logger => logger)
+  end
 end
 
 end # module Rack