passenger 4.0.43 → 4.0.44

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWY0MDg5NjYxOTVmODI3N2RhNTFlZjlhMTc0NWFhN2U4N2FjYWUwOQ==
+    YjE0MmI0OTJkOTRiYTA1NDYyNmJmNjM2NzFlOTMxZTBmM2QxYzU3ZA==
   data.tar.gz: !binary |-
-    MDVkZTY5YmIzZWEwZDk5Y2E1ODlhNTQ1YWVlZWE5NDI4ZDJmN2EzNA==
+    YzUzNGUzNDNjMDQ4YmM5YWEyNDIxZmU0MGZhODA0MTI0YzA3M2I5MA==
 SHA512:
   metadata.gz: !binary |-
-    M2FiMWE4OWRmZTJjZmY2YmMwZmE1ZjFkYzk2YTM4ZDhiOGFmNzlhNmI5YzAx
-    MGU1YWVlY2IwYmFhNGE0MzQ1Y2ExMWIzOWQ1NzFkZDc5MTQ0NzE4NzQ0ZjY0
-    Y2U2ZmFiOTVlOWIwYzUyZDU2NzFiMGU0MGQ2MmIwOGRmNTY0NWY=
+    NTExZDgyNzE2OGQxMDVhNWY4Yzc1NGQ0NjRhMTllOTRhYWQ0NjY4ZjIxMDI3
+    ZjAyZDE0MzgwNmQzN2IwMDU5OTdkNzcwN2Y0ZDc2ZGFhZTM1YTkwOTBlZjZl
+    NjFjMTIxM2U5MWMzMWM2Y2ViZjIyNDY3ODkwY2MzMTNjMGZmYTU=
   data.tar.gz: !binary |-
