passenger 4.0.41 → 4.0.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (136) hide show
  1. checksums.yaml +8 -8
  2. checksums.yaml.gz.asc +7 -7
  3. data.tar.gz.asc +7 -7
  4. data/.travis.yml +3 -3
  5. data/CHANGELOG +26 -0
  6. data/build/agents.rb +1 -1
  7. data/build/apache2.rb +3 -0
  8. data/build/debian.rb +1 -1
  9. data/build/integration_tests.rb +4 -4
  10. data/build/nginx.rb +3 -0
  11. data/build/packaging.rb +3 -5
  12. data/build/preprocessor.rb +2 -1
  13. data/build/ruby_extension.rb +5 -5
  14. data/build/test_basics.rb +2 -1
  15. data/debian.template/control.template +9 -4
  16. data/debian.template/rules.template +16 -4
  17. data/dev/run_travis.sh +32 -8
  18. data/doc/Users guide Apache.txt +55 -10
  19. data/doc/Users guide Nginx.txt +10 -8
  20. data/doc/Users guide Standalone.txt +5 -2
  21. data/doc/users_guide_snippets/installation.txt +14 -0
  22. data/ext/common/ApplicationPool2/Process.h +8 -0
  23. data/ext/common/ApplicationPool2/Spawner.h +51 -1
  24. data/ext/common/Constants.h +1 -1
  25. data/ext/common/Utils/Curl.h +4 -0
  26. data/ext/common/agents/HelperAgent/RequestHandler.h +14 -2
  27. data/ext/common/agents/LoggingAgent/LoggingServer.h +4 -4
  28. data/ext/common/agents/LoggingAgent/RemoteSender.h +66 -5
  29. data/ext/nginx/StaticContentHandler.c +0 -7
  30. data/lib/phusion_passenger.rb +3 -3
  31. data/lib/phusion_passenger/config/about_command.rb +0 -4
  32. data/lib/phusion_passenger/config/build_native_support_command.rb +78 -0
  33. data/lib/phusion_passenger/config/detach_process_command.rb +0 -4
  34. data/lib/phusion_passenger/config/main.rb +12 -5
  35. data/lib/phusion_passenger/config/restart_app_command.rb +0 -4
  36. data/lib/phusion_passenger/config/validate_install_command.rb +0 -4
  37. data/lib/phusion_passenger/platform_info/compiler.rb +58 -41
  38. data/lib/phusion_passenger/platform_info/cxx_portability.rb +5 -0
  39. data/lib/phusion_passenger/standalone/command.rb +29 -10
  40. data/lib/phusion_passenger/standalone/help_command.rb +2 -2
  41. data/lib/phusion_passenger/standalone/start_command.rb +5 -1
  42. data/lib/phusion_passenger/utils/tee_input.rb +1 -0
  43. data/resources/mime.types +1 -1
  44. data/resources/oss-binaries.phusionpassenger.com.crt +124 -0
  45. data/resources/templates/apache2/deployment_example.txt.erb +2 -0
  46. data/resources/templates/standalone/config.erb +3 -1
  47. data/resources/templates/undisclosed_error.html.template +38 -1
  48. data/resources/union_station_gateway.crt +21 -0
  49. data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp +34 -0
  50. data/test/cxx/RequestHandlerTest.cpp +10 -3
  51. data/test/cxx/TemplateTest.cpp +1 -1
  52. data/test/integration_tests/apache2_tests.rb +90 -106
  53. data/test/integration_tests/nginx_tests.rb +2 -0
  54. data/test/stub/rack/config.ru +7 -14
  55. data/test/stub/rack/library.rb +16 -0
  56. data/test/support/test_helper.rb +0 -3
  57. metadata +4 -80
  58. metadata.gz.asc +7 -7
  59. data/test/stub/rails2.3-mycook/Rakefile +0 -10
  60. data/test/stub/rails2.3-mycook/app/controllers/application_controller.rb +0 -12
  61. data/test/stub/rails2.3-mycook/app/controllers/recipes_controller.rb +0 -5
  62. data/test/stub/rails2.3-mycook/app/controllers/uploads_controller.rb +0 -15
  63. data/test/stub/rails2.3-mycook/app/controllers/welcome_controller.rb +0 -71
  64. data/test/stub/rails2.3-mycook/app/helpers/application_helper.rb +0 -3
  65. data/test/stub/rails2.3-mycook/app/helpers/recipes_helper.rb +0 -2
  66. data/test/stub/rails2.3-mycook/app/helpers/test_helper.rb +0 -2
  67. data/test/stub/rails2.3-mycook/app/helpers/uploads_helper.rb +0 -2
  68. data/test/stub/rails2.3-mycook/app/helpers/welcome_helper.rb +0 -2
  69. data/test/stub/rails2.3-mycook/app/views/layouts/default.rhtml +0 -26
  70. data/test/stub/rails2.3-mycook/app/views/recipes/create.rhtml +0 -13
  71. data/test/stub/rails2.3-mycook/app/views/recipes/index.rhtml +0 -3
  72. data/test/stub/rails2.3-mycook/app/views/recipes/new.rhtml +0 -8
  73. data/test/stub/rails2.3-mycook/app/views/uploads/index.rhtml +0 -1
  74. data/test/stub/rails2.3-mycook/app/views/uploads/new.html.erb +0 -8
  75. data/test/stub/rails2.3-mycook/app/views/welcome/cached.rhtml +0 -1
  76. data/test/stub/rails2.3-mycook/app/views/welcome/index.rhtml +0 -20
  77. data/test/stub/rails2.3-mycook/config/boot.rb +0 -110
  78. data/test/stub/rails2.3-mycook/config/database.yml +0 -19
  79. data/test/stub/rails2.3-mycook/config/environment.rb +0 -61
  80. data/test/stub/rails2.3-mycook/config/environments/development.rb +0 -18
  81. data/test/stub/rails2.3-mycook/config/environments/production.rb +0 -19
  82. data/test/stub/rails2.3-mycook/config/initializers/inflections.rb +0 -10
  83. data/test/stub/rails2.3-mycook/config/initializers/mime_types.rb +0 -5
  84. data/test/stub/rails2.3-mycook/config/routes.rb +0 -38
  85. data/test/stub/rails2.3-mycook/log/useless.txt +0 -1
  86. data/test/stub/rails2.3-mycook/public/.htaccess +0 -42
  87. data/test/stub/rails2.3-mycook/public/404.html +0 -30
  88. data/test/stub/rails2.3-mycook/public/422.html +0 -30
  89. data/test/stub/rails2.3-mycook/public/500.html +0 -30
  90. data/test/stub/rails2.3-mycook/public/dispatch.cgi +0 -10
  91. data/test/stub/rails2.3-mycook/public/dispatch.fcgi +0 -24
  92. data/test/stub/rails2.3-mycook/public/dispatch.rb +0 -10
  93. data/test/stub/rails2.3-mycook/public/favicon.ico +0 -0
  94. data/test/stub/rails2.3-mycook/public/images/angrywizard.gif +0 -0
  95. data/test/stub/rails2.3-mycook/public/images/cookbook.gif +0 -0
  96. data/test/stub/rails2.3-mycook/public/images/header.png +0 -0
  97. data/test/stub/rails2.3-mycook/public/images/rails.png +0 -0
  98. data/test/stub/rails2.3-mycook/public/robots.txt +0 -5
  99. data/test/stub/rails2.3-mycook/public/uploads.html +0 -26
  100. data/test/stub/rails2.3-mycook/public/uploads/.gitignore +0 -0
  101. data/test/stub/rails2.3-mycook/public/welcome/cached.html +0 -26
  102. data/test/stub/rails2.3-mycook/script/about +0 -3
  103. data/test/stub/rails2.3-mycook/script/console +0 -3
  104. data/test/stub/rails2.3-mycook/script/dbconsole +0 -3
  105. data/test/stub/rails2.3-mycook/script/destroy +0 -3
  106. data/test/stub/rails2.3-mycook/script/generate +0 -3
  107. data/test/stub/rails2.3-mycook/script/performance/benchmarker +0 -3
  108. data/test/stub/rails2.3-mycook/script/performance/profiler +0 -3
  109. data/test/stub/rails2.3-mycook/script/performance/request +0 -3
  110. data/test/stub/rails2.3-mycook/script/plugin +0 -3
  111. data/test/stub/rails2.3-mycook/script/process/inspector +0 -3
  112. data/test/stub/rails2.3-mycook/script/process/reaper +0 -3
  113. data/test/stub/rails2.3-mycook/script/process/spawner +0 -3
  114. data/test/stub/rails2.3-mycook/script/runner +0 -3
  115. data/test/stub/rails2.3-mycook/script/server +0 -3
  116. data/test/stub/rails2.3-mycook/sites/some.site/public/uploads.html +0 -26
  117. data/test/stub/rails2.3-mycook/sites/some.site/public/welcome/cached.html +0 -26
  118. data/test/stub/rails2.3-mycook/tmp/cache/useless.txt +0 -1
  119. data/test/stub/rails2.3-mycook/tmp/pids/useless.txt +0 -1
  120. data/test/stub/rails2.3-mycook/tmp/sessions/useless.txt +0 -1
  121. data/test/stub/rails2.3-mycook/tmp/sockets/useless.txt +0 -1
  122. data/test/stub/vendor_rails/minimal/README +0 -1
  123. data/test/stub/vendor_rails/minimal/actionmailer/lib/action_mailer.rb +0 -0
  124. data/test/stub/vendor_rails/minimal/actionpack/lib/action_controller.rb +0 -22
  125. data/test/stub/vendor_rails/minimal/actionpack/lib/action_pack.rb +0 -0
  126. data/test/stub/vendor_rails/minimal/actionpack/lib/action_view.rb +0 -0
  127. data/test/stub/vendor_rails/minimal/activerecord/lib/active_record.rb +0 -7
  128. data/test/stub/vendor_rails/minimal/activeresource/lib/active_resource.rb +0 -0
  129. data/test/stub/vendor_rails/minimal/activesupport/lib/active_support.rb +0 -17
  130. data/test/stub/vendor_rails/minimal/activesupport/lib/active_support/whiny_nil.rb +0 -0
  131. data/test/stub/vendor_rails/minimal/railties/lib/dispatcher.rb +0 -0
  132. data/test/stub/vendor_rails/minimal/railties/lib/initializer.rb +0 -57
  133. data/test/stub/vendor_rails/minimal/railties/lib/ruby_version_check.rb +0 -1
  134. data/test/stub/zsfa/header.png +0 -0
  135. data/test/stub/zsfa/index.html +0 -14
  136. data/test/stub/zsfa/zsfa.png +0 -0
