passenger 3.0.10 → 3.0.11

data/NEWS

@@ -1,3 +1,11 @@
+Release 3.0.11
+--------------
+
+ * Fixed a compilation problem on platforms without alloca.h, such as FreeBSD 7.
+ * Improved performance and solves some warnings on Xen systems by compiling
+   with `-mno-tls-direct-seg-refs`. Patch contributed by Michał Pokrywka.
+
+
 Release 3.0.10
 --------------
 

data/build/config.rb

@@ -35,6 +35,7 @@ end
 # Should be included last in the command string, even after PlatformInfo.portability_cflags.
 EXTRA_CXXFLAGS = "-Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long"
 EXTRA_CXXFLAGS << " -Wno-missing-field-initializers" if PlatformInfo.compiler_supports_wno_missing_field_initializers_flag?
+EXTRA_CXXFLAGS << " -mno-tls-direct-seg-refs" if PlatformInfo.requires_no_tls_direct_seg_refs? && PlatformInfo.compiler_supports_no_tls_direct_seg_refs_option?
 EXTRA_CXXFLAGS << " #{OPTIMIZATION_FLAGS}" if !OPTIMIZATION_FLAGS.empty?
 
 # Extra linker flags that should always be passed to the linker.

data/doc/Users guide Apache.html

@@ -4862,7 +4862,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-11-24 19:06:50 CET
+Last updated 2011-11-28 12:40:23 CET
 </div>
 </div>
 </body>

data/ext/common/Constants.h

