passenger 4.0.45 → 4.0.46

data/ext/nginx/ConfigurationCommands.c

@@ -266,7 +266,7 @@
 	ngx_conf_set_bitmask_slot,
 	NGX_HTTP_LOC_CONF_OFFSET,
 	offsetof(passenger_loc_conf_t, upstream_config.ignore_headers),
-	NULL
+	&ngx_http_upstream_ignore_headers_masks
 },
 
 {

data/ext/nginx/ConfigurationCommands.c.erb

@@ -123,6 +123,11 @@ def struct_field_for(option)
 		return "offsetof(#{struct_type_for(option)}, #{field})"
 	end
 end
+
+def post_for(option)
+	return option[:post] if option[:post]
+	return "NULL"
+end
 %>
 
 <% for option in LOCATION_CONFIGURATION_OPTIONS %>
@@ -133,6 +138,6 @@ end
 	<%= setter_function_for(option) %>,
 	<%= struct_for(option) %>,
 	<%= struct_field_for(option) %>,
-	NULL
+	<%= post_for(option) %>
 },
 <% end %>

data/ext/nginx/ContentHandler.c

@@ -533,7 +533,8 @@ create_request(ngx_http_request_t *r)
         b->last = ngx_copy(b->last, "CONTENT_LENGTH",
                            sizeof("CONTENT_LENGTH"));
 
-        b->last = ngx_snprintf(b->last, 10, "%ui", r->headers_in.content_length_n);
+        b->last = ngx_snprintf(b->last, 10, "%O",
+            r->headers_in.content_length_n);
         *b->last++ = (u_char) 0;
     }
     

data/ext/nginx/config

@@ -87,7 +87,7 @@ if [ $ngx_found = yes ]; then
     CORE_LIBS="$CORE_LIBS -lrt"
 fi
 
-nginx_version=`grep 'NGINX_VERSION ' src/core/nginx.h | awk '{ print $3 }' | sed 's/"//g'`
+nginx_version=`grep 'NGINX_VERSION ' src/core/nginx.h | awk '{ print $3 }' | sed 's/"//g' | head -n1`
 
 nginx_major_version=`echo "$nginx_version" | cut -d . -f 1`
 have=PASSENGER_NGINX_MAJOR_VERSION value="$nginx_major_version"

data/helper-scripts/node-loader.js

@@ -128,12 +128,35 @@ function generateServerSocketPath() {
 		+ process.pid + "." + ((Math.random() * 0xFFFFFFFF) & 0xFFFFFFF);
 }
 
