passenger 4.0.31 → 4.0.32

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSxKiOAAoJECrHRaUKISqMerYH/iVcRRuAKssMiGFLbLIk3UwW
-CXa/+ccArp4JBe6Zzo1SWh41LtE6WDO3seaFje7N1oSsaU7FVhEHLp7yFWHrLF0V
-CgT0yi2gKcig57L7r4hkT5SP0O1vrmPXlkmSDbRgd/ZkrMmjU75OusNUWimXFSVe
-mlBAPhk6ysJKsmBFr4dfhWFfO6NwXLE7WxniISBQUK5oEfWW8jcPN6+/zMUepkhj
-AAxbkOV0qA+QIXCH3h8XBiG6piADmIJYLo2P17tV9RnJY6auoix1lBX/qyYTJWPd
-33wk4zNBol06CCk1CCr1qvEoK8F9sO4yVUc1yVe30N80NNWvLzaVCMcv8gNxjmA=
-=WFaL
+iQEcBAABAgAGBQJSxVTrAAoJECrHRaUKISqM8wwH/j0P0Yff1jjVUyBqR1CVel7s
+lmb4rHr0L0tUZrjcjfvaS6/NjX7VLNzYbFQkHeC5BaldSKo1CKiXjjGhGdJlIj13
+feihJJVEf84r3EAFbt54Ye18CFAYMpGPeOGfjUtex8KidSLtPR5tv+uUpgSH4Sgr
++icjINLTbyrWL828/nA3Hd4YWTY3w1HbSokVVaVqPgn4lZlOZArLqykNXqzJ6FLe
++wvWGyIBGnqPPsHgzAYRHK0G86wjheD//Vs+7EcEVRLu08I852XHeCBQh8er9pf2
+gU5R85a1u3/+BaDum1eAobYyliwsg1h+aC+QhLMUSbWE8OmpqhjDI6pymdZG5Zk=
+=GfIW
 -----END PGP SIGNATURE-----

data/NEWS

@@ -1,3 +1,9 @@
+Release 4.0.32
+--------------
+
+ * Fixed compatibility problems with old Ruby versions that didn't include RubyGems.
+
+
 Release 4.0.31
 --------------
 

data/bin/passenger

@@ -25,7 +25,10 @@
 ## Magic comment: begin bootstrap ##
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
-require 'rubygems' rescue nil
+begin
+	require 'rubygems'
+rescue LoadError
+end
 require 'phusion_passenger'
 ## Magic comment: end bootstrap ##
 

data/bin/passenger-config

@@ -25,7 +25,10 @@
 ## Magic comment: begin bootstrap ##
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
-require 'rubygems' rescue nil
+begin
+	require 'rubygems'
+rescue LoadError
+end
 require 'phusion_passenger'
 ## Magic comment: end bootstrap ##
 

data/bin/passenger-install-apache2-module

@@ -25,7 +25,10 @@
 ## Magic comment: begin bootstrap ##
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
-require 'rubygems' rescue nil
+begin
+	require 'rubygems'
+rescue LoadError
+end
 require 'phusion_passenger'
 ## Magic comment: end bootstrap ##
 

data/bin/passenger-install-nginx-module

@@ -25,7 +25,10 @@
 ## Magic comment: begin bootstrap ##
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
-require 'rubygems' rescue nil
+begin
+	require 'rubygems'
+rescue LoadError
+end
 require 'phusion_passenger'
 ## Magic comment: end bootstrap ##
 

data/bin/passenger-memory-stats

@@ -25,7 +25,10 @@
 ## Magic comment: begin bootstrap ##
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
-require 'rubygems' rescue nil
+begin
+	require 'rubygems'
+rescue LoadError
+end
 require 'phusion_passenger'
 ## Magic comment: end bootstrap ##
 

data/bin/passenger-status