-    MGQ4OTUwZjA1MGU4OWU3YjU4YmZjYjYwZmZhNDlmMmE2YzRhNzk0OWRkOTlj
-    NjlkZjU1MTBkNGFmNzc1NTdmNmU0MTQxODFmMzU4ZmRkNDAyNzQ3NDNiZGZk
-    ZjZhNjQ1Mjk2NzFkN2UwZDBlNjM3ZmJmM2Q1MWYzYjE5NGM2NTM=
+    ZDE2NzdlOGQyZGY5NjE5ZmEyMGY0OTQ2OGRjZDllMDNlZjQ4MzMwMzEyY2Rh
+    ODI4ODFlNTNhNDYzYzZkODI5Yjc1ZTdjNzA2MDAxZWYyMzE2ZGZkOTk1M2Y2
+    OTFmZDQ0NzFmMzMzNWQwNjdkNWFhNjlkMjE3MTMyNWY3ODA1ZjU=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJThfVWAAoJECrHRaUKISqM6JcIAItnZwCnNA1rlB+ok8htu4bv
-ZihNlJWmnzihxH7ZAD7qt02XegS63gcjGQ/Y2hxDBbKXaQ6WnqBtmAcOxT3T7YYy
-MeaeLTLcXn7LJvGrrJm1CNWnUpce3zPVecRvuyGBD2yYEpdmtnBS1Mb9j8unZ5cs
-S/WGpIw9rkntrisM8g/dFMJgsJ51LPTkZzb9QkpWG8GfBG7b/Rpzyz3W7f92YSnZ
-feWN3tvFo8UB+CeUCN6XOS0VcGCsKdVJSb5D837AGtymrRhSJ9nJvcz1uQZJX48U
-WEW76te2BwzDchBn1RgvJirLVjx5t2jfC9UWNcLcnopxlzjniRozySdrNDDLQWc=
-=I4xQ
+iQEcBAABAgAGBQJThyRmAAoJECrHRaUKISqMHS4H/2z5ltAxui7WJ5E/13DDIR2T
+BLxFDixTzjGIgyA6WONunPQJQsR4JG7dIyUGm5cZAo0AlmJ8ptuClIVv3Q9JCP2g
+YQeaYR2bc0ahrjxzOnCdysA/PKHlkQMDAdmKvPGE+qN8CJBwk1/jTtW/CYrG0Zi5
+xDVvww0z1DnhQlKPRyu8a9R3r4ZTZdixZmbZneE0NGlRFcQbQPWlmp0Q0gh3TsYY
+rkvYEQxhQWsjUf0g7Id0tLxpnh7N/go6vWnC6EAXWVJe+T0V4U98vBk8sG/84A64
+O/4nbys5SiNGo2ampAgXn2Ol6r3jblJ9nhVXuU4YLMksKOGOif0WxOsMGEvlVAw=
+=+CYd
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJThfVWAAoJECrHRaUKISqMAJsIAKvyWvcg58WQGdss/ZSDAFw5
-fgb4b8YAZyCJuwhOya+Rb4cR5QJ2Yz8o/PqJ4yfqU+hkRJcBCsvW/OPkFr/IDIDW
-ep74AyiQcL7gXxoyZtK1vSKefuCN0RTguXY9sYzZB7VwJ1UDykMB+fqcO8kTQy48
-e9mBiwNHY+GHFLULyJN3hsNiwgzxx9yNMSHtt2TE8I9aK5aFSXOOG7boyI8jseRr
-kI3NXj4HI6hH6c4klf0nPj+9BLVUI77MGQ/0OiOjrdkTxNdM7fJkgy1b/+p5gT+P
-gjsHpxdGR76ppHnW6LpyiBfMLEPpniq/Dx/I037cwqLltw+qJeBawgbXE8Yr9iM=
-=/Ohk
+iQEcBAABAgAGBQJThyRmAAoJECrHRaUKISqM2Q0H/1T5KZVf5LIddFcIOCSRo6ww
+FmLU9oQ3zJVtWwn8BFItGOzF1UXd5e4Lnlrf0Jje6YovQagiTzkAeR8R3sALQEmC
+MZux3X80nW4IalyNiM6DBVEIebh0h/MGAbAsr0NrxfcKtBNqdW1oZpP3xQhpGdyd
+CFIPQOeU3RCSTjZqK2aeTXZDYzVoJ7eDuM47+nHQLItfsUGJxkVEcZsIv1wmvqk5
+FGpUQD03NY58QjpevoTVvM9DE0JS5SMp+iNup2FpjhLimBtG6hENY9dMmYHRCgBj
+R1R8ZpbdOvNeiqaHFR03K1xtIE9aAeDjWefFzDk1D7ySVAqCMD6mbL8BiIVTsUA=
+=SFYQ
 -----END PGP SIGNATURE-----

data/CHANGELOG

@@ -1,3 +1,15 @@
+Release 4.0.44
+--------------
+
+ * The issue tracker has now been moved from Google Code to Github.
+   Before version 4.0.44 (May 29 2014, commit 3dd0964c9f4), all
+   issue numbers referred to Google Code. From now on, all issue
+   numbers will refer to Github Issues.
+ * Fixed compilation problems on OS X Lion and OS X Mountain Lion.
+ * On Ruby, fixed `nil` being frozen on accident in some cases.
+   See issue #1192.
+
+
 Release 4.0.43
 --------------
 

data/build/misc.rb