+function addListenerAtBeginning(emitter, event, callback) {
+	var listeners = emitter.listeners(event);
+	var i;
+
+	emitter.removeAllListeners(event);
+	emitter.on(event, callback);
+	for (i = 0; i < listeners.length; i++) {
+		emitter.on(event, listeners[i]);
+	}
+}
+
 function installServer() {
 	var server = this;
 	if (!PhusionPassenger._appInstalled) {
 		PhusionPassenger._appInstalled = true;
 		PhusionPassenger._server = server;
 
+		// Ensure that req.connection.remoteAddress and remotePort return something
+		// instead of undefined. Apps like Etherpad expect it.
+		// See https://github.com/phusion/passenger/issues/1224
+		addListenerAtBeginning(server, 'request', function(req) {
+			req.connection.__defineGetter__('remoteAddress', function() {
+				return '127.0.0.1';
+			});
+			req.connection.__defineGetter__('remotePort', function() {
+				return 0;
+			});
+		});
+
 		var listenTries = 0;
 		doListen(extractCallback(arguments));
 

data/helper-scripts/wsgi-loader.py

@@ -53,7 +53,11 @@ def handshake_and_read_startup_request():
 		line = readline()
 
 def load_app():
-	return imp.load_source('passenger_wsgi', 'passenger_wsgi.py')
+	global options
+
+	sys.path.insert(0, os.getcwd())
+	startup_file = options.get('startup_file', 'passenger_wsgi.py')
+	return imp.load_source('passenger_wsgi', startup_file)
 
 def create_server_socket():
 	global options
@@ -256,9 +260,13 @@ class RequestHandler:
 			headers_set[:] = [status, response_headers]
 			return write
 		
-		def hijack():
-			env['passenger.hijacked_socket'] = output_stream
-			return output_stream
+		# Django's django.template.base module goes through all WSGI
+		# environment values, and calls each value that is a callable.
+		# No idea why, but we work around that with the `do_it` parameter.
+		def hijack(do_it = False):
+			if do_it:
+				env['passenger.hijacked_socket'] = output_stream
+				return output_stream
 
 		env['passenger.hijack'] = hijack
 

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.45'
+	VERSION_STRING = '4.0.46'
 	
 	PREFERRED_NGINX_VERSION = '1.6.0'
 	NGINX_SHA256_CHECKSUM = '943ad757a1c3e8b3df2d5c4ddacc508861922e36fa10ea6f8e3a348fc9abfc1a'

data/lib/phusion_passenger/active_support3_extensions/init.rb

@@ -28,31 +28,31 @@ module PhusionPassenger
 
 module ActiveSupport3Extensions
 	def self.init!(options, user_options = {})
-		if !AnalyticsLogging.install!(options, user_options)
+		if !UnionStationExtension.install!(options, user_options)
 			# Remove code to save memory.
-			PhusionPassenger::ActiveSupport3Extensions.send(:remove_const, :AnalyticsLogging)
+			PhusionPassenger::ActiveSupport3Extensions.send(:remove_const, :UnionStationExtension)
 			PhusionPassenger.send(:remove_const, :ActiveSupport3Extensions)
 		end
 	end
 end
 
 module ActiveSupport3Extensions
-class AnalyticsLogging < ActiveSupport::LogSubscriber
+class UnionStationExtension < ActiveSupport::LogSubscriber
 	def self.install!(options, user_options)
-		analytics_logger = options["analytics_logger"]
+		union_station_core = options["union_station_core"]
 		app_group_name = options["app_group_name"]
-		return false if !analytics_logger || !options["analytics"]
+		return false if !union_station_core || !options["analytics"]
 		
 		# If the Ruby interpreter supports GC statistics then turn it on
 		# so that the info can be logged.
 		GC.enable_stats if GC.respond_to?(:enable_stats)
 		
 		subscriber = self.new(user_options)
-		AnalyticsLogging.attach_to(:action_controller, subscriber)
-		AnalyticsLogging.attach_to(:active_record, subscriber)
+		UnionStationExtension.attach_to(:action_controller, subscriber)
+		UnionStationExtension.attach_to(:active_record, subscriber)
 		if defined?(ActiveSupport::Cache::Store)
 			ActiveSupport::Cache::Store.instrument = true
-			AnalyticsLogging.attach_to(:active_support, subscriber)
+			UnionStationExtension.attach_to(:active_support, subscriber)
 		end
 		PhusionPassenger.on_event(:starting_request_handler_thread) do
 			if defined?(ActiveSupport::Cache::Store)
@@ -70,7 +70,9 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 			if defined?(Rails)
 				Rails.application.middleware.insert_after(
 					exceptions_middleware,
-					ExceptionLogger, analytics_logger, app_group_name)
+					ExceptionLogger,
+					union_station_core,
+					app_group_name)
 			end
 		end
 		
@@ -95,21 +97,18 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 	end
 	
 	def process_action(event)
-		log = Thread.current[PASSENGER_ANALYTICS_WEB_LOG]
-		if log
-			view_runtime = event.payload[:view_runtime]
-			log.message("View rendering time: #{(view_runtime * 1000).to_i}") if view_runtime
+		view_runtime = event.payload[:view_runtime]
+		if view_runtime
+			PhusionPassenger.log_total_view_rendering_time(nil, (view_runtime * 1000).to_i)
 		end
 	end
 	
 	def sql(event)
-		if log = Thread.current[PASSENGER_ANALYTICS_WEB_LOG]
-			name = event.payload[:name] || "SQL"
-			sql = event.payload[:sql]
-			digest = Digest::MD5.hexdigest("#{name}\0#{sql}\0#{rand}")
-			log.measured_time_points("DB BENCHMARK: #{digest}",
-				event.time, event.end, "#{name}\n#{sql}")
-		end
+		PhusionPassenger.log_database_query(nil,
+			event.payload[:name] || "SQL",
+			event.time,
+			event.end,
+			event.payload[:sql])
 	end
 	
 	def cache_read(event)
@@ -130,76 +129,45 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 	end
 	
 	class ExceptionLogger
-		def initialize(app, analytics_logger, app_group_name)
+		def initialize(app, union_station_core, app_group_name)
 			@app = app
-			@analytics_logger = analytics_logger
+			@union_station_core = union_station_core
 			@app_group_name = app_group_name
 		end
 		
 		def call(env)
 			@app.call(env)
 		rescue Exception => e
-			log_analytics_exception(env, e) if env[PASSENGER_TXN_ID]
+			log_union_station_exception(env, e) if env[PASSENGER_TXN_ID]
 			raise e
 		end
 	
 	private
-		def log_analytics_exception(env, exception)
-			log = @analytics_logger.new_transaction(
-				@app_group_name,
-				:exceptions,
-				env[PASSENGER_UNION_STATION_KEY])
-			begin
-				request = ActionDispatch::Request.new(env)
-				if request.parameters['controller']
-					controller = request.parameters['controller'].humanize + "Controller"
-					action = request.parameters['action']
-				end
-				
-				request_txn_id = env[PASSENGER_TXN_ID]
-				message = exception.message
-				message = exception.to_s if message.empty?
-				message = [message].pack('m')
-				message.gsub!("\n", "")
-				backtrace_string = [exception.backtrace.join("\n")].pack('m')
-				backtrace_string.gsub!("\n", "")
-				if action && controller
-					controller_action = "#{controller}##{action}"
-				else
-					controller_action = controller
-				end
-				
-				log.message("Request transaction ID: #{request_txn_id}")
-				log.message("Message: #{message}")
-				log.message("Class: #{exception.class.name}")
-				log.message("Backtrace: #{backtrace_string}")
-				log.message("Controller action: #{controller_action}") if controller_action
-			ensure
-				log.close
+		def log_union_station_exception(env, exception)
+			options = {}
+			request = ActionDispatch::Request.new(env)
+			if request.parameters['controller']
+				options[:controller_name] = request.parameters['controller'].humanize + "Controller"
+				options[:action_name] = request.parameters['action']
 			end
+			PhusionPassenger.log_request_exception(env, exception, options)
 		end
 	end
 	
 	module ACExtension
 		def process_action(action, *args)
-			log = request.env[PASSENGER_ANALYTICS_WEB_LOG]
-			if log
-				log.message("Controller action: #{self.class.name}##{action_name}")
-				log.measure("framework request processing") do
-					super
-				end
-			else
+			options = {
+				:controller_name => self.class.name,
+				:action_name => action_name,
+				:method => request.request_method
+			}
+			PhusionPassenger.log_controller_action(request.env, options) do
 				super
 			end
 		end
 		
 		def render(*args)
-			log = request.env[PASSENGER_ANALYTICS_WEB_LOG]
-			if log
-				log.measure("view rendering") do
-					super
-				end
-			else
+			PhusionPassenger.log_view_rendering(request.env) do
 				super
 			end
 		end
@@ -207,14 +175,7 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 	
 	module ASBenchmarkableExtension
 		def benchmark_with_passenger(message = "Benchmarking", *args)
-			log = Thread.current[PASSENGER_ANALYTICS_WEB_LOG]
-			if log
-				log.measure("BENCHMARK: #{message}") do
-					benchmark_without_passenger(message, *args) do
-						yield
-					end
-				end
-			else
+			PhusionPassenger.benchmark(nil, message) do
 				benchmark_without_passenger(message, *args) do
 					yield
 				end
@@ -222,7 +183,7 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 		end
 	end
 
-	private
+private
 	def install_event_preprocessor(event_preprocessor)
 		public_methods(false).each do |name|
 			singleton = class << self; self end
@@ -232,7 +193,7 @@ class AnalyticsLogging < ActiveSupport::LogSubscriber
 			end)
 		end
 	end
