passenger 4.0.44 → 4.0.45

data/ext/nginx/ConfigurationCommands.c

@@ -429,6 +429,26 @@
 	NULL
 },
 
+{
+	
+	ngx_string("passenger_sticky_sessions"),
+	NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+	ngx_conf_set_flag_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, sticky_sessions),
+	NULL
+},
+
+{
+	
+	ngx_string("passenger_sticky_sessions_cookie_name"),
+	NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+	ngx_conf_set_str_slot,
+	NGX_HTTP_LOC_CONF_OFFSET,
+	offsetof(passenger_loc_conf_t, sticky_sessions_cookie_name),
+	NULL
+},
+
 {
 	
 	ngx_string("passenger_fly_with"),

data/ext/nginx/ConfigurationFields.h

@@ -65,6 +65,8 @@
 
 	ngx_int_t start_timeout;
 
+	ngx_int_t sticky_sessions;
+
 	ngx_array_t *union_station_filters;
 
 	ngx_int_t union_station_support;
@@ -97,6 +99,8 @@
 
 	ngx_str_t startup_file;
 
+	ngx_str_t sticky_sessions_cookie_name;
+
 	ngx_str_t union_station_key;
 
 	ngx_str_t user;

data/ext/nginx/ContentHandler.c

@@ -1378,7 +1378,7 @@ passenger_content_handler(ngx_http_request_t *r)
     }
     
     
-    /* Setup upstream stuff and prepare sending the request to the backend. */
+    /* Setup upstream stuff and prepare sending the request to the HelperAgent. */
     
     if (ngx_http_upstream_create(r) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;

data/ext/nginx/CreateLocationConfig.c

@@ -178,3 +178,12 @@
 		conf->startup_file.len  = 0;
 	
 
+	
+		conf->sticky_sessions = NGX_CONF_UNSET;
+	
+
+	
+		conf->sticky_sessions_cookie_name.data = NULL;
+		conf->sticky_sessions_cookie_name.len  = 0;
+	
+

data/ext/nginx/MergeLocationConfig.c

@@ -207,3 +207,15 @@
 			NULL);
 	
 
+	
+		ngx_conf_merge_value(conf->sticky_sessions,
+			prev->sticky_sessions,
+			NGX_CONF_UNSET);
+	
+
+	
+		ngx_conf_merge_str_value(conf->sticky_sessions_cookie_name,
+			prev->sticky_sessions_cookie_name,
+			NULL);
+	
+

data/ext/nginx/config

@@ -1,8 +1,8 @@
 # passenger-config is run with the 'ruby' command in $PATH, even when natively packaged,
 # so we check whether 'ruby' is correctly in $PATH.
 if ! ruby -v >/dev/null 2>/dev/null; then
-    echo '*** ERROR: Cannot find the "ruby" command in $PATH. Please fix your $PATH. You can learn more about $PATH at: http://www.modrails.com/documentation/Users%20guide%20Nginx.html#_the_path_environment_variable'
-    echo '*** Do you think that you set $PATH correctly, and you happen to be using sudo or rvmsudo? Read this: http://www.modrails.com/documentation/Users%20guide%20Nginx.html#env_vars_and_sudo'
+    echo '*** ERROR: Cannot find the "ruby" command in $PATH. Please fix your $PATH. You can learn more about $PATH at: https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html#_the_path_environment_variable'
+    echo '*** Do you think that you set $PATH correctly, and you happen to be using sudo or rvmsudo? Read this: https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html#env_vars_and_sudo'
     exit 1
 fi
 

data/ext/nginx/ngx_http_passenger_module.c

@@ -237,13 +237,13 @@ create_file(ngx_cycle_t *cycle, const u_char *filename, const u_char *contents,
 }
 
 /**
- * Start the helper server and save its runtime information into various variables.
+ * Start the watchdog and save the runtime information into various variables.
  *
- * @pre The helper server isn't already started.
+ * @pre The watchdog isn't already started.
  * @pre The Nginx configuration has been loaded.
  */
 static ngx_int_t
