passenger 5.0.0.beta3 → 5.0.0.rc1

data/ext/nginx/Configuration.c

@@ -417,10 +417,13 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 {
     passenger_loc_conf_t         *prev = parent;
     passenger_loc_conf_t         *conf = child;
+    ngx_http_core_loc_conf_t     *clcf;
 
     size_t                        size;
     ngx_hash_init_t               hash;
 
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
+
     #include "MergeLocationConfig.c"
     if (prev->options_cache.data == NULL) {
         if (cache_loc_conf_options(cf, prev) != NGX_OK) {
@@ -742,6 +745,10 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->upstream_config.upstream = prev->upstream_config.upstream;
     }
 
+    if (conf->enabled) {
+        clcf->handler = passenger_content_handler;
+    }
+
     conf->headers_hash_bucket_size = ngx_align(conf->headers_hash_bucket_size,
                                                ngx_cacheline_size);
     hash.max_size = conf->headers_hash_max_size;

data/ext/nginx/ContentHandler.c

@@ -400,7 +400,7 @@ prepare_request_buffer_construction(ngx_http_request_t *r, passenger_context_t *
 
     state->app_type.data = (u_char *) pp_get_app_type_name(context->app_type);
     /* Include null terminator */
-    state->app_type.len  = strlen((const char *) state->app_type.data) + 1;
+    state->app_type.len  = strlen((const char *) state->app_type.data);
 
     /*
      * Nginx unescapes URI's before passing them to Phusion Passenger,
@@ -676,6 +676,14 @@ construct_request_buffer(ngx_http_request_t *r, passenger_loc_conf_t *slcf,
         PUSH_STATIC_STR("\r\n");
     }
 
+    PUSH_STATIC_STR("!~PASSENGER_APP_TYPE: ");
+    if (b != NULL) {
+        b->last = ngx_copy(b->last, state->app_type.data,
+            state->app_type.len);
+    }
+    total_size += state->app_type.len;
+    PUSH_STATIC_STR("\r\n");
+
     if (slcf->union_station_filters != NGX_CONF_UNSET_PTR
      && slcf->union_station_filters->nelts > 0)
     {

data/helper-scripts/backtrace-sanitizer.rb

@@ -27,48 +27,52 @@
 # file locations.
 
 class Addr2line
-	attr_reader :stdin, :stdout, :pid
+  attr_reader :stdin, :stdout, :pid
 
-	def initialize(filename)
-		a, b = IO.pipe
-		c, d = IO.pipe
-		@pid = fork do
-			STDIN.reopen(a)
-			b.close
-			STDOUT.reopen(d)
-			c.close
-			exec("addr2line", "-Cfie", filename)
-		end
-		a.close
-		d.close
-		@stdin = b
-		@stdout = c
-		@stdin.sync = @stdout.sync = true
-	end
+  def initialize(filename)
+    a, b = IO.pipe
+    c, d = IO.pipe
+    @pid = fork do
+      STDIN.reopen(a)
+      b.close
+      STDOUT.reopen(d)
+      c.close
+      exec("addr2line", "-Cfie", filename)
+    end
+    a.close
+    d.close
+    @stdin = b
+    @stdout = c
+    @stdin.sync = @stdout.sync = true
+  end
 
-	def query(address)
-		@stdin.write("#{address}\n")
-		function = @stdout.readline
-		source = @stdout.readline
-		function.strip!
-		source.strip!
-		return [function, source]
-	end
+  def query(address)
+    @stdin.write("#{address}\n")
+    function = @stdout.readline
+    source = @stdout.readline
+    function.strip!
+    source.strip!
+    return [function, source]
+  end
 
-	def close
-		@stdin.close
-		@stdout.close
-		Process.kill('KILL', @pid)
-		Process.waitpid(@pid) rescue nil
-	end
+  def close
+    @stdin.close
+    @stdout.close
+    Process.kill('KILL', @pid)
+    Process.waitpid(@pid) rescue nil
+  end
 end
 
 def passthrough(input, output)
-	while !input.eof?
-		data = input.readline
-		output.write(data)
-		output.flush
-	end
+  while !input.eof?
+    data = input.readline
+    output.write(data)
+    output.flush
+  end
+end
+
+def debug(message)
+  #puts message
 end
 
 input = STDIN
@@ -77,63 +81,78 @@ output.sync = true
 output.puts "Using backtrace sanitizer."
 argv0, pid_or_filename = ARGV
 if pid_or_filename =~ /\A\d+\Z/
-	begin
-		exe_filename = File.expand_path(File.readlink("/proc/#{pid_or_filename}/exe"))
-	rescue Errno::ENOENT, Errno::EACCES => e
-		warn "*** backtrace-sanitizer warning: #{e} -> passthrough input"
-		passthrough(input, output)
-		exit
-	end
+  begin
+    exe_filename = File.expand_path(File.readlink("/proc/#{pid_or_filename}/exe"))
+  rescue Errno::ENOENT, Errno::EACCES => e
+    warn "*** backtrace-sanitizer warning: #{e} -> passthrough input"
+    passthrough(input, output)
+    exit
+  end
 else
-	exe_filename = File.expand_path(pid_or_filename)
+  exe_filename = File.expand_path(pid_or_filename)
 end
 exe_basename = File.basename(exe_filename)
 addr2lines = {}
 
 begin
-	while !input.eof?
-		line = input.readline.strip
-		# Example lines:
-		# ./test() [0x400b64]
-		# /lib/libc.so.6(__libc_start_main+0xfd) [0x7fcc0ad00c8d]
-		if line =~ /(.*)\[(.*?)\]$/
-			# Split line into:
-			# subject: /lib/libc.so.6(__libc_start_main+0xfd)
-			# address: 0x7fcc0ad00c8d
-			subject = $1
-			address = $2
-			subject.strip!
-			subject =~ /(.*?)(\((.*?)\))?$/
-			# Split subject into:
-			# file: /lib/libc.so.6
-			# context: __libc_start_main+0xfd
-			file = $1
-			context = $3
-			file.strip!
-			context = nil if context && context.empty?
+  while !input.eof?
+    line = input.readline.strip
+    debug " ---> Parse #{line.inspect}"
+
+    # Example lines:
+    # ./test() [0x400b64]
+    # /lib/libc.so.6(__libc_start_main+0xfd) [0x7fcc0ad00c8d]
+    # PassengerAgent server[0x4d2697]
+    if line =~ /(.*)\[(.*?)\]$/
+      # Split line into:
+      # subject: /lib/libc.so.6(__libc_start_main+0xfd)
+      # address: 0x7fcc0ad00c8d
+      subject = $1
+      address = $2
+      subject.strip!
+
+      if subject =~ /(.*?)(\((.*?)\))?$/
+        # Split subject into:
+        # file: /lib/libc.so.6
+        # context: __libc_start_main+0xfd
+        file = $1
+        context = $3
+        file.strip!
+        context = nil if context && context.empty?
+      else
+        file = subject
+        context = nil
+      end
+
+      debug "      file = #{file.inspect}"
+      debug "      context = #{context.inspect}"
+      debug "      address = #{address.inspect}"
 
-			if file =~ /\A\// && File.exist?(file)
-				filename = file
-			elsif file == argv0 || file == exe_filename || file == exe_basename
-				filename = exe_filename
-			else
-				filename = nil
-			end
-			if filename.nil?
-				output.puts line
-			else
-				addr2line = (addr2lines[filename] ||= Addr2line.new(filename))
-				function, source = addr2line.query(address)
-				new_context = "#{function} at #{source}"
-				new_context << "; #{context}" if context
-				output.puts "#{file}(#{new_context}) [#{address}]"
-			end
-		else
-			output.puts line
-		end
-	end
+      if file =~ /\A\// && File.exist?(file)
+        filename = file
+      elsif file == argv0 ||
+            file == exe_filename ||
+            file == exe_basename ||
+            file.sub(/ .*/, '') == exe_basename
+        filename = exe_filename
+      else
+        filename = nil
+      end
+      if filename.nil?
+        output.puts line
+      else
+        addr2line = (addr2lines[filename] ||= Addr2line.new(filename))
+        function, source = addr2line.query(address)
+        new_context = "#{function} at #{source}"
+        new_context << "; #{context}" if context
+        output.puts "#{file}(#{new_context}) [#{address}]"
+      end
+    else
+      output.puts line
+    end
+  end
 ensure
-	addr2lines.each_value do |addr2line|
-		addr2line.close
-	end
+  addr2lines.each_value do |addr2line|
+    addr2line.close
+  end
 end

data/helper-scripts/crash-watch.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+# Copyright (c) 2015 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 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 uses GDB to attach to a process in order to dump the
+# backtraces of all its threads.
+
+ruby_libdir    = ARGV.shift
+passenger_root = ARGV.shift
+require "#{ruby_libdir}/phusion_passenger"
+PhusionPassenger.locate_directories(passenger_root)
+
+PhusionPassenger.require_passenger_lib 'vendor/crash_watch/app'
+CrashWatch::App.new.run(ARGV)

data/helper-scripts/download_binaries/extconf.rb

@@ -27,10 +27,10 @@
 
 # Create a dummy Makefile to prevent 'gem install' from borking out.
 File.open("Makefile", "w") do |f|
-	f.puts "all:"
-	f.puts "	true"
-	f.puts "install:"
-	f.puts "	true"
+  f.puts "all:"
+  f.puts "  true"
+  f.puts "install:"
+  f.puts "  true"
 end
 
 # Don't do anything on Windows. We don't support Windows but exiting now
@@ -44,12 +44,12 @@ PhusionPassenger.locate_directories
 require 'fileutils'
 
 if PhusionPassenger.custom_packaged?
-	puts "Binary downloading is only available when originally packaged. Stopping."
-	exit 0
+  puts "Binary downloading is only available when originally packaged. Stopping."
+  exit 0
 end
 if !PhusionPassenger.installed_from_release_package?
-	puts "This Phusion Passenger is not installed from an official release package. Stopping."
-	exit 0
+  puts "This Phusion Passenger is not installed from an official release package. Stopping."
+  exit 0
 end
 
 # Create download directory and do some preparation
@@ -60,9 +60,9 @@ ruby_compat_id = PhusionPassenger::PlatformInfo.ruby_extension_binary_compatibil
 
 ABORT_ON_ERROR = ARGV[0] == "--abort-on-error"
 if url_root = ENV['BINARIES_URL_ROOT']
-	SITES = [{ :url => url_root }]
+  SITES = [{ :url => url_root }]
 else
-	SITES = PhusionPassenger.binaries_sites
+  SITES = PhusionPassenger.binaries_sites
 end
 
 FileUtils.mkdir_p(PhusionPassenger.download_cache_dir)
@@ -73,40 +73,40 @@ require 'phusion_passenger/utils/download'
 require 'logger'
 
 def download(name, options = {})
-	if File.exist?(name)
-		puts "#{Dir.pwd}/#{name} already exists"
-		return true
-	end
+  if File.exist?(name)
+    puts "#{Dir.pwd}/#{name} already exists"
+    return true
+  end
 
-	logger = Logger.new(STDOUT)
-	logger.level = Logger::WARN
-	logger.formatter = proc { |severity, datetime, progname, msg| "*** #{msg}\n" }
+  logger = Logger.new(STDOUT)
+  logger.level = Logger::WARN
+  logger.formatter = proc { |severity, datetime, progname, msg| "*** #{msg}\n" }
 
-	SITES.each do |site|
-		if really_download(site, name, logger, options)
-			return true
-		end
-	end
-	abort "Cannot download #{name}, aborting" if ABORT_ON_ERROR
-	return false
+  SITES.each do |site|
+    if really_download(site, name, logger, options)
+      return true
+    end
+  end
+  abort "Cannot download #{name}, aborting" if ABORT_ON_ERROR
+  return false
 end
 
 def really_download(site, name, logger, options)
-	url = "#{site[:url]}/#{PhusionPassenger::VERSION_STRING}/#{name}"
-	puts "Attempting to download #{url} into #{Dir.pwd}"
-	File.unlink("#{name}.tmp") rescue nil
+  url = "#{site[:url]}/#{PhusionPassenger::VERSION_STRING}/#{name}"
+  puts "Attempting to download #{url} into #{Dir.pwd}"
+  File.unlink("#{name}.tmp") rescue nil
 
-	options = {
-		:cacert => site[:cert],
-		:logger => logger
-	}.merge(options)
-	result = PhusionPassenger::Utils::Download.download(url, "#{name}.tmp", options)
-	if result
-		File.rename("#{name}.tmp", name)
-	else
-		File.unlink("#{name}.tmp") rescue nil
-	end
-	return result
+  options = {
+    :cacert => site[:cert],
+    :logger => logger
+  }.merge(options)
+  result = PhusionPassenger::Utils::Download.download(url, "#{name}.tmp", options)
+  if result
+    File.rename("#{name}.tmp", name)
+  else
+    File.unlink("#{name}.tmp") rescue nil
+  end
+  return result
 end
 
 download "rubyext-#{ruby_compat_id}.tar.gz", :total_timeout => 10

data/helper-scripts/meteor-loader.rb

@@ -28,124 +28,124 @@ require 'thread'
 require 'logger'
 
 module PhusionPassenger
-module App
-	def self.options
-		return @@options
-	end
+  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.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"
+    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
+      @@options = {}
+      while (line = STDIN.readline) != "\n"
+        name, value = line.strip.split(/: */, 2)
+        @@options[name] = value
+      end
+    end
 
-	def self.init_passenger
-		require "#{options["ruby_libdir"]}/phusion_passenger"
-		PhusionPassenger.locate_directories(options["passenger_root"])
-		PhusionPassenger.require_passenger_lib 'message_channel'
-		PhusionPassenger.require_passenger_lib 'utils/tmpio'
-	end
+    def self.init_passenger
+      require "#{options["ruby_libdir"]}/phusion_passenger"
+      PhusionPassenger.locate_directories(options["passenger_root"])
+      PhusionPassenger.require_passenger_lib 'message_channel'
+      PhusionPassenger.require_passenger_lib 'utils/tmpio'
+    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.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
+    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
-			# Meteor is quite !@#$% here: if we kill its start script
-			# with *any* signal, it'll leave a ton of garbage processes
-			# around. Apparently it expects the user to press Ctrl-C in a
-			# terminal which happens to send a signal to all processes
-			# in the session. We emulate that behavior here by giving
-			# Meteor its own process group, and sending signals to the
-			# entire process group.
-			Process.setpgrp
-			exec("meteor run -p #{port} #{production}")
-		end
-		$0 = options["process_title"] if options["process_title"]
-		$0 = "#{$0} (#{pid})"
-		return [pid, port]
-	end
+      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
+        # around. Apparently it expects the user to press Ctrl-C in a
+        # terminal which happens to send a signal to all processes
+        # in the session. We emulate that behavior here by giving
+        # Meteor its own process group, and sending signals to the
+        # entire process group.
+        Process.setpgrp
+        exec("meteor run -p #{port} #{production}")
+      end
+      $0 = options["process_title"] if options["process_title"]
+      $0 = "#{$0} (#{pid})"
+      return [pid, port]
+    end
 
-	def self.wait_for_exit_message
-		begin
-			STDIN.readline
-		rescue EOFError
-		end
-	end
+    def self.wait_for_exit_message
+      begin
+        STDIN.readline
+      rescue EOFError
+      end
+    end
 
 
-	################## Main code ##################
+    ################## Main code ##################
 
 
-	handshake_and_read_startup_request
-	init_passenger
-	begin
-		pid, port = load_app
-		while !ping_port(port)
-			sleep 0.01
-		end
-		puts "!> Ready"
-		puts "!> socket: main;tcp://127.0.0.1:#{port};http_session;0"
-		puts "!> "
-		wait_for_exit_message
-	ensure
-		if pid
-			Process.kill('INT', -pid) rescue nil
-			Process.waitpid(pid) rescue nil
-			Process.kill('INT', -pid) rescue nil
-		end
-	end
+    handshake_and_read_startup_request
+    init_passenger
+    begin
+      pid, port = load_app
+      while !ping_port(port)
+        sleep 0.01
+      end
+      puts "!> Ready"
+      puts "!> socket: main;tcp://127.0.0.1:#{port};http_session;0"
+      puts "!> "
+      wait_for_exit_message
+    ensure
+      if pid
+        Process.kill('INT', -pid) rescue nil
+        Process.waitpid(pid) rescue nil
+        Process.kill('INT', -pid) rescue nil
+      end
+    end
 
-end # module App
+  end # module App
 end # module PhusionPassenger