-end # class AnalyticsLogging
+end # class UnionStationExtension
 end # module ActiveSupport3Extensions
 
 end # module PhusionPassenger

data/lib/phusion_passenger/constants.rb

@@ -22,8 +22,10 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-	PASSENGER_ANALYTICS_WEB_LOG = "PASSENGER_ANALYTICS_WEB_LOG".freeze
+	UNION_STATION_CORE          = "UNION_STATION_CORE".freeze
+	UNION_STATION_REQUEST_TRANSACTION = "UNION_STATION_REQUEST_TRANSACTION".freeze
 	PASSENGER_TXN_ID            = "PASSENGER_TXN_ID".freeze
+	PASSENGER_APP_GROUP_NAME    = "PASSENGER_APP_GROUP_NAME".freeze
 	PASSENGER_UNION_STATION_KEY = "UNION_STATION_KEY".freeze
 	RACK_HIJACK_IO              = "rack.hijack_io".freeze
 

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -128,6 +128,11 @@ module LoaderSharedHelpers
 			if defined?(Gem)
 				File.open("#{dir}/ruby_info", "a") do |f|
 					f.puts "RubyGems version = #{Gem::VERSION}"
+					if Gem.respond_to?(:path)
+						f.puts "RubyGems paths = #{Gem.path.inspect}"
+					else
+						f.puts "RubyGems paths = unknown; incompatible RubyGems API"
+					end
 				end
 				File.open("#{dir}/activated_gems", "wb") do |f|
 					if Gem.respond_to?(:loaded_specs)
