passenger 6.0.12 → 6.0.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (80) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +37 -1
  3. data/bin/passenger-install-nginx-module +1 -1
  4. data/dev/copy_boost_headers +30 -15
  5. data/resources/mime.types +1 -0
  6. data/resources/templates/standalone/server.erb +1 -0
  7. data/src/agent/Core/ApplicationPool/Group/StateInspection.cpp +1 -0
  8. data/src/agent/Core/ApplicationPool/Options.h +5 -0
  9. data/src/agent/Core/Config.h +1 -1
  10. data/src/agent/Core/Controller/Config.h +5 -2
  11. data/src/agent/Core/Controller/InitRequest.cpp +2 -0
  12. data/src/agent/Core/OptionParser.h +4 -0
  13. data/src/agent/Core/SpawningKit/Config/AutoGeneratedCode.h +7 -0
  14. data/src/agent/Core/SpawningKit/Config.h +13 -0
  15. data/src/agent/Core/SpawningKit/Handshake/Prepare.h +4 -0
  16. data/src/agent/Core/SpawningKit/Spawner.h +1 -0
  17. data/src/agent/SpawnEnvSetupper/SpawnEnvSetupperMain.cpp +4 -0
  18. data/src/agent/Watchdog/Config.h +1 -1
  19. data/src/apache2_module/ConfigGeneral/AutoGeneratedDefinitions.cpp +5 -0
  20. data/src/apache2_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.cpp +5 -0
  21. data/src/apache2_module/ConfigGeneral/AutoGeneratedSetterFuncs.cpp +18 -0
  22. data/src/apache2_module/DirConfig/AutoGeneratedCreateFunction.cpp +3 -0
  23. data/src/apache2_module/DirConfig/AutoGeneratedHeaderSerialization.cpp +3 -0
  24. data/src/apache2_module/DirConfig/AutoGeneratedManifestGeneration.cpp +11 -0
  25. data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp +7 -0
  26. data/src/apache2_module/DirConfig/AutoGeneratedStruct.h +17 -0
  27. data/src/apache2_module/Hooks.cpp +1 -0
  28. data/src/cxx_supportlib/Constants.h +1 -1
  29. data/src/cxx_supportlib/vendor-modified/boost/align/align.hpp +19 -0
  30. data/src/cxx_supportlib/vendor-modified/boost/align/alignment_of.hpp +54 -0
  31. data/src/cxx_supportlib/vendor-modified/boost/align/alignment_of_forward.hpp +20 -0
  32. data/src/cxx_supportlib/vendor-modified/boost/align/detail/align_cxx11.hpp +21 -0
  33. data/src/cxx_supportlib/vendor-modified/boost/align/detail/aligned_alloc.hpp +52 -0
  34. data/src/cxx_supportlib/vendor-modified/boost/align/detail/alignment_of.hpp +31 -0
  35. data/src/cxx_supportlib/vendor-modified/boost/align/detail/alignment_of_cxx11.hpp +23 -0
  36. data/src/cxx_supportlib/vendor-modified/boost/align/detail/element_type.hpp +91 -0
  37. data/src/cxx_supportlib/vendor-modified/boost/align/detail/integral_constant.hpp +53 -0
  38. data/src/cxx_supportlib/vendor-modified/boost/align/detail/min_size.hpp +26 -0
  39. data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c +8 -0
  40. data/src/nginx_module/ConfigGeneral/AutoGeneratedManifestDefaultsInitialization.c +6 -0
  41. data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c +12 -0
  42. data/src/nginx_module/LocationConfig/AutoGeneratedCreateFunction.c +5 -0
  43. data/src/nginx_module/LocationConfig/AutoGeneratedHeaderSerialization.c +18 -0
  44. data/src/nginx_module/LocationConfig/AutoGeneratedManifestGeneration.c +13 -0
  45. data/src/nginx_module/LocationConfig/AutoGeneratedMergeFunction.c +3 -0
  46. data/src/nginx_module/LocationConfig/AutoGeneratedStruct.h +4 -0
  47. data/src/nginx_module/ngx_http_passenger_module.c +1 -0
  48. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/common.js +50 -29
  49. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/cli-config.js +20 -20
  50. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/npm-config.js +11 -11
  51. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config/syslog-config.js +3 -3
  52. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/config.js +8 -2
  53. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/container.js +2 -1
  54. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/logger.js +174 -146
  55. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/console.js +4 -2
  56. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/file.js +15 -5
  57. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/http.js +14 -4
  58. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports.js +26 -24
  59. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston.js +5 -5
  60. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/async/package.json +4 -13
  61. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/colors/package.json +19 -33
  62. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/cycle/package.json +11 -29
  63. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/eyes/package.json +12 -40
  64. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/isstream/package.json +3 -12
  65. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/lib/stack-trace.js +49 -24
  66. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/stack-trace/package.json +4 -16
  67. data/src/nodejs_supportlib/vendor-copy/winston/package.json +11 -55
  68. data/src/ruby_supportlib/phusion_passenger/apache2/config_options.rb +6 -0
  69. data/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb +6 -0
  70. data/src/ruby_supportlib/phusion_passenger/platform_info/linux.rb +2 -1
  71. data/src/ruby_supportlib/phusion_passenger/request_handler/thread_handler.rb +18 -18
  72. data/src/ruby_supportlib/phusion_passenger/standalone/config_options_list.rb +7 -1
  73. data/src/ruby_supportlib/phusion_passenger/standalone/start_command/builtin_engine.rb +1 -0
  74. data/src/ruby_supportlib/phusion_passenger.rb +5 -5
  75. metadata +12 -7
  76. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/daily-rotate-file.js +0 -601
  77. data/src/nodejs_supportlib/vendor-copy/winston/lib/winston/transports/webhook.js +0 -146
  78. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/LICENSE +0 -19
  79. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/lib/pkginfo.js +0 -136
  80. data/src/nodejs_supportlib/vendor-copy/winston/node_modules/pkginfo/package.json +0 -56
