passenger 4.0.44 → 4.0.45

data/lib/phusion_passenger/standalone/status_command.rb

@@ -32,6 +32,7 @@ class StatusCommand < Command
 	
 	def run
 		parse_options!("status") do |opts|
+			opts.separator "Options:"
 			opts.on("-p", "--port NUMBER", Integer,
 				wrap_desc("The port number of a Phusion Passenger Standalone instance (default: #{@options[:port]})")) do |value|
 				@options[:port] = value

data/lib/phusion_passenger/standalone/stop_command.rb

@@ -32,6 +32,7 @@ class StopCommand < Command
 	
 	def run
 		parse_options!("stop") do |opts|
+			opts.separator "Options:"
 			opts.on("-p", "--port NUMBER", Integer,
 				wrap_desc("The port number of a Phusion Passenger Standalone instance (default: #{@options[:port]})")) do |value|
 				@options[:port] = value

data/man/passenger-config.1

@@ -19,7 +19,7 @@ Shows the current Phusion Passenger version number
 .LP 
 passenger\-memory\-stats(1), passenger\-stress\-test(1), passenger\-status(8)
 .LP 
-User guide at http://www.modrails.com/documentation.html
+User guide at https://www.phusionpassenger.com/documentation_and_support
 .SH "AUTHOR"
 .LP 
 Phusion Passenger is written by Phusion (http://www.phusion.nl)

data/man/passenger-memory-stats.8

@@ -23,7 +23,7 @@ The full filename to the Apache executable. By default, Passenger will attempt t
 .LP 
 passenger\-status(8), ps(1), top(1), 
 .LP 
-User guide at http://www.modrails.com/documentation.html
+User guide at https://www.phusionpassenger.com/documentation_and_support
 .SH "AUTHOR"
 .LP 
 Phusion Passenger is written by Phusion (http://www.phusion.nl)

data/man/passenger-status.8

@@ -33,7 +33,7 @@ The process ID of the Phusion Passenger instance you want to look at
 .LP 
 passenger\-memory\-stats(8), ps(1), top(1)
 .LP 
-User guide at http://www.modrails.com/documentation.html
+User guide at https://www.phusionpassenger.com/documentation_and_support
 .SH "AUTHOR"
 .LP 
 Phusion Passenger is written by Phusion (http://www.phusion.nl)

data/npm-shrinkwrap.json

@@ -0,0 +1,229 @@
+{
+  "name": "passenger",
+  "version": "0.0.0",
+  "dependencies": {
+    "express": {
+      "version": "3.4.8",
+      "from": "express@",
+      "resolved": "https://registry.npmjs.org/express/-/express-3.4.8.tgz",
+      "dependencies": {
+        "connect": {
+          "version": "2.12.0",
+          "from": "connect@2.12.0",
+          "resolved": "https://registry.npmjs.org/connect/-/connect-2.12.0.tgz",
+          "dependencies": {
+            "batch": {
+              "version": "0.5.0",
+              "from": "batch@0.5.0"
+            },
+            "qs": {
+              "version": "0.6.6",
+              "from": "qs@0.6.6"
+            },
+            "bytes": {
+              "version": "0.2.1",
+              "from": "bytes@0.2.1"
+            },
+            "pause": {
+              "version": "0.0.1",
+              "from": "pause@0.0.1"
+            },
+            "uid2": {
+              "version": "0.0.3",
+              "from": "uid2@0.0.3"
+            },
+            "raw-body": {
+              "version": "1.1.2",
+              "from": "raw-body@1.1.2"
+            },
+            "negotiator": {
+              "version": "0.3.0",
+              "from": "negotiator@0.3.0"
+            },
+            "multiparty": {
+              "version": "2.2.0",
+              "from": "multiparty@2.2.0",
+              "dependencies": {
+                "readable-stream": {
+                  "version": "1.1.10",
+                  "from": "readable-stream@~1.1.9",
+                  "dependencies": {
+                    "core-util-is": {
+                      "version": "1.0.1",
+                      "from": "core-util-is@~1.0.0"
+                    },
+                    "string_decoder": {
+                      "version": "0.10.24",
+                      "from": "string_decoder@~0.10.x"
+                    },
+                    "debuglog": {
+                      "version": "0.0.2",
+                      "from": "debuglog@0.0.2"
+                    }
+                  }
+                },
+                "stream-counter": {
+                  "version": "0.2.0",
+                  "from": "stream-counter@~0.2.0"
+                }
+              }
+            }
+          }
+        },
+        "commander": {
+          "version": "1.3.2",
+          "from": "commander@1.3.2",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz",
+          "dependencies": {
+            "keypress": {
+              "version": "0.1.0",
+              "from": "keypress@0.1.x"
+            }
+          }
+        },
+        "range-parser": {
+          "version": "0.0.4",
+          "from": "range-parser@0.0.4"
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "from": "mkdirp@0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
+        },
+        "cookie": {
+          "version": "0.1.0",
+          "from": "cookie@0.1.0"
+        },
+        "buffer-crc32": {
+          "version": "0.2.1",
+          "from": "buffer-crc32@0.2.1"
+        },
+        "fresh": {
+          "version": "0.2.0",
+          "from": "fresh@0.2.0"
+        },
+        "methods": {
+          "version": "0.1.0",
+          "from": "methods@0.1.0"
+        },
+        "send": {
+          "version": "0.1.4",
+          "from": "send@0.1.4",
+          "dependencies": {
+            "mime": {
+              "version": "1.2.11",
+              "from": "mime@~1.2.9"
+            }
+          }
+        },
+        "cookie-signature": {
+          "version": "1.0.1",
+          "from": "cookie-signature@1.0.1"
+        },
+        "merge-descriptors": {
+          "version": "0.0.1",
+          "from": "merge-descriptors@0.0.1",
+          "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.1.tgz"
+        },
+        "debug": {
+          "version": "0.7.4",
+          "from": "debug@>= 0.7.3 < 1"
+        }
+      }
+    },
+    "mocha": {
+      "version": "1.15.1",
+      "from": "mocha@",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-1.15.1.tgz",
+      "dependencies": {
+        "commander": {
+          "version": "2.0.0",
+          "from": "commander@2.0.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz"
+        },
+        "growl": {
+          "version": "1.7.0",
+          "from": "growl@1.7.x"
+        },
+        "jade": {
+          "version": "0.26.3",
+          "from": "jade@0.26.3",
+          "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
+          "dependencies": {
+            "commander": {
+              "version": "0.6.1",
+              "from": "commander@0.6.1",
+              "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"
+            },
+            "mkdirp": {
+              "version": "0.3.0",
+              "from": "mkdirp@0.3.0",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
+            }
+          }
+        },
+        "diff": {
+          "version": "1.0.7",
+          "from": "diff@1.0.7"
+        },
+        "debug": {
+          "version": "0.7.4",
+          "from": "debug@*"
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "from": "mkdirp@0.3.5"
+        },
+        "glob": {
+          "version": "3.2.3",
+          "from": "glob@3.2.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
+          "dependencies": {
+            "minimatch": {
+              "version": "0.2.12",
+              "from": "minimatch@~0.2.11",
+              "dependencies": {
+                "lru-cache": {
+                  "version": "2.5.0",
+                  "from": "lru-cache@2"
+                },
+                "sigmund": {
+                  "version": "1.0.0",
+                  "from": "sigmund@~1.0.0"
+                }
+              }
+            },
+            "graceful-fs": {
+              "version": "2.0.1",
+              "from": "graceful-fs@~2.0.0"
+            },
+            "inherits": {
+              "version": "2.0.1",
+              "from": "inherits@2"
+            }
+          }
+        }
+      }
+    },
+    "should": {
+      "version": "2.0.1",
+      "from": "should@"
+    },
+    "sinon": {
+      "version": "1.7.3",
+      "from": "sinon@",
+      "dependencies": {
+        "buster-format": {
+          "version": "0.5.6",
+          "from": "buster-format@~0.5",
+          "dependencies": {
+            "buster-core": {
+              "version": "0.6.4",
+              "from": "buster-core@=0.6.4"
+            }
+          }
+        }
+      }
+    }
+  }
+}

data/package.json

@@ -0,0 +1,28 @@
+{
+  "__comment__": [
+    "This file is only meant for shrinkwrapping the development dependencies."
+  ],
+  "name": "passenger",
+  "version": "0.0.0",
+  "description": "A fast and robust web server and application server for Ruby, Python and Node.js",
+  "main": "index.js",
+  "dependencies": {
+    "should": "^2.0.1",
+    "sinon": "^1.7.3",
+    "express": "^3.4.8",
+    "mocha": "^1.15.1"
+  },
+  "scripts": {
+    "test": "rake test:node"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/phusion/passenger.git"
+  },
+  "author": "Phusion <info@phusion.nl>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/phusion/passenger/issues"
+  },
+  "homepage": "https://www.phusionpassenger.com"
+}

data/resources/templates/standalone/config.erb

@@ -138,6 +138,8 @@ http {
         <% if app[:thread_count] != DEFAULT_THREAD_COUNT %>passenger_thread_count <%= app[:thread_count] %>;<% end %>
         <% if app[:min_instances] %>passenger_min_instances <%= app[:min_instances] %>;<% end %>
         <% if app[:restart_dir] %>passenger_restart_dir '<%= app[:restart_dir] %>';<% end %>
+        <% if @options[:sticky_sessions] %>passenger_sticky_sessions on;<% end %>
+        <% if @options[:sticky_sessions_cookie_name] %>passenger_sticky_sessions_cookie_name '<%= sticky_sessions_cookie_name %>';<% end %>
         <% if app[:union_station_key] %>
             union_station_support on;
             union_station_key <%= app[:union_station_key] %>;

data/rpm/Vagrantfile

@@ -1,6 +1,3 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
 # This Vagrantfile sets up a CentOS VM, for the purpose of RPM development.
 
 ROOT = File.expand_path(File.dirname(__FILE__) + "/..")

data/test/config.json.vagrant

@@ -0,0 +1,30 @@
+{
+  //// This file contains system-specific configuration options that the test suite needs.
+  //// Please customize it for your system.
+
+  // These are the usernames and group names of normal, non-administrator
+  // users and groups. Preferably, these are user and group accounts that
+  // are normally not used.
+  //
+  // These users and groups MUST be able to access this 'test' directory,
+  // otherwise the tests will fail.
+
+  ///// Good values for Linux and FreeBSD. Same restrictions apply.
+  "normal_user_1": "games",
+  "normal_user_2": "daemon",
+  "default_user": "man",
+  "normal_group_1": "daemon",
+  "normal_group_2": "man",
+  "default_group": "games",
+
+  // A nonexistant username, group name, user ID and group ID.
+  "nonexistant_user": "xxxxxxxxxxxxxxxxxxx",
+  "nonexistant_group": "xxxxxxxxxxxxxxxxxxx",
+  "nonexistant_uid": 9999,
+  "nonexistant_gid": 9999,
+
+  // If you want to run the Nginx integration tests, then set the following
+  // config option to the full path of the Nginx binary. This Nginx binary *must*
+  // be compiled with Phusion Passenger support!
+  "nginx": "/home/vagrant/nginx/objs/nginx"
+}

data/test/cxx/HttpHeaderBuffererTest.cpp

@@ -23,13 +23,13 @@ namespace tut {
 	DEFINE_TEST_GROUP(HttpHeaderBuffererTest);
 	
 	TEST_METHOD(1) {
-		// Test initial state.
+		set_test_name("Test initial state");
 		ensure(bufferer.acceptingInput());
 		ensure(!bufferer.hasError());
 	}
 	
 	TEST_METHOD(2) {
-		// Test feeding a complete stream everything in one go.
+		set_test_name("Test feeding a complete stream everything in one go");
 		ensure_equals(bufferer.feed(input.data(), input.size()), input.size());
 		ensure(!bufferer.acceptingInput());
 		ensure(!bufferer.hasError());
@@ -39,7 +39,7 @@ namespace tut {
 	}
 	
 	TEST_METHOD(3) {
-		// Test feeding a complete stream byte by byte.
+		set_test_name("Test feeding a complete stream byte by byte");
 		const char *pos = input.data();
 		const char *end = input.data() + input.size();
 		while (pos < end) {
@@ -57,7 +57,7 @@ namespace tut {
 	}
 	
 	TEST_METHOD(4) {
-		// Test feeding a complete stream in pieces of 2 bytes.
+		set_test_name("Test feeding a complete stream in pieces of 2 bytes");
 		const char *pos = input.data();
 		const char *end = input.data() + input.size();
 		while (pos < end) {
@@ -76,7 +76,7 @@ namespace tut {
 	}
 	
 	TEST_METHOD(5) {
-		// Test feeding a complete stream in pieces of 3 bytes.
+		set_test_name("Test feeding a complete stream in pieces of 3 bytes");
 		const char *pos = input.data();
 		const char *end = input.data() + input.size();
 		while (pos < end) {
@@ -95,7 +95,7 @@ namespace tut {
 	}
 	
 	TEST_METHOD(20) {
-		// It refuses to accept any more data after the header terminator until reset is called.
+		set_test_name("It refuses to accept any more data after the header terminator until reset is called");
 		string input2 = input;
 		input2.append("hello world");
 		
@@ -116,7 +116,7 @@ namespace tut {
 	}
 	
 	TEST_METHOD(21) {
-		// Same test as above, except we feed byte-by-byte.
+		set_test_name("Same test as above, except we feed byte-by-byte");
 		string input2 = input;
 		input2.append("hello world");
 		const char *pos;
@@ -163,7 +163,7 @@ namespace tut {
 	}
 	
 	TEST_METHOD(22) {
-		// Test inputting data larger than the max size.
+		set_test_name("Test inputting data larger than the max size");
 		input.assign(1024, '\0');
 		bufferer.setMax(512);
 		
@@ -173,7 +173,7 @@ namespace tut {
 	}
 	
 	TEST_METHOD(23) {
-		// Some as above, except we feed byte-by-byte.
+		set_test_name("Some as above, except we feed byte-by-byte");
 		unsigned int i;
 		bufferer.setMax(512);
 		
@@ -191,7 +191,7 @@ namespace tut {
 	}
 	
 	TEST_METHOD(24) {
-		// Test garbage.
+		set_test_name("Test garbage");
 		input.clear();
 		for (int i = 0; i < 256; i++) {
 			input.append(1, (char) i);
@@ -200,4 +200,58 @@ namespace tut {
 		ensure(bufferer.acceptingInput());
 		ensure(!bufferer.hasError());
 	}
+
+	TEST_METHOD(25) {
+		set_test_name("It ignores 100-Continue messages that are fed in one go");
+		string preamble = "HTTP/1.1 100 Continue\r\n\r\n";
+		string input2 = preamble + input;
+
+		ensure_equals(bufferer.feed(input2.data(), input2.size()), input2.size());
+		ensure(!bufferer.acceptingInput());
+		ensure(!bufferer.hasError());
+		ensure_equals("It ignored the 100-Continue message",
+			bufferer.getData(), input);
+		ensure_equals("It does not copy any data",
+			bufferer.getData().data(),
+			input2.data() + preamble.size());
+		ensure_equals(bufferer.getData().size(), input.size());
+	}
+
+	TEST_METHOD(26) {
+		set_test_name("It ignores 100-Continue messages that are fed byte-by-byte");
+		string preamble = "HTTP/1.1 100 Continue\r\n\r\n";
+		string input2 = preamble + input;
+		const char *pos = input2.data();
+		const char *end = input2.data() + input2.size();
+		while (pos < end) {
+			ensure(bufferer.acceptingInput());
+			ensure(!bufferer.hasError());
+			ensure_equals(bufferer.feed(pos, 1), 1u);
+			pos++;
+		}
+		
+		ensure(!bufferer.acceptingInput());
+		ensure(!bufferer.hasError());
+		ensure("It copies the fed data into an internal buffer",
+			bufferer.getData().data() < input2.data()
+			|| bufferer.getData().data() > input2.data() + input2.size());
+		ensure_equals(bufferer.getData(), input);
+	}
+
+	TEST_METHOD(27) {
+		set_test_name("It ignores 100-Continue messages, when the non-100 "
+			"message is fed separately from the 100 message");
+		string preamble = "HTTP/1.1 100 Continue\r\n\r\n";
+
+		ensure_equals(bufferer.feed(preamble.data(), preamble.size()), preamble.size());
+		ensure_equals(bufferer.feed(input.data(), input.size()), input.size());
+
+		ensure(!bufferer.acceptingInput());
+		ensure(!bufferer.hasError());
+		ensure_equals("It ignored the 100-Continue message",
+			bufferer.getData(), input);
+		ensure_equals("It does not copy any data",
+			bufferer.getData().data(),
+			input.data());
+	}
 }