@@ -190,9 +195,9 @@ module LoaderSharedHelpers
 	def before_loading_app_code_step1(startup_file, options)
 		DebugLogging.log_level = options["log_level"] if options["log_level"]
 
-		# Instantiate the analytics logger if requested. Can be nil.
-		PhusionPassenger.require_passenger_lib 'analytics_logger'
-		options["analytics_logger"] = AnalyticsLogger.new_from_options(options)
+		# Instantiate the Union Station core if requested. Can be nil.
+		PhusionPassenger.require_passenger_lib 'union_station/core'
+		options["union_station_core"] = UnionStation::Core.new_from_options(options)
 	end
 	
 	def run_load_path_setup_code(options)
@@ -320,8 +325,8 @@ module LoaderSharedHelpers
 			$0 = options["process_title"] + ": " + options["app_group_name"]
 		end
 
-		if forked && options["analytics_logger"]
-			options["analytics_logger"].clear_connection
+		if forked && options["union_station_core"]
+			options["union_station_core"].clear_connection
 		end
 		
 		# If we were forked from a preloader process then clear or

data/lib/phusion_passenger/nginx/config_options.rb

@@ -66,6 +66,7 @@
 #            a dot (.e.g `upstream_config.pass_headers`) then the structure field will
 #            also not be auto-generated, because it is assumed to belong to an existing
 #            structure field.
+#  * post - The extra information needed by function for post-processing.
 #  * header - The name of the corresponding CGI header. By default CGI header
 #             generation code is automatically generated, using the configuration
 #             option's name in uppercase as the CGI header name.