@@ -1,146 +0,0 @@
1
- /*
2
- * webhook.js: Transport for logging to remote http endpoints ( POST / RECEIVE webhooks )
3
- *
4
- * (C) 2011 Marak Squires
5
- * MIT LICENCE
6
- *
7
- */
8
-
9
- var events = require('events'),
10
- http = require('http'),
11
- https = require('https'),
12
- util = require('util'),
13
- cycle = require('cycle'),
14
- common = require('../common'),
15
- Transport = require('./transport').Transport;
16
-
17
- //
18
- // ### function WebHook (options)
19
- // #### @options {Object} Options for this instance.
20
- // Constructor function for the Console transport object responsible
21
- // for making arbitrary HTTP requests whenever log messages and metadata
22
- // are received.
23
- //
24
- var Webhook = exports.Webhook = function (options) {
25
- Transport.call(this, options);
26
-
27
- this.name = 'webhook';
28
- this.host = options.host || 'localhost';
29
- this.port = options.port || 8080;
30
- this.method = options.method || 'POST';
31
- this.path = options.path || '/winston-log';
32
-
33
- if (options.auth) {
34
- this.auth = {};
35
- this.auth.username = options.auth.username || '';
36
- this.auth.password = options.auth.password || '';
37
- }
38
-
39
- if (options.ssl) {
40
- this.port = options.port || 443;
41
- this.ssl = {
42
- key: options.ssl.key || null,
43
- cert: options.ssl.cert || null,
44
- ca: options.ssl.ca
45
- };
46
- }
47
- };
48
-
49
- //
50
- // Inherit from `winston.Transport`.
51
- //
52
- util.inherits(Webhook, Transport);
53
-
54
- //
55
- // Expose the name of this Transport on the prototype
56
- //
57
- Webhook.prototype.name = 'webhook';
58
-
59
- //
60
- // ### function log (level, msg, [meta], callback)
61
- // #### @level {string} Level at which to log the message.
62
- // #### @msg {string} Message to log
63
- // #### @meta {Object} **Optional** Additional metadata to attach
64
- // #### @callback {function} Continuation to respond to when complete.
65
- // Core logging method exposed to Winston. Metadata is optional.
66
- //
67
- Webhook.prototype.log = function (level, msg, meta, callback) {
68
- if (this.silent) {
69
- return callback(null, true);
70
- }
71
-
72
- var self = this,
73
- meta = cycle.decycle(meta),
74
- message = common.clone(meta),
75
- options,
76
- req;
77
-
78
- // Prepare options for outgoing HTTP request
79
- options = {
80
- host: this.host,
81
- port: this.port,
82
- path: this.path,
83
- method: this.method,
84
- headers: { 'Content-Type': 'application/json' }
85
- };
86
-
87
- if (this.ssl) {
88
- options.ca = this.ssl.ca;
89
- options.key = this.ssl.key;
90
- options.cert = this.ssl.cert;
91
-
92
- // Required for the test fixture SSL certificate to be considered valid.
93
- options.rejectUnauthorized = false;
94
- }
95
-
96
- if (this.auth) {
97
- // Encode `Authorization` header used by Basic Auth
98
- options.headers['Authorization'] = 'Basic ' + new Buffer(
99
- this.auth.username + ':' + this.auth.password, 'utf8'
100
- ).toString('base64');
101
- }
102
-
103
- // Perform HTTP logging request
104
- req = (self.ssl ? https : http).request(options, function (res) {
105
- // TODO: emit 'logged' correctly,
106
- // keep track of pending logs.
107
- res.on('data', function(data) {
108
- // Do nothing. We need to read the response, or we run into maxSockets
109
- // after 5 requests.
110
- });
111
-
112
- self.emit('logged');
113
- if (callback) callback(null, true);
114
- callback = null;
115
- });
116
-
117
- req.on('error', function (err) {
118
- //
119
- // Propagate the `error` back up to the `Logger` that this
120
- // instance belongs to.
121
- //
122
- self.emit('error', err);
123
- if (callback) callback(err, false);
124
- callback = null;
125
- });
126
-
127
- //
128
- // Write logging event to the outgoing request body
129
- //
130
- // jsonMessage is currently conforming to JSON-RPC v1.0,
131
- // but without the unique id since there is no anticipated response
132
- // see: http://en.wikipedia.org/wiki/JSON-RPC
133
- //
134
-
135
- var params = common.clone(meta) || {};
136
- params.timestamp = new Date();
137
- params.message = msg;
138
- params.level = level;
139
-
140
- req.write(JSON.stringify({
141
- method: 'log',
142
- params: params
143
- }));
144
-
145
- req.end();
146
- };
@@ -1,19 +0,0 @@
1
- Copyright (c) 2010 Charlie Robbins.
2
-
3
- Permission is hereby granted, free of charge, to any person obtaining a copy
4
- of this software and associated documentation files (the "Software"), to deal
5
- in the Software without restriction, including without limitation the rights
6
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7
- copies of the Software, and to permit persons to whom the Software is
8
- furnished to do so, subject to the following conditions:
9
-
10
- The above copyright notice and this permission notice shall be included in
11
- all copies or substantial portions of the Software.
12
-
13
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19
- THE SOFTWARE.
@@ -1,136 +0,0 @@
1
- /*
2
- * pkginfo.js: Top-level include for the pkginfo module
3
- *
4
- * (C) 2011, Charlie Robbins
5
- *
6
- */
7
-
8
- var fs = require('fs'),
9
- path = require('path');
10
-
11
- //
12
- // ### function pkginfo ([options, 'property', 'property' ..])
13
- // #### @pmodule {Module} Parent module to read from.
14
- // #### @options {Object|Array|string} **Optional** Options used when exposing properties.
15
- // #### @arguments {string...} **Optional** Specified properties to expose.
16
- // Exposes properties from the package.json file for the parent module on
17
- // it's exports. Valid usage:
18
- //
19
- // `require('pkginfo')()`
20
- //
21
- // `require('pkginfo')('version', 'author');`
22
- //
23
- // `require('pkginfo')(['version', 'author']);`
24
- //
25
- // `require('pkginfo')({ include: ['version', 'author'] });`
26
- //
27
- var pkginfo = module.exports = function (pmodule, options) {
28
- var args = [].slice.call(arguments, 2).filter(function (arg) {
29
- return typeof arg === 'string';
30
- });
31
-
32
- //
33
- // **Parse variable arguments**
34
- //
35
- if (Array.isArray(options)) {
36
- //
37
- // If the options passed in is an Array assume that
38
- // it is the Array of properties to expose from the
39
- // on the package.json file on the parent module.
40
- //
41
- options = { include: options };
42
- }
43
- else if (typeof options === 'string') {
44
- //
45
- // Otherwise if the first argument is a string, then
46
- // assume that it is the first property to expose from
47
- // the package.json file on the parent module.
48
- //
49
- options = { include: [options] };
50
- }
51
-
52
- //
53
- // **Setup default options**
54
- //
55
- options = options || {};
56
-
57
- // ensure that includes have been defined
58
- options.include = options.include || [];
59
-
60
- if (args.length > 0) {
61
- //
62
- // If additional string arguments have been passed in
63
- // then add them to the properties to expose on the
64
- // parent module.
65
- //
66
- options.include = options.include.concat(args);
67
- }
68
-
69
- var pkg = pkginfo.read(pmodule, options.dir).package;
70
- Object.keys(pkg).forEach(function (key) {
71
- if (options.include.length > 0 && !~options.include.indexOf(key)) {
72
- return;
73
- }
74
-
75
- if (!pmodule.exports[key]) {
76
- pmodule.exports[key] = pkg[key];
77
- }
78
- });
79
-
80
- return pkginfo;
81
- };
82
-
83
- //
84
- // ### function find (dir)
85
- // #### @pmodule {Module} Parent module to read from.
86
- // #### @dir {string} **Optional** Directory to start search from.
87
- // Searches up the directory tree from `dir` until it finds a directory
88
- // which contains a `package.json` file.
89
- //
90
- pkginfo.find = function (pmodule, dir) {
91
- if (! dir) {
92
- dir = path.dirname(pmodule.filename);
93
- }
94
-
95
- var files = fs.readdirSync(dir);
96
-
97
- if (~files.indexOf('package.json')) {
98
- return path.join(dir, 'package.json');
99
- }
100
-
101
- if (dir === '/') {
102
- throw new Error('Could not find package.json up from: ' + dir);
103
- }
104
- else if (!dir || dir === '.') {
105
- throw new Error('Cannot find package.json from unspecified directory');
106
- }
107
-
108
- return pkginfo.find(pmodule, path.dirname(dir));
109
- };
110
-
111
- //
112
- // ### function read (pmodule, dir)
113
- // #### @pmodule {Module} Parent module to read from.
114
- // #### @dir {string} **Optional** Directory to start search from.
115
- // Searches up the directory tree from `dir` until it finds a directory
116
- // which contains a `package.json` file and returns the package information.
117
- //
118
- pkginfo.read = function (pmodule, dir) {
119
- dir = pkginfo.find(pmodule, dir);
120
-
121
- var data = fs.readFileSync(dir).toString();
122
-
123
- return {
124
- dir: dir,
125
- package: JSON.parse(data)
126
- };
127
- };
128
-
129
- //
130
- // Call `pkginfo` on this module and expose version.
131
- //
132
- pkginfo(module, {
133
- dir: __dirname,
134
- include: ['version'],
135
- target: pkginfo
136
- });
@@ -1,56 +0,0 @@
1
- {
2
- "name": "pkginfo",
3
- "version": "0.3.1",
4
- "license": "MIT",
5
- "description": "An easy way to expose properties on a module from a package.json",
6
- "author": {
7
- "name": "Charlie Robbins",
8
- "email": "charlie.robbins@gmail.com"
9
- },
10
- "repository": {
11
- "type": "git",
12
- "url": "git+ssh://git@github.com/indexzero/node-pkginfo.git"
13
- },
14
- "bugs": {
15
- "url": "https://github.com/indexzero/node-pkginfo/issues"
16
- },
17
- "keywords": [
18
- "info",
19
- "tools",
20
- "package.json"
21
- ],
22
- "devDependencies": {
23
- "vows": "0.7.x"
24
- },
25
- "main": "./lib/pkginfo.js",
26
- "scripts": {
27
- "test": "vows test/*-test.js --spec"
28
- },
29
- "engines": {
30
- "node": ">= 0.4.0"
31
- },
32
- "gitHead": "630fcf486543ee48b4c16afc575c0421fe039f26",
33
- "homepage": "https://github.com/indexzero/node-pkginfo#readme",
34
- "_id": "pkginfo@0.3.1",
35
- "_shasum": "5b29f6a81f70717142e09e765bbeab97b4f81e21",
36
- "_from": "pkginfo@0.3.x",
37
- "_npmVersion": "2.14.1",
38
- "_nodeVersion": "0.10.38",
39
- "_npmUser": {
40
- "name": "indexzero",
41
- "email": "charlie.robbins@gmail.com"
42
- },
43
- "maintainers": [
44
- {
45
- "name": "indexzero",
46
- "email": "charlie.robbins@gmail.com"
47
- }
48
- ],
49
- "dist": {
50
- "shasum": "5b29f6a81f70717142e09e765bbeab97b4f81e21",
51
- "tarball": "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"
52
- },
53
- "directories": {},
54
- "_resolved": "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz",
55
- "readme": "ERROR: No README data found!"
56
- }