-start_helper_server(ngx_cycle_t *cycle) {
+start_watchdog(ngx_cycle_t *cycle) {
     ngx_core_conf_t *core_conf;
     ngx_int_t        ret, result;
     ngx_uint_t       i;
@@ -427,7 +427,7 @@ init_module(ngx_cycle_t *cycle) {
             ignore_sigpipe();
             first_start = 0;
         }
-        if (start_helper_server(cycle) != NGX_OK) {
+        if (start_watchdog(cycle) != NGX_OK) {
             passenger_main_conf.root_dir.len = 0;
             return NGX_OK;
         }

data/helper-scripts/node-loader.js

@@ -29,8 +29,6 @@ var net = require('net');
 var http = require('http');
 
 var LineReader = require('phusion_passenger/line_reader').LineReader;
-var RequestHandler = require('phusion_passenger/request_handler').RequestHandler;
-var HttplibEmulation = require('phusion_passenger/httplib_emulation');
 
 module.isApplicationLoader = true; // https://groups.google.com/forum/#!topic/compoundjs/4txxkNtROQg
 GLOBAL.PhusionPassenger = exports.PhusionPassenger = new EventEmitter();
@@ -78,7 +76,6 @@ function readOptions() {
 function setupEnvironment(options) {
 	PhusionPassenger.options = options;
 	PhusionPassenger.configure = configure;
-	PhusionPassenger._requestHandler = new RequestHandler(loadApplication);
 	PhusionPassenger._appInstalled = false;
 	process.title = 'Passenger NodeApp: ' + options.app_root;
 	http.Server.prototype.originalListen = http.Server.prototype.listen;
@@ -88,6 +85,8 @@ function setupEnvironment(options) {
 	stdinReader = undefined;
 	process.stdin.on('end', shutdown);
 	process.stdin.resume();
+
+	loadApplication();
 }
 
 /**
@@ -124,37 +123,51 @@ function extractCallback(args) {
 	}
 }
 
+function generateServerSocketPath() {
+	return PhusionPassenger.options.generation_dir + "/backends/"
+		+ process.pid + "." + ((Math.random() * 0xFFFFFFFF) & 0xFFFFFFF);
+}
+
 function installServer() {
 	var server = this;
 	if (!PhusionPassenger._appInstalled) {
 		PhusionPassenger._appInstalled = true;
 		PhusionPassenger._server = server;
-		server.address = function() {
-			return 'passenger';
-		}
-		finalizeStartup();
-
-		PhusionPassenger.on('request', function(headers, socket, bodyBegin) {
-			var req, res;
-			if (headers['HTTP_UPGRADE']) {
-				if (EventEmitter.listenerCount(server, 'upgrade') > 0) {
-					req = HttplibEmulation.createIncomingMessage(headers, socket, bodyBegin);
-					server.emit('upgrade', req, socket, bodyBegin);
+
+		var listenTries = 0;
+		doListen(extractCallback(arguments));
+
+		function doListen(callback) {
+			function errorHandler(error) {
+				if (error.errno == 'EADDRINUSE') {
+					if (listenTries == 100) {
+						server.emit('error', new Error(
+							'Phusion Passenger could not find suitable socket address to bind on'));
+					} else {
+						// Try again with another socket path.
+						listenTries++;
+						doListen(callback);
+					}
 				} else {
-					socket.destroy();
+					server.emit('error', error);
 				}
-			} else {
-				req = HttplibEmulation.createIncomingMessage(headers, socket, bodyBegin);
-				res = HttplibEmulation.createServerResponse(req);
-				server.emit('request', req, res);
 			}
-		});
 
-		var callback = extractCallback(arguments);
-		if (callback) {
-			server.once('listening', callback);
+			server.once('error', errorHandler);
+			server.originalListen(generateServerSocketPath(), function() {
+				server.removeListener('error', errorHandler);
+				doneListening(callback);
+				process.nextTick(finalizeStartup);
+			});
 		}
-		server.emit('listening');
+
+		function doneListening(callback) {
+			if (callback) {
+				server.once('listening', callback);
+			}
+			server.emit('listening');
+		}
+
 		return server;
 	} else {
 		throw new Error("http.Server.listen() was called more than once, which " +
@@ -181,9 +194,9 @@ function listenAndMaybeInstall(port) {
 
 function finalizeStartup() {
 	process.stdout.write("!> Ready\n");
-	process.stdout.write("!> socket: main;tcp://127.0.0.1:" +
-		PhusionPassenger._requestHandler.server.address().port +
-		";session;0\n");
+	process.stdout.write("!> socket: main;unix:" +
+		PhusionPassenger._server.address() +
+		";http_session;0\n");
 	process.stdout.write("!> \n");
 }
 

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

data/lib/phusion_passenger/apache2/config_options.rb

@@ -173,8 +173,20 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
 	},
 	{
 		:name    => 'PassengerStartupFile',
+		:type    => :string,
+		:context => ["OR_ALL"],
+		:desc    => "Force specific startup file."
+	},
+	{
+		:name    => 'PassengerStickySessions',
+		:type    => :flag,
+		:context => ["OR_ALL"],
+		:desc    => "Whether to enable sticky sessions."
+	},
+	{
+		:name    => 'PassengerStickySessionsCookieName',
+		:type    => :flag,
 		:context => ["OR_ALL"],
-		:desc    => "Force specific startup file.",
-		:type    => :string
+		:desc    => "The cookie name to use for sticky sessions."
 	}
 ]

data/lib/phusion_passenger/constants.rb

@@ -41,6 +41,7 @@ module PhusionPassenger
 		DEFAULT_START_TIMEOUT = 90_000
 		DEFAULT_WEB_APP_USER = "nobody"
 		DEFAULT_CONCURRENCY_MODEL = "process"
+		DEFAULT_STICKY_SESSIONS_COOKIE_NAME = "_passenger_route"
 		DEFAULT_THREAD_COUNT = 1
 		DEFAULT_ANALYTICS_LOG_USER = DEFAULT_WEB_APP_USER
 		DEFAULT_ANALYTICS_LOG_GROUP = ""
@@ -67,12 +68,12 @@ module PhusionPassenger
 		# Misc
 		FEEDBACK_FD = 3
 		PROGRAM_NAME = "Phusion Passenger"
-		INDEX_DOC_URL       = "http://www.modrails.com/documentation/Users%20guide.html"
-		APACHE2_DOC_URL     = "http://www.modrails.com/documentation/Users%20guide%20Apache.html"
-		NGINX_DOC_URL       = "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
-		STANDALONE_DOC_URL  = "http://www.modrails.com/documentation/Users%20guide%20Standalone.html"
-		SUPPORT_URL         = "http://www.phusionpassenger.com/support"
-		ENTERPRISE_URL      = "http://www.phusionpassenger.com/enterprise"
+		INDEX_DOC_URL       = "https://www.phusionpassenger.com/documentation/Users%20guide.html"
+		APACHE2_DOC_URL     = "https://www.phusionpassenger.com/documentation/Users%20guide%20Apache.html"
+		NGINX_DOC_URL       = "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
+		STANDALONE_DOC_URL  = "https://www.phusionpassenger.com/documentation/Users%20guide%20Standalone.html"
+		SUPPORT_URL         = "https://www.phusionpassenger.com/documentation_and_support"
+		ENTERPRISE_URL      = "https://www.phusionpassenger.com/enterprise"
 		DEB_MAIN_PACKAGE          = "passenger"
 		DEB_DEV_PACKAGE           = "passenger-dev"
 		DEB_APACHE_MODULE_PACKAGE = "libapache2-mod-passenger"

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -25,6 +25,7 @@
 PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'public_api'
 PhusionPassenger.require_passenger_lib 'debug_logging'
+require 'shellwords'
 
 module PhusionPassenger
 
@@ -157,7 +158,16 @@ module LoaderSharedHelpers
 
 	def dump_system_metrics
 		if dir = ENV['PASSENGER_DEBUG_DIR']
-			contents = `"#{PhusionPassenger.bin_dir}/passenger-config" system-metrics`
+			# When invoked through Passenger Standalone, we want passenger-config
+			# to use the HelperAgent in the Passsenger Standalone buildout directory,
+			# because the one in the source root may not exist.
+			command = [
+				"env",
+				"PASSENGER_LOCATION_CONFIGURATION_FILE=#{PhusionPassenger.source_root}",
+				"#{PhusionPassenger.bin_dir}/passenger-config",
+				"system-metrics"
+			]
+			contents = `#{Shellwords.join(command)}`
 			if $? && $?.exitstatus == 0
 				File.open("#{dir}/system_metrics", "wb") do |f|
 					f.write(contents)

data/lib/phusion_passenger/nginx/config_options.rb

@@ -274,6 +274,14 @@ LOCATION_CONFIGURATION_OPTIONS = [
 		:name   => 'passenger_startup_file',
 		:type   => :string
 	},
+	{
+		:name   => 'passenger_sticky_sessions',
+		:type   => :flag
+	},
+	{
+		:name   => 'passenger_sticky_sessions_cookie_name',
+		:type   => :string
+	},
 
 	###### Enterprise features ######
 	{

data/lib/phusion_passenger/packaging.rb

@@ -31,7 +31,7 @@ module Packaging
 		'doc/Users guide Nginx.html',
 		'doc/Users guide Standalone.html',
 		'doc/Security of user switching support.html',
-		'doc/Architectural overview.html'
+		'doc/Design and Architecture.html'
 	]
 
 	# Files that must be generated before packaging.
@@ -70,6 +70,7 @@ module Packaging
 		'.travis.yml',
 		'configure',
 		'Rakefile',
+		'Vagrantfile',
 		'README.md',
 		'CONTRIBUTORS',
 		'CONTRIBUTING.md',
@@ -77,6 +78,8 @@ module Packaging
 		'CHANGELOG',
 		'INSTALL.md',
 		'NEWS',
+		'package.json',
+		'npm-shrinkwrap.json',
 		'passenger.gemspec',
 		'build/*.rb',
 		'lib/*.rb',
@@ -107,12 +110,13 @@ module Packaging
 		'ext/oxt/*.txt',
 		'ext/oxt/detail/*.hpp',
 		'ext/ruby/*.{c,rb}',
-		'dev/*',
+		'dev/**/*',
 		'resources/**/*',
 		'test/.rspec',
 		'test/*.example',
 		'test/*.travis',
 		'test/*.rpm-automation',
+		'test/*.vagrant',
 		'test/*.supp',
 		'test/support/*.{c,cpp,h,rb}',
 		'test/tut/*',
@@ -137,7 +141,8 @@ module Packaging
 
 	# Files and directories that should be excluded from the Homebrew installation.
 	HOMEBREW_EXCLUDE = [
-		"dev", "test", ".gitignore", ".travis.yml", "debian.template", "rpm"
+		"dev", "test", ".gitignore", ".travis.yml", "debian.template", "rpm",
+		"Vagrantfile", "package.json", "npm-shrinkwrap.json"
 	]
 
 	def self.files

data/lib/phusion_passenger/platform_info/apache.rb

@@ -239,6 +239,9 @@ module PlatformInfo
 		if config_file = httpd_default_config_file(options)
 			begin
 				contents = File.open(config_file, "rb") { |f| f.read }
+			rescue Errno::ENOENT
+				log "#{config_file} does not exist"
+				return nil
 			rescue Errno::EACCES
 				log "Unable to open #{config_file} for reading"
 				return nil

data/lib/phusion_passenger/platform_info/ruby.rb

@@ -227,7 +227,10 @@ module PlatformInfo
 				next if path.nil?
 				path = File.expand_path(path)
 				rubies_path = File.join(path, 'rubies')
-				if File.directory?(path) && File.directory?(rubies_path)
+				wrappers_path = File.join(path, 'wrappers')
+				gems_path = File.join(path, 'gems')
+				if File.directory?(path) && (File.directory?(rubies_path) ||
+				   File.directory?(wrappers_path) || File.directory?(gems_path))
 					result << path
 				end
 			end

data/lib/phusion_passenger/standalone/command.rb

@@ -119,7 +119,6 @@ private
 			opts.banner = "Usage: passenger #{command_name} [options]"
 			opts.separator description if description
 			opts.separator " "
-			opts.separator "Options:"
 			yield opts
 			opts.on("-h", "--help", "Show this help message") do
 				help = true

data/lib/phusion_passenger/standalone/package_runtime_command.rb

@@ -41,6 +41,7 @@ class PackageRuntimeCommand < Command
 			"Package the Phusion Passenger Standalone runtime into the specified directory.\n" <<
 			"If DIRECTORY is not given then #{destdir} will be used."
 		parse_options!("package [directory]", description) do |opts|
+			opts.separator "Options:"
 			opts.on("--nginx-version VERSION", String,
 				wrap_desc("Nginx version to use as core (default: #{@options[:nginx_version]})")) do |value|
 				@options[:nginx_version] = value

data/lib/phusion_passenger/standalone/start_command.rb

@@ -50,7 +50,6 @@ class StartCommand < Command
 
 	def run
 		parse_my_options
-		sanity_check_options
 
 		PhusionPassenger.require_passenger_lib 'standalone/runtime_locator'
 		@runtime_locator = RuntimeLocator.new(@options[:runtime_dir],
@@ -62,6 +61,7 @@ class StartCommand < Command
 		@app_finder = AppFinder.new(@args, @options)
 		@apps = @app_finder.scan
 		@options = @app_finder.global_options
+		sanity_check_server_options
 		determine_various_resource_locations
 		@plugin.call_hook(:found_apps, @apps)
 
@@ -125,6 +125,7 @@ private
 	def parse_my_options
 		description = "Starts Phusion Passenger Standalone and serve one or more Ruby web applications."
 		parse_options!("start [directory]", description) do |opts|
+			opts.separator "Server options:"
 			opts.on("-a", "--address HOST", String,
 				wrap_desc("Bind to HOST address (default: #{@options[:address]})")) do |value|
 				@options[:address] = value
@@ -139,8 +140,46 @@ private
 				wrap_desc("Bind to Unix domain socket instead of TCP socket")) do |value|
 				@options[:socket_file] = value
 			end
+			opts.on("--ssl",
+				wrap_desc("Enable SSL support")) do
+				@options[:ssl] = true
+			end
+			opts.on("--ssl-certificate PATH", String,
+				wrap_desc("Specify the SSL certificate path")) do |val|
+				@options[:ssl_certificate] = File.expand_path(val)
+			end
+			opts.on("--ssl-certificate-key PATH", String,
+				wrap_desc("Specify the SSL key path")) do |val|
+				@options[:ssl_certificate_key] = File.expand_path(val)
+			end
+			opts.on("--ssl-port PORT", Integer,
+				wrap_desc("Listen for SSL on this port, while listening for HTTP on the normal port")) do |val|
+				@options[:ssl_port] = val
+			end
+			opts.on("-d", "--daemonize",
+				wrap_desc("Daemonize into the background")) do
+				@options[:daemonize] = true
+			end
+			opts.on("--user USERNAME", String,
+				wrap_desc("User to run as. Ignored unless running as root.")) do |value|
+				@options[:user] = value
+			end
+			opts.on("--log-file FILENAME", String,
+				wrap_desc("Where to write log messages (default: console, or /dev/null when daemonized)")) do |value|
+				@options[:log_file] = value
+			end
+			opts.on("--pid-file FILENAME", String,
+				wrap_desc("Where to store the PID file")) do |value|
+				@options[:pid_file] = value
+			end
+			opts.on("--temp-dir PATH", String,
+				wrap_desc("Use the given temp dir")) do |value|
+				ENV['TMPDIR'] = value
+				@options[:temp_dir] = value
+			end
 
 			opts.separator ""
+			opts.separator "Application loading options:"
 			opts.on("-e", "--environment ENV", String,
 				wrap_desc("Framework environment (default: #{@options[:environment]})")) do |value|
 				@options[:environment] = value
@@ -158,6 +197,29 @@ private
 				wrap_desc("Force given startup file to be used")) do |value|
 				@options[:startup_file] = value
 			end
+			opts.on("--spawn-method NAME", String,
+				wrap_desc("The spawn method to use (default: #{@options[:spawn_method]})")) do |value|
+				@options[:spawn_method] = value
+			end
+			opts.on("--static-files-dir PATH", String,
+				wrap_desc("Specify the static files dir")) do |val|
+				@options[:static_files_dir] = File.expand_path(val)
+			end
+			opts.on("--restart-dir PATH", String,
+				wrap_desc("Specify the restart dir")) do |val|
+				@options[:restart_dir] = File.expand_path(val)
+			end
+			opts.on("--friendly-error-pages",
+				wrap_desc("Turn on friendly error pages")) do
+				@options[:friendly_error_pages] = true
+			end
+			opts.on("--no-friendly-error-pages",
+				wrap_desc("Turn off friendly error pages")) do
+				@options[:friendly_error_pages] = false
+			end
+
+			opts.separator ""
+			opts.separator "Process management options:"
 			opts.on("--max-pool-size NUMBER", Integer,
 				wrap_desc("Maximum number of application processes (default: #{@options[:max_pool_size]})")) do |value|
 				@options[:max_pool_size] = value
@@ -166,10 +228,6 @@ private
 				wrap_desc("Minimum number of processes per application (default: #{@options[:min_instances]})")) do |value|
 				@options[:min_instances] = value
 			end
-			opts.on("--spawn-method NAME", String,
-				wrap_desc("The spawn method to use (default: #{@options[:spawn_method]})")) do |value|
-				@options[:spawn_method] = value
-			end
 			opts.on("--concurrency-model NAME", String,
 				wrap_desc("The concurrency model to use, either 'process' or 'thread' (default: #{@options[:concurrency_model]}) (Enterprise only)")) do |value|
 				@options[:concurrency_model] = value
@@ -186,38 +244,20 @@ private
 				wrap_desc("Enable deployment error resistance (Enterprise only)")) do
 				@options[:resist_deployment_errors] = true
 			end
-			opts.on("--friendly-error-pages",
-				wrap_desc("Turn on friendly error pages")) do
-				@options[:friendly_error_pages] = true
-			end
-			opts.on("--no-friendly-error-pages",
-				wrap_desc("Turn off friendly error pages")) do
-				@options[:friendly_error_pages] = false
-			end
-			opts.on("--ssl",
-				wrap_desc("Enable SSL support")) do
-				@options[:ssl] = true
-			end
-			opts.on("--ssl-certificate PATH", String,
-				wrap_desc("Specify the SSL certificate path")) do |val|
-				@options[:ssl_certificate] = File.expand_path(val)
-			end
-			opts.on("--ssl-certificate-key PATH", String,
-				wrap_desc("Specify the SSL key path")) do |val|
-				@options[:ssl_certificate_key] = File.expand_path(val)
-			end
-			opts.on("--ssl-port PORT", Integer,
-				wrap_desc("Listen for SSL on this port, while listening for HTTP on the normal port")) do |val|
-				@options[:ssl_port] = val
-			end
-			opts.on("--static-files-dir PATH", String,
-				wrap_desc("Specify the static files dir")) do |val|
-				@options[:static_files_dir] = File.expand_path(val)
+
+			opts.separator ""
+			opts.separator "Request handling options:"
+			opts.on("--sticky-sessions",
+				wrap_desc("Enable sticky sessions")) do
+				@options[:sticky_sessions] = true
 			end
-			opts.on("--restart-dir PATH", String,
-				wrap_desc("Specify the restart dir")) do |val|
-				@options[:restart_dir] = File.expand_path(val)
+			opts.on("--sticky-sessions-cookie-name", String,
+				wrap_desc("Cookie name to use for sticky sessions (default: #{DEFAULT_STICKY_SESSIONS_COOKIE_NAME})")) do |val|
+				@options[:sticky_sessions_cookie_name] = val
 			end
+
+			opts.separator ""
+			opts.separator "Union Station options:"
 			opts.on("--union-station-gateway HOST:PORT", String,
 				wrap_desc("Specify Union Station Gateway host and port")) do |value|
 				host, port = value.split(":", 2)
@@ -232,36 +272,11 @@ private
 			end
 
 			opts.separator ""
+			opts.separator "Advanced options:"
 			opts.on("--ping-port NUMBER", Integer,
 				wrap_desc("Use the given port number for checking whether Nginx is alive (default: same as the normal port)")) do |value|
 				@options[:ping_port] = value
 			end
-			@plugin.call_hook(:parse_options, opts)
-
-			opts.separator ""
-			opts.on("-d", "--daemonize",
-				wrap_desc("Daemonize into the background")) do
-				@options[:daemonize] = true
-			end
-			opts.on("--user USERNAME", String,
-				wrap_desc("User to run as. Ignored unless running as root.")) do |value|
-				@options[:user] = value
-			end
-			opts.on("--log-file FILENAME", String,
-				wrap_desc("Where to write log messages (default: console, or /dev/null when daemonized)")) do |value|
-				@options[:log_file] = value
-			end
-			opts.on("--pid-file FILENAME", String,
-				wrap_desc("Where to store the PID file")) do |value|
-				@options[:pid_file] = value
-			end
-			opts.on("--temp-dir PATH", String,
-				wrap_desc("Use the given temp dir")) do |value|
-				ENV['TMPDIR'] = value
-				@options[:temp_dir] = value
-			end
-
-			opts.separator ""
 			opts.on("--nginx-bin FILENAME", String,
 				wrap_desc("Nginx binary to use as core")) do |value|
 				@options[:nginx_bin] = value
@@ -300,11 +315,14 @@ private
 				wrap_desc("Abort if runtime must be compiled")) do
 				@options[:dont_compile_runtime] = true
 			end
+
+			@plugin.call_hook(:parse_options, opts)
+			opts.separator ""
 		end
 		@plugin.call_hook(:done_parsing_options)
 	end
 
-	def sanity_check_options
+	def sanity_check_server_options
 		if @options[:tcp_explicitly_given] && @options[:socket_file]
 			error "You cannot specify both --address/--port and --socket. Please choose either one."
 			exit 1