@@ -193,7 +194,8 @@ LOCATION_CONFIGURATION_OPTIONS = [
 		:name     => 'passenger_ignore_headers',
 		:take     => 'NGX_CONF_1MORE',
 		:function => 'ngx_conf_set_bitmask_slot',
-		:field    => 'upstream_config.ignore_headers'
+		:field    => 'upstream_config.ignore_headers',
+		:post     => '&ngx_http_upstream_ignore_headers_masks'
 	},
 	{
 		:name   => 'passenger_set_cgi_param',

data/lib/phusion_passenger/packaging.rb

@@ -68,6 +68,7 @@ module Packaging
 	GLOB = [
 		'.gitignore',
 		'.travis.yml',
+		'.editorconfig',
 		'configure',
 		'Rakefile',
 		'Vagrantfile',

data/lib/phusion_passenger/public_api.rb

@@ -57,21 +57,108 @@ class << self
 		@@advertised_concurrency_level = value
 	end
 	
-	def benchmark(env = nil, title = "Benchmarking")
-		log = lookup_analytics_log(env)
-		if log
-			log.measure("BENCHMARK: #{title}") do
+	def measure_and_log_event(env, name)
+		transaction = lookup_union_station_web_transaction(env)
+		if transaction
+			transaction.measure(name) do
 				yield
 			end
 		else
 			yield
 		end
 	end
+
+	def benchmark(env = nil, title = "Benchmarking", &block)
+		measure_and_log_event(env, "BENCHMARK: #{title}", &block)
+	end
+
+	# Log an exception that occurred during a request.
+	def log_request_exception(env, exception, options = nil)
+		return if !env[PASSENGER_TXN_ID]
+		core = lookup_union_station_core(env)
+		if core
+			transaction = core.new_transaction(
+				env[PASSENGER_APP_GROUP_NAME],
+				:exceptions,
+				env[PASSENGER_UNION_STATION_KEY])
+			begin
+				request_txn_id = env[PASSENGER_TXN_ID]
+				message = exception.message
+				message = exception.to_s if message.empty?
+				message = [message].pack('m')
+				message.gsub!("\n", "")
+				backtrace_string = [exception.backtrace.join("\n")].pack('m')
+				backtrace_string.gsub!("\n", "")
+
+				transaction.message("Request transaction ID: #{request_txn_id}")
+				transaction.message("Message: #{message}")
+				transaction.message("Class: #{exception.class.name}")
+				transaction.message("Backtrace: #{backtrace_string}")
+
+				if options && options[:controller_name]
+					if options[:action_name]
+						controller_action = "#{options[:controller_name]}##{options[:action_name]}"
+					else
+						controller_action = controller_name
+					end
+					transaction.message("Controller action: #{controller_action}")
+				end
+			ensure
+				transaction.close
+			end
+		end
+	end
+
+	# Log a controller action invocation.
+	def log_controller_action(env, options)
+		transaction = lookup_union_station_web_transaction(env)
+		if transaction
+			if options[:controller_name]
+				if !options[:action_name]
+					raise ArgumentError, "The :action_name option must be set"
+				end
+				transaction.message("Controller action: #{options[:controller_name]}##{options[:action_name]}")
+			end
+			if options[:method]
+				transaction.message("Request method: #{options[:method]}")
+			end
+			transaction.measure("framework request processing") do
+				yield
+			end
+		else
+			yield
+		end
+	end
+
+	# Log the total view rendering time of a request.
+	def log_total_view_rendering_time(env, runtime)
+		transaction = lookup_union_station_web_transaction(env)
+		if transaction
+			transaction.message("View rendering time: #{(runtime).to_i}")
+		end
+	end
+
+	# Log a single view rendering.
+	def log_view_rendering(env = nil, &block)
+		measure_and_log_event(env, "view rendering", &block)
+	end
 	
+	# Log a database query.
+	def log_database_query(env, name, begin_time, end_time, sql)
+		transaction = lookup_union_station_web_transaction(env)
+		if transaction
+			digest = Digest::MD5.hexdigest("#{name}\0#{sql}\0#{rand}")
+			transaction.measured_time_points("DB BENCHMARK: #{digest}",
+				begin_time,
+				end_time,
+				"#{name}\n#{sql}")
+		end
+	end
+
 	def log_cache_hit(env, name)
-		log = lookup_analytics_log(env)
-		if log
-			log.message("Cache hit: #{name}")
+		transaction = lookup_union_station_web_transaction(env)
+		if transaction
+			transaction.message("Cache hit: #{name}")
 			return true
 		else
 			return false
@@ -79,12 +166,12 @@ class << self
 	end
 	
 	def log_cache_miss(env, name, generation_time = nil)
-		log = lookup_analytics_log(env)
-		if log
+		transaction = lookup_union_station_web_transaction(env)
+		if transaction
 			if generation_time
-				log.message("Cache miss (#{generation_time.to_i}): #{name}")
+				transaction.message("Cache miss (#{generation_time.to_i}): #{name}")
 			else
-				log.message("Cache miss: #{name}")
+				transaction.message("Cache miss: #{name}")
 			end
 			return true
 		else
@@ -111,14 +198,19 @@ private
 			raise ArgumentError, "Unknown event name '#{name}'"
 		end
 	end
-	
-	def lookup_analytics_log(env)
+
+	def lookup_union_station_core(env = nil)
 		if env
-			return env[PASSENGER_ANALYTICS_WEB_LOG]
-		else
-			return Thread.current[PASSENGER_ANALYTICS_WEB_LOG]
+			result = env[UNION_STATION_CORE]
 		end
+		return result || Thread.current[UNION_STATION_CORE]
 	end
 
+	def lookup_union_station_web_transaction(env = nil)
+		if env
+			result = env[UNION_STATION_REQUEST_TRANSACTION]
+		end
+		return result || Thread.current[UNION_STATION_REQUEST_TRANSACTION]
+	end
 end
 end # module PhusionPassenger