@@ -95,7 +95,7 @@ task :changelog_as_html do
 			
 			# Auto-link to issue tracker.
 			text.gsub!(/(bug|issue) #(\d+)/i) do
-				url = "http://code.google.com/p/phusion-passenger/issues/detail?id=#{$2}"
+				url = "https://github.com/phusion/passenger/issues/#{$2}"
 				%Q(<{a href="#{url}"}>#{$1} ##{$2}<{/a}>)
 			end
 			
@@ -118,7 +118,7 @@ task :changelog_as_markdown do
 
 	# Auto-link to issue tracker.
 	contents.gsub!(/(bug|issue) #(\d+)/i) do
-		url = "http://code.google.com/p/phusion-passenger/issues/detail?id=#{$2}"
+		url = "https://github.com/phusion/passenger/issues/#{$2}"
 		%Q([#{$1} ##{$2}](#{url}))
 	end
 

data/doc/users_guide_snippets/installation.txt

@@ -921,16 +921,19 @@ configuration directives from your web server configuration file(s). After you'v
 done this, you need to remove the Phusion Passenger files.
 endif::[]
 
+- If you installed Phusion Passenger through Homebrew, then run `brew uninstall passenger`.
+ifdef::apache[]
+Then run `rm -f /etc/apache2/other/passenger.conf`.
+endif::[]
 - If you installed Phusion Passenger via a Ruby gem, then run `gem uninstall passenger` (or, if you're a link:https://www.phusionpassenger.com/enterprise[Phusion Passenger Enterprise] user, `gem uninstall passenger-enterprise-server`).
   You <<is_ruby_home_or_system_wide_installed,might have to run this as root>>.
 - If you installed Phusion Passenger via a source tarball, then remove the directory
   in which you placed the extracted Phusion Passenger files. This directory is the
   same as the one pointed to the by `PassengerRoot`/`passenger_root` configuration directive.
 - If you installed Phusion Passenger through APT or YUM, then use them to uninstall Phusion Passenger.
-- If you installed Phusion Passenger through Homebrew, then run `brew uninstall passenger`.
 
 ifdef::nginx[]
-Nginx does not have to be recompiled. Altough it contains Phusion Passenger code, it will not do anything when all Phusion Passenger configuration directives are removed.
+Nginx does not have to be recompiled after uninstalling Phusion Passenger. Altough Nginx will contain the Phusion Passenger Nginx module, the module will not do anything when all Phusion Passenger configuration directives are removed.
 endif::[]
 
 

data/doc/users_guide_snippets/support_information.txt

@@ -43,7 +43,7 @@ Supported languages and frameworks:
 |==================================================
 
 If you run into any issues, please
-link:http://code.google.com/p/phusion-passenger/issues/list[report a bug]
+link:https://github.com/phusion/passenger/issues[report a bug]
 or
 link:http://groups.google.com/group/phusion-passenger[join our discussion forum].
 

data/doc/users_guide_snippets/where_to_get_support.txt

@@ -1,6 +1,6 @@
 * link:http://groups.google.com/group/phusion-passenger[Community discussion forum] - post a
   message here if you're experiencing problems. Support on this forum is provided by the community on a best-effort basis, so a (timely) response is not guaranteed.
-* link:http://code.google.com/p/phusion-passenger/issues/list[Issue tracker] - report
+* link:https://github.com/phusion/passenger/issues[Issue tracker] - report
   bugs here.
 * Email support@phusion.nl if you are a link:https://www.phusionpassenger.com/enterprise[Phusion Passenger Enterprise] customer. Please mention your order reference. If you are not an Enterprise customer, we kindly redirect you to the community discussion forum instead.
 * link:https://www.phusionpassenger.com/commercial_support[Commercial support contracts] are also available.

data/ext/common/Constants.h

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

data/ext/common/Utils/SystemMetricsCollector.h

@@ -52,6 +52,7 @@
 	#include <mach/mach.h>
 	#include <sys/sysctl.h>
 	#include <sys/time.h>
+	#include <Availability.h>
 #endif
 #ifdef __FreeBSD__
 	#include <sys/param.h>
@@ -1150,8 +1151,11 @@ private:
 			status = host_statistics64(hostPort, HOST_VM_INFO64, (host_info64_t) &vmStat,
 				&count);
 			if (status == KERN_SUCCESS) {
-				metrics.ramUsed = ((ssize_t) vmStat.active_count + vmStat.wire_count +
-					vmStat.compressor_page_count) * pageSize / 1024;
+				metrics.ramUsed = ((ssize_t) vmStat.active_count + vmStat.wire_count);
+				#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+					metrics.ramUsed += vmStat.compressor_page_count;
+				#endif
+				metrics.ramUsed = metrics.ramUsed * (pageSize / 1024);
 			} else {
 				metrics.ramUsed = -1;
 			}

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.43'
+	VERSION_STRING = '4.0.44'
 	
 	PREFERRED_NGINX_VERSION = '1.6.0'
 	NGINX_SHA256_CHECKSUM = '943ad757a1c3e8b3df2d5c4ddacc508861922e36fa10ea6f8e3a348fc9abfc1a'
@@ -105,10 +105,14 @@ module PhusionPassenger
 			
 			@natively_packaged = get_bool_option(filename, options, 'natively_packaged')
 			REQUIRED_LOCATIONS_INI_FIELDS.each do |field|
-				instance_variable_set("@#{field}", get_option(filename, options, field.to_s).freeze)
+				value = get_option(filename, options, field.to_s)
+				value.freeze unless value.nil?
+				instance_variable_set("@#{field}", value)
 			end
 			OPTIONAL_LOCATIONS_INI_FIELDS.each do |field|
-				instance_variable_set("@#{field}", get_option(filename, options, field.to_s, false).freeze)
+				value = get_option(filename, options, field.to_s, false)
+				value.freeze unless value.nil?
+				instance_variable_set("@#{field}", value)
 			end
 			if natively_packaged?
 				@native_packaging_method = get_option(filename, options, 'native_packaging_method')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.43
+  version: 4.0.44
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,7 +150,6 @@ files:
 - doc/Users guide Standalone.txt
 - doc/Users guide.html
 - doc/Users guide.txt
-- doc/definitions.h
 - doc/images/by_sa.png
 - doc/images/direct_spawning.png
 - doc/images/direct_spawning.svg

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJThfVVAAoJECrHRaUKISqMxm4H/1VmXIAwP/ui3DZ77GF/lFD7
-Sx+4+kvHyWV7omZyqypxZ6v6rCtXLHb7iVeGq2nHYpPq1677XyPLMDWUUxWQ+4iX
-Duvlm1f0BWIAiNtVjT0qAGnvaEWHfY94AHgPNXrDm4uZVWgdc03C3WgSU9C+w9et
-49uT+AjSzDOTjlSvtUJIxXXRUAdaB+Rk2Jv+OeN6ppfRLDJrtrue1MbVsJsACdTr
-OZf0knUKURk6cPW8Kt09dvzM3U3qj+mXc4r6jPF6dbSK4xr9H8ZaqBiW1YSygEwM
-lwn4z09wODlcJdNo0l4JeeygYyNSmKv259shnMMt0oAf89892ZEJSCEnODxIjGM=
-=hyO5
+iQEcBAABAgAGBQJThyRmAAoJECrHRaUKISqMSB8IAIR8v8UA2iRIVjotf11sZu5K
+eJXVNxKmgRklkBoDQlglyYdjgEcH3WTxQIKzxFG2bHYYNmjkG5XUW4Tvzk29W0ox
+u1AkddCkO9b9q1dD982e7uHzgWIh7Qt1YRohLiOoJAWJARPINkRA0BgyxRVyxLsV
+EmDdGIpZyVhPZXMwwFDFQYTZmqsf2TrfzCvPa7zYZIqaH8/8vPmIdBP+/Ek+GQkL
+UKGvZsjvIEgCh3cEueVlQ3vggJyt9ADMuvZMuKpuoFU2sJ+cy8K60/pPC6RnogPd
+78ddmUT1UlzOAp0IjpseVlwC/pLG6Dbz+kKJbHPoMg+pL/qx1/GIYcCwYF8sCVg=
+=wwAY
 -----END PGP SIGNATURE-----

data/doc/definitions.h

@@ -1,5 +0,0 @@
-// Some definitions for Doxygen.
-/**
-@defgroup Core Core Apache-related classes and functions
-@defgroup Support Apache-independent support classes and function
-*/