@@ -25,7 +25,10 @@
 ## Magic comment: begin bootstrap ##
 source_root = File.expand_path("..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
-require 'rubygems' rescue nil
+begin
+	require 'rubygems'
+rescue LoadError
+end
 require 'phusion_passenger'
 ## Magic comment: end bootstrap ##
 

data/build/packaging.rb

@@ -190,8 +190,9 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
 				"--output /dev/stderr --write-out '%{http_code}' --silent " +
 				"https://www.phusionpassenger.com/enterprise_gems/upload"
 			puts command
-			if `#{command}` != "200\n"
-				abort "Gem upload failed"
+			result = `#{command}`
+			if result != "200"
+				abort "Gem upload failed. HTTP status code: #{result.inspect}"
 			else
 				# The response body does not contain a newline,
 				# so fix terminal output.

data/ext/common/Constants.h

@@ -86,7 +86,7 @@
 
 	#define NGINX_DOC_URL "http://www.modrails.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "4.0.31"
+	#define PASSENGER_VERSION "4.0.32"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/lib/phusion_passenger.rb

@@ -30,7 +30,7 @@ module PhusionPassenger
 	
 	PACKAGE_NAME = 'passenger'
 	# Run 'rake ext/common/Constants.h' after changing this number.
-	VERSION_STRING = '4.0.31'
+	VERSION_STRING = '4.0.32'
 	
 	PREFERRED_NGINX_VERSION = '1.4.4'
 	NGINX_SHA256_CHECKSUM = '7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'

data/lib/phusion_passenger/loader_shared_helpers.rb

@@ -101,17 +101,22 @@ module LoaderSharedHelpers
 					f.puts "#{key} = #{value}"
 				end
 			end
-			require 'rubygems' if !defined?(Gem)
-			File.open("#{dir}/ruby_info", "a") do |f|
-				f.puts "RubyGems version = #{Gem::VERSION}"
+			begin
+				require 'rubygems' if !defined?(Gem)
+			rescue LoadError
 			end
-			File.open("#{dir}/activated_gems", "wb") do |f|
-				if Gem.respond_to?(:loaded_specs)
-					Gem.loaded_specs.each_pair do |name, spec|
-						f.puts "#{name} => #{spec.version}"
+			if defined?(Gem)
+				File.open("#{dir}/ruby_info", "a") do |f|
+					f.puts "RubyGems version = #{Gem::VERSION}"
+				end
+				File.open("#{dir}/activated_gems", "wb") do |f|
+					if Gem.respond_to?(:loaded_specs)
+						Gem.loaded_specs.each_pair do |name, spec|
+							f.puts "#{name} => #{spec.version}"
+						end
+					else
+						f.puts "Unable to query this information; incompatible RubyGems API."
 					end
-				else
-					f.puts "Unable to query this information; incompatible RubyGems API."
 				end
 			end
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.31
+  version: 4.0.32
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-01 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJSxKiOAAoJECrHRaUKISqMkDQIALlSDaBn8gk+2DEMoio84Jjq
-Wb3UF1/TDMF57rg6pgloa1oJL0ACCoqd3EkVWBlhC9MXaCZkGwKj6AFSKD1qsjkV
-Xz1ywyOaSryyYTgiFp2JfNh2YOOkIQETRfu2ZBQErE3Zlc1ATpUYRDyr5gQxsTbL
-p99Qb0pGymppHM/et74tKz57DCRiBtwHAaoKxRCeIyHXOokgkWTbM8hyscII51l7
-WMpSraIqv1LE8lFvrGMABFIwykYabsP1MpckOMgFpwSGlOfKo6luowRGdDGVPGZW
-7DwawHPWTOnxF5A0BBrPM6TH61eQhlor2MJ1sI35emRXnRQAC09XCJEkQndwYmQ=
-=fqBy
+iQEcBAABAgAGBQJSxVTrAAoJECrHRaUKISqMeGgH/iBjRNu8fcUM1LTZTcK5xEcZ
+tjCQk/ChS/Y71UKB7QJdG/THQp3cc0O0QxDDbmjLbi6BvRSewZ4/4CagvQguQnQN
+IOh3Ox4j/CIX5OSjQt+FaNzyhV6F1e0Iqy/+bmJ/4jNJRCpoVw+Zy8BYsNn5TYmu
+qy1ueWoB+T42gBOQD31QBdxTqJY1v3+n2wjpy1rQB3tAmKHrey2xGWPgAznHL5mY
+n8FHjj8ESsRJkTdpI8LNdPOFuUfq4HF2U3XG7BUa/rpIskKj4aK5NQszJhpWQKul
+YZsXnDjY40CCGfNeHhKNQgebeAcrH+mX8Q1oh43hLm7jrBUqPWZaJONf02DdIIE=
+=DfHY
 -----END PGP SIGNATURE-----