phusion_passenger.rb in passenger-4.0.44

- old
+ new

@@ -28,11 +28,11 @@
 	
 	###### Names and version numbers ######
 	
 	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'
 
 	PREFERRED_PCRE_VERSION  = '8.34'
@@ -103,13 +103,17 @@
 			filename = root_or_file
 			options  = parse_ini_file(filename)
 			
 			@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')
 				ORIGINALLY_PACKAGED_LOCATIONS_INI_FIELDS.each do |field|
 					instance_variable_set("@#{field}", nil)