passenger 4.0.25 → 4.0.26

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of passenger might be problematic. Click here for more details.

Files changed (38) hide show
  1. data.tar.gz.asc +7 -7
  2. data/NEWS +11 -0
  3. data/build/packaging.rb +3 -3
  4. data/debian.template/passenger.install.template +1 -1
  5. data/debian.template/rules.template +2 -1
  6. data/doc/Users guide Apache.idmap.txt +5 -3
  7. data/doc/Users guide Apache.txt +22 -0
  8. data/doc/Users guide Nginx.txt +12 -12
  9. data/doc/Users guide Standalone.txt +10 -1
  10. data/ext/apache2/ConfigurationCommands.cpp +18 -0
  11. data/ext/apache2/ConfigurationFields.hpp +6 -0
  12. data/ext/apache2/ConfigurationSetters.cpp +27 -0
  13. data/ext/apache2/CreateDirConfig.cpp +3 -0
  14. data/ext/apache2/DirectoryMapper.h +15 -6
  15. data/ext/apache2/Hooks.cpp +34 -10
  16. data/ext/apache2/MergeDirConfig.cpp +21 -0
  17. data/ext/apache2/SetHeaders.cpp +4 -0
  18. data/ext/common/Constants.h +1 -1
  19. data/ext/common/Utils.cpp +0 -1
  20. data/ext/common/Utils/VariantMap.h +1 -1
  21. data/ext/common/agents/HelperAgent/AgentOptions.h +4 -0
  22. data/ext/common/agents/HelperAgent/Main.cpp +10 -3
  23. data/ext/nginx/ContentHandler.c +2 -7
  24. data/helper-scripts/download_binaries/extconf.rb +7 -5
  25. data/lib/phusion_passenger.rb +1 -1
  26. data/lib/phusion_passenger/abstract_installer.rb +7 -22
  27. data/lib/phusion_passenger/admin_tools/memory_stats.rb +1 -1
  28. data/lib/phusion_passenger/apache2/config_options.rb +20 -0
  29. data/lib/phusion_passenger/standalone/runtime_installer.rb +69 -49
  30. data/lib/phusion_passenger/standalone/runtime_locator.rb +3 -3
  31. data/lib/phusion_passenger/standalone/start_command.rb +13 -1
  32. data/lib/phusion_passenger/utils/download.rb +193 -0
  33. data/resources/templates/standalone/config.erb +20 -3
  34. data/test/ruby/standalone/runtime_installer_spec.rb +69 -69
  35. data/test/ruby/standalone/runtime_locator_spec.rb +3 -3
  36. metadata +3 -3
  37. metadata.gz.asc +7 -7
  38. data/resources/templates/standalone/welcome.txt.erb +0 -8
data/test/ruby/standalone/runtime_locator_spec.rb CHANGED
@@ -26,9 +26,9 @@ describe RuntimeLocator do
26
26
  def create_nginx(nginx_version)
27
27
  version = PhusionPassenger::VERSION_STRING
28
28
  cxx_compat_id = PlatformInfo.cxx_binary_compatibility_id
29
- nginx_dir = "#{@temp_dir}/#{version}/nginx-#{nginx_version}-#{cxx_compat_id}"
29
+ nginx_dir = "#{@temp_dir}/#{version}/webhelper-#{nginx_version}-#{cxx_compat_id}"
30
30
  FileUtils.mkdir_p(nginx_dir)
31
- @nginx_filename = "#{nginx_dir}/nginx"
31
+ @nginx_filename = "#{nginx_dir}/PassengerWebHelper"
32
32
  create_file(@nginx_filename)
33
33
  File.chmod(0755, @nginx_filename)
34
34
  end
@@ -166,7 +166,7 @@ describe RuntimeLocator do
166
166
  context "if no custom Nginx binary is specified in the Standalone config" do
167
167
  context "if the default Nginx version is requested" do
168
168
  it "returns the location of the packaged Nginx binary" do
