passenger 5.0.21 → 5.0.22

data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/package.json

@@ -0,0 +1,56 @@
+{
+  "name": "pkginfo",
+  "version": "0.3.1",
+  "license": "MIT",
+  "description": "An easy way to expose properties on a module from a package.json",
+  "author": {
+    "name": "Charlie Robbins",
+    "email": "charlie.robbins@gmail.com"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/indexzero/node-pkginfo.git"
+  },
+  "bugs": {
+    "url": "https://github.com/indexzero/node-pkginfo/issues"
+  },
+  "keywords": [
+    "info",
+    "tools",
+    "package.json"
+  ],
+  "devDependencies": {
+    "vows": "0.7.x"
+  },
+  "main": "./lib/pkginfo.js",
+  "scripts": {
+    "test": "vows test/*-test.js --spec"
+  },
+  "engines": {
+    "node": ">= 0.4.0"
+  },
+  "gitHead": "630fcf486543ee48b4c16afc575c0421fe039f26",
+  "homepage": "https://github.com/indexzero/node-pkginfo#readme",
+  "_id": "pkginfo@0.3.1",
+  "_shasum": "5b29f6a81f70717142e09e765bbeab97b4f81e21",
+  "_from": "pkginfo@0.3.x",
+  "_npmVersion": "2.14.1",
+  "_nodeVersion": "0.10.38",
+  "_npmUser": {
+    "name": "indexzero",
+    "email": "charlie.robbins@gmail.com"
+  },
+  "maintainers": [
+    {
+      "name": "indexzero",
+      "email": "charlie.robbins@gmail.com"
+    }
+  ],
+  "dist": {
+    "shasum": "5b29f6a81f70717142e09e765bbeab97b4f81e21",
+    "tarball": "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
+  "readme": "ERROR: No README data found!"
+}

data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/License

@@ -0,0 +1,19 @@
+Copyright (c) 2011 Felix Geisendörfer (felix@debuggable.com)
+
+ 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.

data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/lib/stack-trace.js

@@ -0,0 +1,111 @@
+exports.get = function(belowFn) {
+  var oldLimit = Error.stackTraceLimit;
+  Error.stackTraceLimit = Infinity;
+
+  var dummyObject = {};
+
+  var v8Handler = Error.prepareStackTrace;
+  Error.prepareStackTrace = function(dummyObject, v8StackTrace) {
+    return v8StackTrace;
+  };
+  Error.captureStackTrace(dummyObject, belowFn || exports.get);
+
+  var v8StackTrace = dummyObject.stack;
+  Error.prepareStackTrace = v8Handler;
+  Error.stackTraceLimit = oldLimit;
+
+  return v8StackTrace;
+};
+
+exports.parse = function(err) {
+  if (!err.stack) {
+    return [];
+  }
+
+  var self = this;
+  var lines = err.stack.split('\n').slice(1);
+
+  return lines
+    .map(function(line) {
+      if (line.match(/^\s*[-]{4,}$/)) {
+        return self._createParsedCallSite({
+          fileName: line,
+          lineNumber: null,
+          functionName: null,
+          typeName: null,
+          methodName: null,
+          columnNumber: null,
+          'native': null,
+        });
+      }
+
+      var lineMatch = line.match(/at (?:(.+)\s+)?\(?(?:(.+?):(\d+):(\d+)|([^)]+))\)?/);
+      if (!lineMatch) {
+        return;
+      }
+
+      var object = null;
+      var method = null;
+      var functionName = null;
+      var typeName = null;
+      var methodName = null;
+      var isNative = (lineMatch[5] === 'native');
+
+      if (lineMatch[1]) {
+        var methodMatch = lineMatch[1].match(/([^\.]+)(?:\.(.+))?/);
+        object = methodMatch[1];
+        method = methodMatch[2];
+        functionName = lineMatch[1];
+        typeName = 'Object';
+      }
+
+      if (method) {
+        typeName = object;
+        methodName = method;
+      }
+
+      if (method === '<anonymous>') {
+        methodName = null;
+        functionName = '';
+      }
+
+      var properties = {
+        fileName: lineMatch[2] || null,
+        lineNumber: parseInt(lineMatch[3], 10) || null,
+        functionName: functionName,
+        typeName: typeName,
+        methodName: methodName,
+        columnNumber: parseInt(lineMatch[4], 10) || null,
+        'native': isNative,
+      };
+
+      return self._createParsedCallSite(properties);
+    })
+    .filter(function(callSite) {
+      return !!callSite;
+    });
+};
+
+exports._createParsedCallSite = function(properties) {
+  var methods = {};
+  for (var property in properties) {
+    var prefix = 'get';
+    if (property === 'native') {
+      prefix = 'is';
+    }
+    var method = prefix + property.substr(0, 1).toUpperCase() + property.substr(1);
+
+    (function(property) {
+      methods[method] = function() {
+        return properties[property];
+      }
+    })(property);
+  }
+
+  var callSite = Object.create(methods);
+  for (var property in properties) {
+    callSite[property] = properties[property];
+  }
+
+  return callSite;
+};

