Imported Upstream version 2.0.6

patdowney · Dec 15, 2008 · 86694a7 · 86694a7
1 parent 2e125eb
commit 86694a7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/Rakefile b/Rakefile
@@ -29,7 +29,7 @@ verbose true
 ##### Configuration
 
 # Don't forget to edit Configuration.h too
-PACKAGE_VERSION = "2.0.5"
+PACKAGE_VERSION = "2.0.6"
 OPTIMIZE = ["yes", "on", "true"].include?(ENV['OPTIMIZE'])
 
 include PlatformInfo

diff --git a/ext/apache2/Configuration.h b/ext/apache2/Configuration.h
@@ -31,7 +31,7 @@
  */
 
 /** Module version number. */
-#define PASSENGER_VERSION "2.0.5"
+#define PASSENGER_VERSION "2.0.6"
 
 #ifdef __cplusplus
 	#include <set>

diff --git a/ext/apache2/Exceptions.h b/ext/apache2/Exceptions.h
@@ -23,6 +23,7 @@
 #include <exception>
 #include <string>
 #include <sstream>
+#include <cstring>
 
 /**
  * @defgroup Exceptions Exceptions

diff --git a/ext/passenger/native_support.c b/ext/passenger/native_support.c
@@ -26,6 +26,9 @@
 #include <errno.h>
 
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#ifndef RARRAY_LEN
+	#define RARRAY_LEN(ary) RARRAY(ary)->len
+#endif
 
 static VALUE mPassenger;
 static VALUE mNativeSupport;

diff --git a/lib/passenger/spawn_manager.rb b/lib/passenger/spawn_manager.rb
@@ -71,7 +71,11 @@ def initialize
 
 			# Commonly used libraries.
 			['mysql', 'sqlite3'].each do |lib|
-				require lib
+				begin
+					require lib
+				rescue LoadError
+					# Do nothing; ignore if not present.
+				end
 			end
 		end
 	end