169
- @locator.find_nginx_binary.should == "#{PhusionPassenger.lib_dir}/nginx"
169
+ @locator.find_nginx_binary.should == "#{PhusionPassenger.lib_dir}/PassengerWebHelper"
170
170
  end
171
171
  end
172
172
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: passenger
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.25
4
+ version: 4.0.26
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-11-19 00:00:00.000000000 Z
12
+ date: 2013-11-28 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
@@ -165,6 +165,7 @@ files:
165
165
  - lib/phusion_passenger/standalone/utils.rb
166
166
  - lib/phusion_passenger/standalone/version_command.rb
167
167
  - lib/phusion_passenger/utils/ansi_colors.rb
168
+ - lib/phusion_passenger/utils/download.rb
168
169
  - lib/phusion_passenger/utils/file_system_watcher.rb
169
170
  - lib/phusion_passenger/utils/hosts_file_parser.rb
170
171
  - lib/phusion_passenger/utils/json.rb
@@ -2423,7 +2424,6 @@ files:
2423
2424
  - resources/templates/standalone/download_tool_missing.txt.erb
2424
2425
  - resources/templates/standalone/possible_solutions_for_download_and_extraction_problems.txt.erb
2425
2426
  - resources/templates/standalone/run_installer_as_root.txt.erb
2426
- - resources/templates/standalone/welcome.txt.erb
2427
2427
  - resources/templates/undisclosed_error.html.template
2428
2428
  - resources/union_station_gateway.crt
2429
2429
  - test/.rspec
metadata.gz.asc CHANGED
@@ -2,11 +2,11 @@
2
2
  Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
3
3
  Comment: GPGTools - http://gpgtools.org
4
4
 
5
- iQEcBAABAgAGBQJSi8RJAAoJECrHRaUKISqMj44IAKnWeRi84E9hLRSt9NRodG7p
6
- GURP17hpIVDD3A7tXLvO6wQD1gIeTvcrY1GbEdFlnFqZxSln0w9tOZUyQ1b1UcNf
7
- cUYWgKTgLGN4HxwYH4NM+eMytsAaIyrtmSLfSwp6y/QpQkcK+iZtjhA+VxcKY8uv
8
- G220agtA4Bxiuu02C7/uIsK+J+byw0s1xXbwe+KWzGj+5vePFL2tnkQBTDoYImgU
9
- 6johpD5HedqdiwS6ncf9fKd9ZZNWmUct7IK7agdbXwVY8TTqkeAe3A0oxBaiSwJj
10
- u0qC91C8Oip2K35IknG18UxrO8hgJ7In2KUqkJaoIUajXM8xBlRQI3rsSt4iIZU=
11
- =nCXi
5
+ iQEcBAABAgAGBQJSlyZAAAoJECrHRaUKISqMzmAIAKh3MngqbrFZ+mTHye4dMU9r
6
+ 3lIBO9lZSnqR+bM0PkhCwQBhDerzw6nt0u2jovzLRpvEtpayjxNgrbYlYwBqV2CX
7
+ sbKzRIU/RW9qT+lJIzeNc8H+0xR6OJXWOOZb4tTgm8KYPG1yX0RO/wKXFhNCG+rF
8
+ Eo7AwFghaq7bIeBYPPb/bUsh7bRbYzoTkXvktTG3eY37e0js94i6H17mrA6VJB7h
9
+ oviBXFclSrv6DkX8Z+VqUeS6PZnYBwKTJLG5GkF5cEvaHbkWr+enjsJ17cNkQKZ8
10
+ dsk5oBakxI3f0Ef3J7qcQvX5QdQadRpNWRuK0txL5UAwTXKgdFc1OL0QN0nF368=
11
+ =ozSM
12
12
  -----END PGP SIGNATURE-----
data/resources/templates/standalone/welcome.txt.erb DELETED
@@ -1,8 +0,0 @@
1
- <banner>Nginx core <%= @version %> isn't installed</banner>
2
-
3
- Phusion Passenger Standalone will automatically install it into:
4
-
5
- <b><%= @dir %></b>
6
-
7
- This will only be done once. Please sit back and relax while installation is
8
- in progress.