passenger 2.2.13 → 2.2.14

data/NEWS

@@ -1,3 +1,14 @@
+Release 2.2.14
+--------------
+
+ * Added support for Rubinius
+   Patch contributed by Evan Phoenix.
+ * Fixed a mistake in the SIGQUIT backtrace message.
+   Patch contributed by Christoffer Sawicki.
+ * [Nginx] Fix a localtime() crash on FreeBSD
+   This was caused by insufficient stack space for threads. Issue #499.
+
+
 Release 2.2.13
 --------------
 

data/doc/Users guide Apache.html

@@ -3749,7 +3749,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-06-01 18:33:18 CEST
+Last updated 2010-06-04 12:07:24 CEST
 </div>
 </div>
 </body>

data/doc/Users guide Nginx.html

@@ -2427,7 +2427,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-06-01 18:33:18 CEST
+Last updated 2010-06-04 12:07:24 CEST
 </div>
 </div>
 </body>

data/ext/common/Version.h

@@ -26,6 +26,6 @@
 #define _PASSENGER_VERSION_H_
 
 /* Don't forget to update lib/phusion_passenger/constants.rb too. */
-#define PASSENGER_VERSION "2.2.13"
+#define PASSENGER_VERSION "2.2.14"
 
 #endif /* _PASSENGER_VERSION_H */

data/ext/nginx/HelperServer.cpp

@@ -139,7 +139,13 @@ struct ClientDisconnectedException { };
 class Client {
 private:
 	/** The client thread stack size in bytes. */
-	static const int CLIENT_THREAD_STACK_SIZE = 1024 * 64;
+	static const int CLIENT_THREAD_STACK_SIZE =
+		#ifdef __FreeBSD__
+			// localtime() on FreeBSD needs some more stack space.
+			1024 * 96;
+		#else
+			1024 * 64;
+		#endif
 	
 	/** The client number for this Client object, assigned by Server. */
 	unsigned int number;

data/lib/phusion_passenger/abstract_request_handler.rb

@@ -338,7 +338,8 @@ private
 					output << "# Thread: #{thread.inspect}, "
 					if thread == Thread.main
 						output << "[main thread], "
-					else
+					end
+					if thread == Thread.current
 						output << "[current thread], "
 					end
 					output << "alive = #{thread.alive?}\n"

data/lib/phusion_passenger/constants.rb

@@ -24,7 +24,7 @@
 module PhusionPassenger
 	# Phusion Passenger version number.
 	# Don't forget to edit ext/common/Version.h too.
-	VERSION_STRING = '2.2.13'
+	VERSION_STRING = '2.2.14'
 	
 	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
 	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60

data/lib/phusion_passenger/utils.rb

@@ -34,7 +34,7 @@ require 'tempfile'
 require 'stringio'
 require 'phusion_passenger/packaging'
 require 'phusion_passenger/exceptions'
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
+if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx"
 	require 'phusion_passenger/native_support'
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 2
   - 2
-  - 13
-  version: 2.2.13
+  - 14
+  version: 2.2.14
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 +02:00
+date: 2010-06-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency