passenger 4.0.31 → 4.0.32

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 (14) hide show
  1. data.tar.gz.asc +7 -7
  2. data/NEWS +6 -0
  3. data/bin/passenger +4 -1
  4. data/bin/passenger-config +4 -1
  5. data/bin/passenger-install-apache2-module +4 -1
  6. data/bin/passenger-install-nginx-module +4 -1
  7. data/bin/passenger-memory-stats +4 -1
  8. data/bin/passenger-status +4 -1
  9. data/build/packaging.rb +3 -2
  10. data/ext/common/Constants.h +1 -1
  11. data/lib/phusion_passenger.rb +1 -1
  12. data/lib/phusion_passenger/loader_shared_helpers.rb +14 -9
  13. metadata +2 -2
  14. metadata.gz.asc +7 -7
data.tar.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
- iQEcBAABAgAGBQJSxKiOAAoJECrHRaUKISqMerYH/iVcRRuAKssMiGFLbLIk3UwW
6
- CXa/+ccArp4JBe6Zzo1SWh41LtE6WDO3seaFje7N1oSsaU7FVhEHLp7yFWHrLF0V
7
- CgT0yi2gKcig57L7r4hkT5SP0O1vrmPXlkmSDbRgd/ZkrMmjU75OusNUWimXFSVe
8
- mlBAPhk6ysJKsmBFr4dfhWFfO6NwXLE7WxniISBQUK5oEfWW8jcPN6+/zMUepkhj
9
- AAxbkOV0qA+QIXCH3h8XBiG6piADmIJYLo2P17tV9RnJY6auoix1lBX/qyYTJWPd
10
- 33wk4zNBol06CCk1CCr1qvEoK8F9sO4yVUc1yVe30N80NNWvLzaVCMcv8gNxjmA=
11
- =WFaL
5
+ iQEcBAABAgAGBQJSxVTrAAoJECrHRaUKISqM8wwH/j0P0Yff1jjVUyBqR1CVel7s
6
+ lmb4rHr0L0tUZrjcjfvaS6/NjX7VLNzYbFQkHeC5BaldSKo1CKiXjjGhGdJlIj13
7
+ feihJJVEf84r3EAFbt54Ye18CFAYMpGPeOGfjUtex8KidSLtPR5tv+uUpgSH4Sgr
8
+ +icjINLTbyrWL828/nA3Hd4YWTY3w1HbSokVVaVqPgn4lZlOZArLqykNXqzJ6FLe
9
+ +wvWGyIBGnqPPsHgzAYRHK0G86wjheD//Vs+7EcEVRLu08I852XHeCBQh8er9pf2
10
+ gU5R85a1u3/+BaDum1eAobYyliwsg1h+aC+QhLMUSbWE8OmpqhjDI6pymdZG5Zk=
11
+ =GfIW
12
12
  -----END PGP SIGNATURE-----
data/NEWS CHANGED
@@ -1,3 +1,9 @@
1
+ Release 4.0.32
2
+ --------------
3
+
4
+ * Fixed compatibility problems with old Ruby versions that didn't include RubyGems.
5
+
6
+
1
7
  Release 4.0.31
2
8
  --------------
3
9
 
data/bin/passenger CHANGED
@@ -25,7 +25,10 @@
25
25
  ## Magic comment: begin bootstrap ##
26
26
  source_root = File.expand_path("..", File.dirname(__FILE__))
27
27
  $LOAD_PATH.unshift("#{source_root}/lib")
28
- require 'rubygems' rescue nil
28
+ begin
29
+ require 'rubygems'
30
+ rescue LoadError
31
+ end
29
32
  require 'phusion_passenger'
30
33
  ## Magic comment: end bootstrap ##
31
34
 
data/bin/passenger-config CHANGED
@@ -25,7 +25,10 @@
25
25
  ## Magic comment: begin bootstrap ##
26
26
  source_root = File.expand_path("..", File.dirname(__FILE__))
27
27
  $LOAD_PATH.unshift("#{source_root}/lib")
28
- require 'rubygems' rescue nil
28
+ begin
29
+ require 'rubygems'
30
+ rescue LoadError
31
+ end
29
32
  require 'phusion_passenger'
30
33
  ## Magic comment: end bootstrap ##
31
34
 
data/bin/passenger-install-apache2-module CHANGED
@@ -25,7 +25,10 @@
25
25
  ## Magic comment: begin bootstrap ##
26
26
  source_root = File.expand_path("..", File.dirname(__FILE__))
27
27
  $LOAD_PATH.unshift("#{source_root}/lib")
28
- require 'rubygems' rescue nil
28
+ begin
29
+ require 'rubygems'
30
+ rescue LoadError
31
+ end
29
32
  require 'phusion_passenger'
30
33
  ## Magic comment: end bootstrap ##
31
34
 
data/bin/passenger-install-nginx-module CHANGED
@@ -25,7 +25,10 @@
25
25
  ## Magic comment: begin bootstrap ##
26
26
  source_root = File.expand_path("..", File.dirname(__FILE__))
27
27
  $LOAD_PATH.unshift("#{source_root}/lib")
28
- require 'rubygems' rescue nil
28
+ begin
29
+ require 'rubygems'
30
+ rescue LoadError
31
+ end
29
32
  require 'phusion_passenger'
30
33
  ## Magic comment: end bootstrap ##
31
34
 
data/bin/passenger-memory-stats CHANGED
@@ -25,7 +25,10 @@
25
25
  ## Magic comment: begin bootstrap ##
26
26
  source_root = File.expand_path("..", File.dirname(__FILE__))
27
27
  $LOAD_PATH.unshift("#{source_root}/lib")
28
- require 'rubygems' rescue nil
28
+ begin
29
+ require 'rubygems'
30
+ rescue LoadError
31
+ end
29
32
  require 'phusion_passenger'
30
33
  ## Magic comment: end bootstrap ##
31
34
 
data/bin/passenger-status CHANGED
@@ -25,7 +25,10 @@
25
25
  ## Magic comment: begin bootstrap ##
26
26
  source_root = File.expand_path("..", File.dirname(__FILE__))
27
27
  $LOAD_PATH.unshift("#{source_root}/lib")
28
- require 'rubygems' rescue nil
28
+ begin
29
+ require 'rubygems'
30
+ rescue LoadError
31
+ end
29
32
  require 'phusion_passenger'
30
33
  ## Magic comment: end bootstrap ##
31
34
 
data/build/packaging.rb CHANGED
@@ -190,8 +190,9 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
190
190
  "--output /dev/stderr --write-out '%{http_code}' --silent " +
191
191
  "https://www.phusionpassenger.com/enterprise_gems/upload"
192
192
  puts command
193
- if `#{command}` != "200\n"
194
- abort "Gem upload failed"
193
+ result = `#{command}`
194
+ if result != "200"
195
+ abort "Gem upload failed. HTTP status code: #{result.inspect}"
195
196
  else
196
197
  # The response body does not contain a newline,
197
198
  # so fix terminal output.
data/ext/common/Constants.h CHANGED
@@ -86,7 +86,7 @@
86
86
 
87
87
  #define NGINX_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
88
88
 
89
- #define PASSENGER_VERSION "4.0.31"
89
+ #define PASSENGER_VERSION "4.0.32"
90
90
 
91
91
  #define POOL_HELPER_THREAD_STACK_SIZE 262144
92
92
 
data/lib/phusion_passenger.rb CHANGED
@@ -30,7 +30,7 @@ module PhusionPassenger
30
30
 
31
31
  PACKAGE_NAME = 'passenger'
32
32
  # Run 'rake ext/common/Constants.h' after changing this number.