data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/package.json

@@ -0,0 +1,33 @@
+{
+  "author": {
+    "name": "Felix Geisendörfer",
+    "email": "felix@debuggable.com",
+    "url": "http://debuggable.com/"
+  },
+  "name": "stack-trace",
+  "description": "Get v8 stack traces as an array of CallSite objects.",
+  "version": "0.0.9",
+  "homepage": "https://github.com/felixge/node-stack-trace",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/felixge/node-stack-trace.git"
+  },
+  "main": "./lib/stack-trace",
+  "engines": {
+    "node": "*"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "far": "0.0.3",
+    "long-stack-traces": "0.1.2"
+  },
+  "readme": "# stack-trace\n\nGet v8 stack traces as an array of CallSite objects.\n\n## Install\n\n``` bash\nnpm install stack-trace\n```\n\n## Usage\n\nThe stack-trace module makes it easy for you to capture the current stack:\n\n``` javascript\nvar stackTrace = require('stack-trace');\nvar trace = stackTrace.get();\n\nrequire('assert').strictEqual(trace[0].getFileName(), __filename);\n```\n\nHowever, sometimes you have already popped the stack you are interested in,\nand all you have left is an `Error` object. This module can help:\n\n``` javascript\nvar stackTrace = require('stack-trace');\nvar err = new Error('something went wrong');\nvar trace = stackTrace.parse(err);\n\nrequire('assert').strictEqual(trace[0].getFileName(), __filename);\n```\n\nPlease note that parsing the `Error#stack` property is not perfect, only\ncertain properties can be retrieved with it as noted in the API docs below.\n\n## Long stack traces\n\nstack-trace works great with [long-stack-traces][], when parsing an `err.stack`\nthat has crossed the event loop boundary, a `CallSite` object returning\n`'----------------------------------------'` for `getFileName()` is created.\nAll other methods of the event loop boundary call site return `null`.\n\n[long-stack-traces]: https://github.com/tlrobinson/long-stack-traces\n\n## API\n\n### stackTrace.get([belowFn])\n\nReturns an array of `CallSite` objects, where element `0` is the current call\nsite.\n\nWhen passing a function on the current stack as the `belowFn` parameter, the\nreturned array will only include `CallSite` objects below this function.\n\n### stackTrace.parse(err)\n\nParses the `err.stack` property of an `Error` object into an array compatible\nwith those returned by `stackTrace.get()`. However, only the following methods\nare implemented on the returned `CallSite` objects.\n\n* getTypeName\n* getFunctionName\n* getMethodName\n* getFileName\n* getLineNumber\n* getColumnNumber\n* isNative\n\nNote: Except `getFunctionName()`, all of the above methods return exactly the\nsame values as you would get from `stackTrace.get()`. `getFunctionName()`\nis sometimes a little different, but still useful.\n\n### CallSite\n\nThe official v8 CallSite object API can be found [here][v8stackapi]. A quick\nexcerpt:\n\n> A CallSite object defines the following methods:\n>\n> * **getThis**: returns the value of this\n> * **getTypeName**: returns the type of this as a string. This is the name of the function stored in the constructor field of this, if available, otherwise the object's [[Class]] internal property.\n> * **getFunction**: returns the current function\n> * **getFunctionName**: returns the name of the current function, typically its name property. If a name property is not available an attempt will be made to try to infer a name from the function's context.\n> * **getMethodName**: returns the name of the property of this or one of its prototypes that holds the current function\n> * **getFileName**: if this function was defined in a script returns the name of the script\n> * **getLineNumber**: if this function was defined in a script returns the current line number\n> * **getColumnNumber**: if this function was defined in a script returns the current column number\n> * **getEvalOrigin**: if this function was created using a call to eval returns a CallSite object representing the location where eval was called\n> * **isToplevel**: is this a toplevel invocation, that is, is this the global object?\n> * **isEval**: does this call take place in code defined by a call to eval?\n> * **isNative**: is this call in native V8 code?\n> * **isConstructor**: is this a constructor call?\n\n[v8stackapi]: http://code.google.com/p/v8/wiki/JavaScriptStackTraceApi\n\n## License\n\nstack-trace is licensed under the MIT license.\n",
+  "readmeFilename": "Readme.md",
+  "bugs": {
+    "url": "https://github.com/felixge/node-stack-trace/issues"
+  },
+  "_id": "stack-trace@0.0.9",
+  "_shasum": "a8f6eaeca90674c333e7c43953f275b451510695",
+  "_from": "stack-trace@0.0.x",
+  "_resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
+}