data/test/stub/rails2.3-mycook/public/dispatch.rb DELETED
@@ -1,10 +0,0 @@
1
- #!/usr/bin/env ruby
2
-
3
- require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
4
-
5
- # If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like:
6
- # "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired
7
- require "dispatcher"
8
-
9
- ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
10
- Dispatcher.dispatch
data/test/stub/rails2.3-mycook/public/robots.txt DELETED
@@ -1,5 +0,0 @@
1
- # See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
2
- #
3
- # To ban all spiders from the entire site uncomment the next two lines:
4
- # User-Agent: *
5
- # Disallow: /
data/test/stub/rails2.3-mycook/public/uploads.html DELETED
@@ -1,26 +0,0 @@
1
- <html>
2
- <head>
3
- <meta http-equiv="content-type" content="text/html; charset=utf-8">
4
- <title>MyCook&trade; beta</title>
5
- <style type="text/css">
6
- body {
7
- background: url('/images/cookbook.gif?1204293900');
8
- }
9
-
10
- #content {
11
- margin-top: 2em;
12
- margin-left: 20%;
13
- margin-right: 20%;
14
- padding: 1em;
15
- border: solid 5px orange;
16
- background: white;
17
- }
18
- </style>
19
- </head>
20
-
21
- <body>
22
- <div id="content">
23
- This is the cached version of /uploads.
24
- </div>
25
- </body>
26
- </html>
data/test/stub/rails2.3-mycook/public/welcome/cached.html DELETED
@@ -1,26 +0,0 @@
1
- <html>
2
- <head>
3
- <meta http-equiv="content-type" content="text/html; charset=utf-8">
4
- <title>MyCook&trade; beta</title>
5
- <style type="text/css">
6
- body {
7
- background: url('/images/cookbook.gif?1204293900');
8
- }
9
-
10
- #content {
11
- margin-top: 2em;
12
- margin-left: 20%;
13
- margin-right: 20%;
14
- padding: 1em;
15
- border: solid 5px orange;
16
- background: white;
17
- }
18
- </style>
19
- </head>
20
-
21
- <body>
22
- <div id="content">
23
- This is the cached version of /welcome/cached.
24
- </div>
25
- </body>
26
- </html>
data/test/stub/rails2.3-mycook/script/about DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../config/boot'
3
- require 'commands/about'
data/test/stub/rails2.3-mycook/script/console DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../config/boot'
3
- require 'commands/console'
data/test/stub/rails2.3-mycook/script/dbconsole DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../config/boot'
3
- require 'commands/dbconsole'
data/test/stub/rails2.3-mycook/script/destroy DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../config/boot'
3
- require 'commands/destroy'
data/test/stub/rails2.3-mycook/script/generate DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../config/boot'
3
- require 'commands/generate'
data/test/stub/rails2.3-mycook/script/performance/benchmarker DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../../config/boot'
3
- require 'commands/performance/benchmarker'
data/test/stub/rails2.3-mycook/script/performance/profiler DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../../config/boot'
3
- require 'commands/performance/profiler'
data/test/stub/rails2.3-mycook/script/performance/request DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../../config/boot'
3
- require 'commands/performance/request'
data/test/stub/rails2.3-mycook/script/plugin DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../config/boot'
3
- require 'commands/plugin'
data/test/stub/rails2.3-mycook/script/process/inspector DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../../config/boot'
3
- require 'commands/process/inspector'
data/test/stub/rails2.3-mycook/script/process/reaper DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../../config/boot'
3
- require 'commands/process/reaper'
data/test/stub/rails2.3-mycook/script/process/spawner DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../../config/boot'
3
- require 'commands/process/spawner'
data/test/stub/rails2.3-mycook/script/runner DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../config/boot'
3
- require 'commands/runner'
data/test/stub/rails2.3-mycook/script/server DELETED
@@ -1,3 +0,0 @@
1
- #!/usr/bin/env ruby
2
- require File.dirname(__FILE__) + '/../config/boot'
3
- require 'commands/server'
data/test/stub/rails2.3-mycook/sites/some.site/public/uploads.html DELETED
@@ -1,26 +0,0 @@
1
- <html>
2
- <head>
3
- <meta http-equiv="content-type" content="text/html; charset=utf-8">
4
- <title>MyCook&trade; beta</title>
5
- <style type="text/css">
6
- body {
7
- background: url('/images/cookbook.gif?1204293900');
8
- }
9
-
10
- #content {
11
- margin-top: 2em;
12
- margin-left: 20%;
13
- margin-right: 20%;
14
- padding: 1em;
15
- border: solid 5px orange;
16
- background: white;
17
- }
18
- </style>
19
- </head>
20
-
21
- <body>
22
- <div id="content">
23
- This is the cached version of some.site/public/uploads.
24
- </div>
25
- </body>
26
- </html>
data/test/stub/rails2.3-mycook/sites/some.site/public/welcome/cached.html DELETED
@@ -1,26 +0,0 @@
1
- <html>
2
- <head>
3
- <meta http-equiv="content-type" content="text/html; charset=utf-8">
4
- <title>MyCook&trade; beta</title>
5
- <style type="text/css">
6
- body {
7
- background: url('/images/cookbook.gif?1204293900');
8
- }
9
-
10
- #content {
11
- margin-top: 2em;
12
- margin-left: 20%;
13
- margin-right: 20%;
14
- padding: 1em;
15
- border: solid 5px orange;
16
- background: white;
17
- }
18
- </style>
19
- </head>
20
-
21
- <body>
22
- <div id="content">
23
- This is the cached version of some.site/public/welcome/cached.
24
- </div>
25
- </body>
26
- </html>
data/test/stub/rails2.3-mycook/tmp/cache/useless.txt DELETED
@@ -1 +0,0 @@
1
- This useless file prevents git from removing this directory.
data/test/stub/rails2.3-mycook/tmp/pids/useless.txt DELETED
@@ -1 +0,0 @@
1
- This useless file prevents git from removing this directory.
data/test/stub/rails2.3-mycook/tmp/sessions/useless.txt DELETED
@@ -1 +0,0 @@
1
- This useless file prevents git from removing this directory.
data/test/stub/rails2.3-mycook/tmp/sockets/useless.txt DELETED
@@ -1 +0,0 @@
1
- This useless file prevents git from removing this directory.
data/test/stub/vendor_rails/minimal/README DELETED
@@ -1 +0,0 @@
1
- A minimalist simulation a Rails framework.
data/test/stub/vendor_rails/minimal/actionpack/lib/action_controller.rb DELETED
@@ -1,22 +0,0 @@
1
- module ActionController
2
- class Base
3
- def self.page_cache_directory
4
- nil
5
- end
6
-
7
- def self.page_cache_directory=(dir)
8
- end
9
-
10
- def self.helper(*whatever)
11
- end
12
-
13
- def self.protect_from_forgery(*whatever)
14
- end
15
-
16
- def self.session(*whatever)
17
- end
18
- end
19
-
20
- class Dispatcher
21
- end
22
- end
data/test/stub/vendor_rails/minimal/activerecord/lib/active_record.rb DELETED
@@ -1,7 +0,0 @@
1
- class ActiveRecord
2
- class Base
3
- def self.connected?
4
- return false
5
- end
6
- end
7
- end
data/test/stub/vendor_rails/minimal/activesupport/lib/active_support.rb DELETED
@@ -1,17 +0,0 @@
1
- class Object
2
- def require_dependency(name)
3
- require(name)
4
- end
5
- end
6
-
7
- class NilClass
8
- def blank?
9
- return true
10
- end
11
- end
12
-
13
- class String
14
- def blank?
15
- return strip.empty?
16
- end
17
- end
data/test/stub/vendor_rails/minimal/railties/lib/initializer.rb DELETED
@@ -1,57 +0,0 @@
1
- RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../..")
2
-
3
- module Rails
4
- class Initializer
5
- attr_accessor :configuration
6
-
7
- def self.run(action = :boot)
8
- inst = self.new
9
- if inst.respond_to?(action)
10
- inst.send(action)
11
- end
12
- end
13
-
14
- def initialize
15
- @configuration = Configuration.new
16
- end
17
-
18
- def boot
19
- set_load_path
20
- load_environment
21
- end
22
-
23
- def load_environment
24
- require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support"
25
- require "#{RAILS_FRAMEWORK_ROOT}/actionpack/lib/action_controller"
26
- end
27
-
28
- def set_load_path
29
- if defined?(RAILS_ROOT)
30
- $LOAD_PATH << "#{RAILS_ROOT}/app/controllers"
31
- end
32
- $LOAD_PATH << "#{RAILS_FRAMEWORK_ROOT}/railties/lib"
33
- end
34
-
35
- protected
36
- class Configuration
37
- attr_accessor :log_path
38
- attr_accessor :default_log_path
39
-
40
- def initialize
41
- @log_path = @default_log_path = 'foo.log'
42
- end
43
- end
44
- end
45
-
46
- class GemDependency
47
- def self.add_frozen_gem_path
48
- end
49
- end
50
-
51
- module VERSION
52
- MAJOR = 2
53
- MINOR = 3
54
- TINY = 4
55
- STRING = [MAJOR, MINOR, TINY].join('.')
56
- end
57
- end
data/test/stub/zsfa/header.png DELETED
Binary file
data/test/stub/zsfa/index.html DELETED
@@ -1,14 +0,0 @@
1
- <table border="0">
2
- <tr>
3
- <td rowspan="2"><img src="zsfa.png" style="vertical-align: top"></td>
4
- <td style="vertical-align: top"><img src="header.png"></td>
5
- </tr>
6
- <tr>
7
- <td>
8
- <div style="font-size: 50pt; font-family: 'Times New Roman'; font-weight: bold">
9
- <blink>Zed, you rock!</blink><br>
10
- </div>
11
- <small>Our integration tests like you.</small>
12
- </td>
13
- </tr>
14
- </table>
data/test/stub/zsfa/zsfa.png DELETED
Binary file