@@ -26,7 +26,7 @@
 #define _PASSENGER_CONSTANTS_H_
 
 /* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "3.0.10"
+#define PASSENGER_VERSION "3.0.11"
 
 #define FEEDBACK_FD 3
 

data/ext/common/EventedMessageServer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010, 2011 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -29,7 +29,9 @@
 #include <ev++.h>
 #include <cstdarg>
 #include <cstdlib>
-#include <alloca.h>
+#ifdef HAS_ALLOCA_H_
+	#include <alloca.h>
+#endif
 #include "EventedServer.h"
 #include "MessageReadersWriters.h"
 #include "AccountsDatabase.h"

data/lib/phusion_passenger.rb

@@ -25,7 +25,7 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.0.10'
+	VERSION_STRING = '3.0.11'
 	
 	PREFERRED_NGINX_VERSION = '1.0.10'
 	PREFERRED_PCRE_VERSION  = '8.12'

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -66,6 +66,11 @@ module PlatformInfo
 	end
 	memoize :compiler_supports_wno_missing_field_initializers_flag?
 	
+	def self.compiler_supports_no_tls_direct_seg_refs_option?
+		return try_compile(:c, '', '-mno-tls-direct-seg-refs')
+	end
+	memoize :compiler_supports_no_tls_direct_seg_refs_option?, true
+	
 	# Returns whether compiling C++ with -fvisibility=hidden might result
 	# in tons of useless warnings, like this:
 	# http://code.google.com/p/phusion-passenger/issues/detail?id=526
@@ -86,6 +91,11 @@ module PlatformInfo
 	end
 	memoize :has_math_library?, true
 	
+	def self.has_alloca_h?
+		return try_compile(:c, '#include <alloca.h>')
+	end
+	memoize :has_alloca_h?, true
+
 	# Compiler flags that should be used for compiling every C/C++ program,
 	# for portability reasons. These flags should be specified as last
 	# when invoking the compiler.
@@ -148,6 +158,7 @@ module PlatformInfo
 			flags << '-DBOOST_SP_USE_PTHREADS'
 		end
 		
+		flags << '-DHAS_ALLOCA_H' if has_alloca_h?
 		flags << '-DHAS_SFENCE' if supports_sfence_instruction?
 		flags << '-DHAS_LFENCE' if supports_lfence_instruction?
 		

data/lib/phusion_passenger/platform_info/operating_system.rb

@@ -153,6 +153,11 @@ module PlatformInfo
 			}))
 	end
 	memoize :supports_lfence_instruction?, true
+
+	def self.requires_no_tls_direct_seg_refs?
+		return File.exists?("/proc/xen/capabilities") && cpu_architectures[0] == "x86"
+	end
+	memoize :requires_no_tls_direct_seg_refs?, true
 end
 
 end # module PhusionPassenger

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 3
   - 0
-  - 10
-  version: 3.0.10
+  - 11
+  version: 3.0.11
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-26 00:00:00 +01:00
+date: 2011-11-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -233,7 +233,6 @@ files:
 - bin/passenger-memory-stats
 - bin/passenger-status
 - doc/ApplicationPool algorithm.txt
-- doc/Architectural overview.html
 - doc/Architectural overview.txt
 - doc/definitions.h
 - doc/images/by_sa.png
@@ -274,15 +273,11 @@ files:
 - doc/images/spawn_server_architecture.svg
 - doc/images/typical_isolated_web_application.png
 - doc/images/typical_isolated_web_application.svg
-- doc/Security of user switching support.html
 - doc/Security of user switching support.txt
 - doc/Users guide Apache with comments.html
-- doc/Users guide Apache.html
 - doc/Users guide Apache.idmap.txt
 - doc/Users guide Apache.txt
-- doc/Users guide Nginx.html
 - doc/Users guide Nginx.txt
-- doc/Users guide Standalone.html
 - doc/Users guide Standalone.txt
 - doc/users_guide_snippets/analysis_and_system_maintenance.txt
 - doc/users_guide_snippets/appendix_a_about.txt
@@ -1076,7 +1071,6 @@ files:
 - ext/libev/ltmain.sh
 - ext/libev/missing
 - ext/libev/mkinstalldirs
-- ext/libev/config.h
 - ext/libev/ev++.h
 - ext/libev/ev.h
 - ext/libev/ev_vars.h
@@ -1510,6 +1504,11 @@ files:
 - test/stub/zsfa/header.png
 - test/stub/zsfa/index.html
 - test/stub/zsfa/zsfa.png
+- doc/Users guide Apache.html
+- doc/Users guide Nginx.html
+- doc/Users guide Standalone.html
+- doc/Security of user switching support.html
+- doc/Architectural overview.html
 has_rdoc: true
 homepage: http://www.modrails.com/
 licenses: []

data/ext/libev/config.h

@@ -1,122 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the `clock_gettime' function. */
-/* #undef HAVE_CLOCK_GETTIME */
-
-/* "use syscall interface for clock_gettime" */
-/* #undef HAVE_CLOCK_SYSCALL */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the `epoll_ctl' function. */
-/* #undef HAVE_EPOLL_CTL */
-
-/* Define to 1 if you have the `eventfd' function. */
-/* #undef HAVE_EVENTFD */
-
-/* Define to 1 if you have the `inotify_init' function. */
-/* #undef HAVE_INOTIFY_INIT */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `kqueue' function. */
-#define HAVE_KQUEUE 1
-
-/* Define to 1 if you have the `m' library (-lm). */
-#define HAVE_LIBM 1
-
-/* Define to 1 if you have the `rt' library (-lrt). */
-/* #undef HAVE_LIBRT */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `nanosleep' function. */
-/* #undef HAVE_NANOSLEEP */
-
-/* Define to 1 if you have the `poll' function. */
-#define HAVE_POLL 1
-
-/* Define to 1 if you have the <poll.h> header file. */
-#define HAVE_POLL_H 1
-
-/* Define to 1 if you have the `port_create' function. */
-/* #undef HAVE_PORT_CREATE */
-
-/* Define to 1 if you have the <port.h> header file. */
-/* #undef HAVE_PORT_H */
-
-/* Define to 1 if you have the `select' function. */
-#define HAVE_SELECT 1
-
-/* Define to 1 if you have the `signalfd' function. */
-/* #undef HAVE_SIGNALFD */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/epoll.h> header file. */
-/* #undef HAVE_SYS_EPOLL_H */
-
-/* Define to 1 if you have the <sys/eventfd.h> header file. */
-/* #undef HAVE_SYS_EVENTFD_H */
-
-/* Define to 1 if you have the <sys/event.h> header file. */
-#define HAVE_SYS_EVENT_H 1
-
-/* Define to 1 if you have the <sys/inotify.h> header file. */
-/* #undef HAVE_SYS_INOTIFY_H */
-
-/* Define to 1 if you have the <sys/queue.h> header file. */
-#define HAVE_SYS_QUEUE_H 1
-
-/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define to 1 if you have the <sys/signalfd.h> header file. */
-/* #undef HAVE_SYS_SIGNALFD_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Name of package */
-#define PACKAGE "libev"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "3.9"