33
- VERSION_STRING = '4.0.31'
33
+ VERSION_STRING = '4.0.32'
34
34
 
35
35
  PREFERRED_NGINX_VERSION = '1.4.4'
36
36
  NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'
data/lib/phusion_passenger/loader_shared_helpers.rb CHANGED
@@ -101,17 +101,22 @@ module LoaderSharedHelpers
101
101
  f.puts "#{key} = #{value}"
102
102
  end
103
103
  end
104
- require 'rubygems' if !defined?(Gem)
105
- File.open("#{dir}/ruby_info", "a") do |f|
106
- f.puts "RubyGems version = #{Gem::VERSION}"
104
+ begin
105
+ require 'rubygems' if !defined?(Gem)
106
+ rescue LoadError
107
107
  end
108
- File.open("#{dir}/activated_gems", "wb") do |f|
109
- if Gem.respond_to?(:loaded_specs)
110
- Gem.loaded_specs.each_pair do |name, spec|
111
- f.puts "#{name} => #{spec.version}"
108
+ if defined?(Gem)
109
+ File.open("#{dir}/ruby_info", "a") do |f|
110
+ f.puts "RubyGems version = #{Gem::VERSION}"
111
+ end
112
+ File.open("#{dir}/activated_gems", "wb") do |f|
113
+ if Gem.respond_to?(:loaded_specs)
114
+ Gem.loaded_specs.each_pair do |name, spec|
115
+ f.puts "#{name} => #{spec.version}"
116
+ end
117
+ else
118
+ f.puts "Unable to query this information; incompatible RubyGems API."
112
119
  end
113
- else
114
- f.puts "Unable to query this information; incompatible RubyGems API."
115
120
  end
116
121
  end
117
122
  end
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.31
4
+ version: 4.0.32
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: 2014-01-01 00:00:00.000000000 Z
12
+ date: 2014-01-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
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
- iQEcBAABAgAGBQJSxKiOAAoJECrHRaUKISqMkDQIALlSDaBn8gk+2DEMoio84Jjq
6
- Wb3UF1/TDMF57rg6pgloa1oJL0ACCoqd3EkVWBlhC9MXaCZkGwKj6AFSKD1qsjkV
7
- Xz1ywyOaSryyYTgiFp2JfNh2YOOkIQETRfu2ZBQErE3Zlc1ATpUYRDyr5gQxsTbL
8
- p99Qb0pGymppHM/et74tKz57DCRiBtwHAaoKxRCeIyHXOokgkWTbM8hyscII51l7
9
- WMpSraIqv1LE8lFvrGMABFIwykYabsP1MpckOMgFpwSGlOfKo6luowRGdDGVPGZW
10
- 7DwawHPWTOnxF5A0BBrPM6TH61eQhlor2MJ1sI35emRXnRQAC09XCJEkQndwYmQ=
11
- =fqBy
5
+ iQEcBAABAgAGBQJSxVTrAAoJECrHRaUKISqMeGgH/iBjRNu8fcUM1LTZTcK5xEcZ
6
+ tjCQk/ChS/Y71UKB7QJdG/THQp3cc0O0QxDDbmjLbi6BvRSewZ4/4CagvQguQnQN
7
+ IOh3Ox4j/CIX5OSjQt+FaNzyhV6F1e0Iqy/+bmJ/4jNJRCpoVw+Zy8BYsNn5TYmu
8
+ qy1ueWoB+T42gBOQD31QBdxTqJY1v3+n2wjpy1rQB3tAmKHrey2xGWPgAznHL5mY
9
+ n8FHjj8ESsRJkTdpI8LNdPOFuUfq4HF2U3XG7BUa/rpIskKj4aK5NQszJhpWQKul
10
+ YZsXnDjY40CCGfNeHhKNQgebeAcrH+mX8Q1oh43hLm7jrBUqPWZaJONf02DdIIE=
11
+ =DfHY
12
12
  -----END PGP SIGNATURE-----