data/src/nodejs_supportlib/vendor-copy/winston/package.json

@@ -0,0 +1,87 @@
+{
+  "name": "winston",
+  "description": "A multi-transport async logging library for Node.js",
+  "version": "1.1.2",
+  "author": {
+    "name": "Charlie Robbins",
+    "email": "charlie.robbins@gmail.com"
+  },
+  "maintainers": [
+    {
+      "name": "indexzero",
+      "email": "charlie.robbins@gmail.com"
+    },
+    {
+      "name": "chjj",
+      "email": "chjjeffrey@gmail.com"
+    },
+    {
+      "name": "jcrugzz",
+      "email": "jcrugzz@gmail.com"
+    },
+    {
+      "name": "pose",
+      "email": "albertopose@gmail.com"
+    },
+    {
+      "name": "v1",
+      "email": "info@3rd-Eden.com"
+    },
+    {
+      "name": "3rdeden",
+      "email": "npm@3rd-Eden.com"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/winstonjs/winston.git"
+  },
+  "keywords": [
+    "logging",
+    "sysadmin",
+    "tools"
+  ],
+  "dependencies": {
+    "async": "~1.0.0",
+    "colors": "1.0.x",
+    "cycle": "1.0.x",
+    "eyes": "0.1.x",
+    "isstream": "0.1.x",
+    "pkginfo": "0.3.x",
+    "stack-trace": "0.0.x"
+  },
+  "devDependencies": {
+    "hock": "1.x.x",
+    "std-mocks": "~1.0.0",
+    "vows": "0.7.x"
+  },
+  "main": "./lib/winston",
+  "scripts": {
+    "test": "vows --spec --isolate"
+  },
+  "engines": {
+    "node": ">= 0.8.0"
+  },
+  "license": "MIT",
+  "gitHead": "2064bfe3b0f3da77c798d248a1609dbc24ff077e",
+  "bugs": {
+    "url": "https://github.com/winstonjs/winston/issues"
+  },
+  "homepage": "https://github.com/winstonjs/winston#readme",
+  "_id": "winston@1.1.2",
+  "_shasum": "68edd769ff79d4f9528cf0e5d80021aade67480c",
+  "_from": "winston@^1.1.0",
+  "_npmVersion": "2.14.5",
+  "_nodeVersion": "0.12.7",
+  "_npmUser": {
+    "name": "indexzero",
+    "email": "charlie.robbins@gmail.com"
+  },
+  "dist": {
+    "shasum": "68edd769ff79d4f9528cf0e5d80021aade67480c",
+    "tarball": "http://registry.npmjs.org/winston/-/winston-1.1.2.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz",
+  "readme": "ERROR: No README data found!"
+}

data/src/ruby_supportlib/phusion_passenger.rb

@@ -31,7 +31,7 @@ module PhusionPassenger
 
   PACKAGE_NAME = 'passenger'
   # Run 'rake src/cxx_supportlib/Constants.h' after changing this number.
-  VERSION_STRING = '5.0.21'
+  VERSION_STRING = '5.0.22'
 
   PREFERRED_NGINX_VERSION = '1.8.0'
   NGINX_SHA256_CHECKSUM = '23cca1239990c818d8f6da118320c4979aadf5386deda691b1b7c2c96b9df3d5'
@@ -212,9 +212,8 @@ module PhusionPassenger
   ###### Other resource locations ######
 
   def self.binaries_sites
-    return [
-      { :url => "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release".freeze,
-        :cacert => "#{resources_dir}/oss-binaries.phusionpassenger.com.crt".freeze },
+    [
+      { :url => "https://oss-binaries.phusionpassenger.com/binaries/passenger/by_release".freeze },
       { :url => "https://s3.amazonaws.com/phusion-passenger/binaries/passenger/by_release".freeze }
     ]
   end

data/src/ruby_supportlib/phusion_passenger/admin_tools/instance.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2014 Phusion Holding B.V.
+#  Copyright (c) 2014-2015 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -24,6 +24,8 @@
 #  THE SOFTWARE.
 
 PhusionPassenger.require_passenger_lib 'constants'
+PhusionPassenger.require_passenger_lib 'platform_info'
+PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
 PhusionPassenger.require_passenger_lib 'utils/json'
 
 module PhusionPassenger
@@ -59,7 +61,7 @@ module PhusionPassenger
       end
 
       def locked?
-        if defined?(File::LOCK_EX)
+        if PlatformInfo.supports_flock?
           begin
             !File.open("#{@path}/lock", "r") do |f|
               f.flock(File::LOCK_EX | File::LOCK_NB)
@@ -109,10 +111,18 @@ module PhusionPassenger
         return response
       end
 
+      def watchdog_pid
+        properties["watchdog_pid"]
+      end
+
       def core_pid
         @core_pid ||= File.read("#{@path}/core.pid").to_i
       end
 
+      def web_server_control_process_pid
+        File.read("#{@path}/web_server_control_process.pid").to_i
+      end
+
       def full_admin_password
         @full_admin_password ||= File.read("#{@path}/full_admin_password.txt")
       end
@@ -121,6 +131,13 @@ module PhusionPassenger
         @read_only_admin_password ||= File.read("#{@path}/read_only_admin_password.txt")
       end
 
+      def as_json
+        json = properties
+        json["instance_dir"]["path"] = path
+        json["core_pid"] = core_pid
+        json
+      end
+
     private
       class CorruptedError < StandardError
       end

data/src/ruby_supportlib/phusion_passenger/apache2/config_options.rb

@@ -53,6 +53,8 @@
 #  * function - If nil, a setter function will be automatically generated. If
 #               non-nil, must be the name of the setter function.
 
+PhusionPassenger.require_passenger_lib 'constants'
+
 APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
   {
     :name => "PassengerRuby",
@@ -220,6 +222,12 @@ APACHE2_DIRECTORY_CONFIGURATION_OPTIONS = [
     :type     => :string,
     :desc     => "Application process group name."
   },
+  {
+    :name     => "PassengerForceMaxConcurrentRequestsPerProcess",
+    :type     => :integer,
+    :desc     => "Force #{SHORT_PROGRAM_NAME} to believe that an application process " \
+                 "can handle the given number of concurrent requests per process"
+  },
 
   ##### Aliases #####
 

data/src/ruby_supportlib/phusion_passenger/config/list_instances_command.rb

@@ -89,17 +89,13 @@ module PhusionPassenger
       def print_json(instances)
         result = []
         instances.each do |instance|
-          result << instance.properties
+          result << instance.as_json
         end
         puts PhusionPassenger::Utils::JSON.generate(result)
       end
 
       def print_instances(instances)
-        printf "%-25s  %s\n", "Name", "Description"
-        puts "------------------------------------------------------------------"
-        instances.each do |instance|
-          printf "%-25s  %s\n", instance.name, instance.server_software
-        end
+        list_all_passenger_instances(instances, false)
       end
     end
 

data/src/ruby_supportlib/phusion_passenger/config/reopen_logs_command.rb

@@ -72,6 +72,9 @@ module PhusionPassenger
         perform_reopen_logs_on("watchdog", "watchdog_api")
         perform_reinherit_logs_on("core", "core_api")
         perform_reinherit_logs_on("UstRouter", "ust_router_api")
+        if using_standalone_nginx_engine?
+          perform_reopen_logs_on_nginx
+        end
         puts "All done"
       end
 
@@ -115,6 +118,16 @@ module PhusionPassenger
         end
       end
 
+      def using_standalone_nginx_engine?
+        @instance.properties["integration_mode"] == "standalone" &&
+          @instance.properties["standalone_engine"] == "nginx"
+      end
+
+      def perform_reopen_logs_on_nginx
+        puts "Reopening logs for Nginx engine"
+        Process.kill('USR1', @instance.web_server_control_process_pid)
+      end
+
       def handle_error(name, response)
         json = PhusionPassenger::Utils::JSON.parse(response.body)
         if !should_ignore_error?(json)