passenger 3.0.5 → 3.0.6

data/lib/phusion_passenger/platform_info/apache.rb

@@ -212,14 +212,24 @@ module PlatformInfo
 			# (http://code.google.com/p/phusion-passenger/issues/detail?id=236)
 			output = `file "#{httpd}"`.strip
 			if output =~ /Mach-O fat file/ && output !~ /for architecture/
-				architectures = ["-arch i386 -arch ppc -arch x86_64 -arch ppc64"]
+				architectures = ["i386", "ppc", "x86_64", "ppc64"]
 			else
 				architectures = []
 				output.split("\n").grep(/for architecture/).each do |line|
 					line =~ /for architecture (.*?)\)/
-					architectures << "-arch #{$1}"
+					architectures << $1
 				end
 			end
+			# The compiler may not support all architectures in the binary.
+			# XCode 4 seems to have removed support for the PPC architecture
+			# even though there are still plenty of Apache binaries around
+			# containing PPC components.
+			architectures.reject! do |arch|
+				!compiler_supports_architecture?(arch)
+			end
+			architectures.map! do |arch|
+				"-arch #{arch}"
+			end
 			flags << architectures.compact.join(' ')
 		end
 		return flags.compact.join(' ').strip
@@ -264,7 +274,7 @@ module PlatformInfo
 	# headers are placed into the same directory as the Apache headers,
 	# and so 'apr-config' and 'apu-config' won't be necessary in that case.
 	def self.apr_config_needed_for_building_apache_modules?
-		filename = File.join("/tmp/passenger-platform-check-#{Process.pid}.c")
+		filename = File.join("#{test_exe_outdir}/passenger-platform-check-#{Process.pid}.c")
 		File.open(filename, "w") do |f|
 			f.puts("#include <apr.h>")
 		end

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -46,6 +46,11 @@ module PlatformInfo
 	end
 	memoize :gnu_make, true
 	
+	# Checks whether the compiler supports "-arch #{arch}".
+	def self.compiler_supports_architecture?(arch)
+		return try_compile(:c, '', "-arch #{arch}")
+	end
+	
 	def self.compiler_supports_visibility_flag?
 		return try_compile(:c, '', '-fvisibility=hidden')
 	end

data/lib/phusion_passenger/rack/application_spawner.rb

@@ -217,8 +217,9 @@ private
 		# itself doesn't preload Rack. This is necessary because some broken
 		# Rails apps explicitly specify a Rack version as dependency.
 		require 'rack'
-		rackup_code = ::File.read("config.ru")
-		eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, "config.ru")
+		rackup_file = ENV["RACKUP_FILE"] || "config.ru"
+		rackup_code = ::File.read(rackup_file)
+		eval("Rack::Builder.new {( #{rackup_code}\n )}.to_app", TOPLEVEL_BINDING, rackup_file)
 	end
 	private_class_method :load_rack_app
 end

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -86,7 +86,6 @@ protected
 			Dependencies::Curl_Dev,
 			Dependencies::OpenSSL_Dev,
 			Dependencies::Zlib_Dev,
-			Dependencies::File_Tail,
 			Dependencies::Daemon_Controller,
 		]
 		if Dependencies.fastthread_required?

data/lib/phusion_passenger/standalone/start_command.rb

@@ -145,6 +145,10 @@ private
 				wrap_desc("Framework environment (default: #{@options[:env]})")) do |value|
 				@options[:env] = value
 			end
+			opts.on("-R", "--rackup FILE", String,
+				wrap_desc("If Rack application detected, run this rackup file")) do |value|
+				ENV["RACKUP_FILE"] = value
+			end
 			opts.on("--max-pool-size NUMBER", Integer,
 				wrap_desc("Maximum number of application processes (default: #{@options[:max_pool_size]})")) do |value|
 				@options[:max_pool_size] = value
@@ -406,20 +410,23 @@ private
 		if File.exist?(log_file)
 			backward = 0
 		else
-			# File::Tail bails out if the file doesn't exist, so wait until it exists.
+			# tail bails out if the file doesn't exist, so wait until it exists.
 			while !File.exist?(log_file)
 				sleep 1
 			end
 			backward = 10
 		end
 		
-		File::Tail::Logfile.open(log_file, :backward => backward) do |log|
-			log.interval = 0.1
-			log.max_interval = 1
-			log.tail do |line|
-				@console_mutex.synchronize do
-					STDOUT.write(line)
-					STDOUT.flush
+		IO.popen("tail -f -n #{backward} \"#{log_file}\"", "rb") do |f|
+			while true
+				begin
+					line = f.readline
+					@console_mutex.synchronize do
+						STDOUT.write(line)
+						STDOUT.flush
+					end
+				rescue EOFError
+					break
 				end
 			end
 		end

data/lib/phusion_passenger/templates/standalone/config.erb

@@ -44,6 +44,7 @@ http {
     passenger_max_pool_size <%= @options[:max_pool_size] %>;
     passenger_min_instances <%= @options[:min_instances] %>;
     <% if @options[:user] %>passenger_default_user <%= @options[:user] %>;<% end %>
+    <% if debugging? %>passenger_log_level 2;<% end %>
     
     <% if @options[:union_station_gateway_address] %>
         union_station_gateway_address <%= @options[:union_station_gateway_address] %>;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 3
   - 0
-  - 5
-  version: 3.0.5
+  - 6
+  version: 3.0.6
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 +01:00
+date: 2011-04-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,7 +67,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: file-tail
+  name: rack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -80,20 +80,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
 description: Easy and robust Ruby web application deployment.
 email: info@phusion.nl
 executables: 
@@ -669,167 +655,6 @@ files:
 - doc/images/spawn_server_architecture.svg
 - doc/images/typical_isolated_web_application.png
 - doc/images/typical_isolated_web_application.svg
-- doc/rdoc/classes/ConditionVariable.html
-- doc/rdoc/classes/Exception.html
-- doc/rdoc/classes/GC.html
-- doc/rdoc/classes/IO.html
-- doc/rdoc/classes/PhusionPassenger/AbstractInstaller.html
-- doc/rdoc/classes/PhusionPassenger/AbstractRequestHandler.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServer/InvalidPassword.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerAlreadyStarted.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerError.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerNotStarted.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServer/UnknownMessage.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServer.html
-- doc/rdoc/classes/PhusionPassenger/AbstractServerCollection.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/MemoryStats/Process.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/MemoryStats.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/CorruptedDirectoryError.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/GenerationsAbsentError.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Group.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Process.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/RoleDeniedError.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/StaleDirectoryError.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Stats.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/UnsupportedGenerationStructureVersionError.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance.html
-- doc/rdoc/classes/PhusionPassenger/AdminTools.html
-- doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/Lock.html
-- doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/Log.html
-- doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/SharedData.html
-- doc/rdoc/classes/PhusionPassenger/AnalyticsLogger.html
-- doc/rdoc/classes/PhusionPassenger/AppInitError.html
-- doc/rdoc/classes/PhusionPassenger/AppProcess.html
-- doc/rdoc/classes/PhusionPassenger/ClassicRails/ApplicationSpawner/Error.html
-- doc/rdoc/classes/PhusionPassenger/ClassicRails/ApplicationSpawner.html
-- doc/rdoc/classes/PhusionPassenger/ClassicRails/CGIFixed.html
-- doc/rdoc/classes/PhusionPassenger/ClassicRails/FrameworkSpawner/Error.html
-- doc/rdoc/classes/PhusionPassenger/ClassicRails/FrameworkSpawner.html
-- doc/rdoc/classes/PhusionPassenger/ClassicRails/RequestHandler.html
-- doc/rdoc/classes/PhusionPassenger/ClassicRails.html
-- doc/rdoc/classes/PhusionPassenger/ClassicRailsExtensions/AnalyticsLogging.html
-- doc/rdoc/classes/PhusionPassenger/ClassicRailsExtensions.html
-- doc/rdoc/classes/PhusionPassenger/ConsoleTextTemplate.html
-- doc/rdoc/classes/PhusionPassenger/DebugLogging.html
-- doc/rdoc/classes/PhusionPassenger/FrameworkInitError.html
-- doc/rdoc/classes/PhusionPassenger/HTMLTemplate.html
-- doc/rdoc/classes/PhusionPassenger/InitializationError.html
-- doc/rdoc/classes/PhusionPassenger/InvalidPath.html
-- doc/rdoc/classes/PhusionPassenger/MessageChannel/InvalidHashError.html
-- doc/rdoc/classes/PhusionPassenger/MessageChannel.html
-- doc/rdoc/classes/PhusionPassenger/MessageClient.html
-- doc/rdoc/classes/PhusionPassenger/NativeSupportLoader.html
-- doc/rdoc/classes/PhusionPassenger/Packaging.html
-- doc/rdoc/classes/PhusionPassenger/PlatformInfo.html
-- doc/rdoc/classes/PhusionPassenger/Plugin.html
-- doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner/Error.html
-- doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner.html
-- doc/rdoc/classes/PhusionPassenger/Rack/RequestHandler.html
-- doc/rdoc/classes/PhusionPassenger/Rack.html
-- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ACExtension.html
-- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ASBenchmarkableExtension.html
-- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ExceptionLogger.html
-- doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging.html
-- doc/rdoc/classes/PhusionPassenger/Rails3Extensions.html
-- doc/rdoc/classes/PhusionPassenger/SpawnManager.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/AppFinder.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/Command.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/ConfigFile/DisallowedContextError.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/ConfigFile.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/HelpCommand.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/Main.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/PackageRuntimeCommand.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/RuntimeInstaller.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/StartCommand.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/StatusCommand.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/StopCommand.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/Utils.html
-- doc/rdoc/classes/PhusionPassenger/Standalone/VersionCommand.html
-- doc/rdoc/classes/PhusionPassenger/Standalone.html
-- doc/rdoc/classes/PhusionPassenger/UnknownError.html
-- doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher/DirInfo.html
-- doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher/FileInfo.html
-- doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher.html
-- doc/rdoc/classes/PhusionPassenger/Utils/HostsFileParser.html
-- doc/rdoc/classes/PhusionPassenger/Utils/PseudoIO.html
-- doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput/Tempfile.html
-- doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput.html
-- doc/rdoc/classes/PhusionPassenger/Utils/UnseekableSocket.html
-- doc/rdoc/classes/PhusionPassenger/Utils.html
-- doc/rdoc/classes/PhusionPassenger/VersionNotFound.html
-- doc/rdoc/classes/PhusionPassenger/WSGI/ApplicationSpawner.html
-- doc/rdoc/classes/PhusionPassenger/WSGI.html
-- doc/rdoc/classes/PhusionPassenger.html
-- doc/rdoc/classes/Process.html
-- doc/rdoc/classes/Signal.html
-- doc/rdoc/created.rid
-- doc/rdoc/files/DEVELOPERS_TXT.html
-- doc/rdoc/files/lib/phusion_passenger/abstract_installer_rb.html
-- doc/rdoc/files/lib/phusion_passenger/abstract_request_handler_rb.html
-- doc/rdoc/files/lib/phusion_passenger/abstract_server_collection_rb.html
-- doc/rdoc/files/lib/phusion_passenger/abstract_server_rb.html
-- doc/rdoc/files/lib/phusion_passenger/admin_tools/memory_stats_rb.html
-- doc/rdoc/files/lib/phusion_passenger/admin_tools/server_instance_rb.html
-- doc/rdoc/files/lib/phusion_passenger/admin_tools_rb.html
-- doc/rdoc/files/lib/phusion_passenger/analytics_logger_rb.html
-- doc/rdoc/files/lib/phusion_passenger/app_process_rb.html
-- doc/rdoc/files/lib/phusion_passenger/classic_rails/application_spawner_rb.html
-- doc/rdoc/files/lib/phusion_passenger/classic_rails/cgi_fixed_rb.html
-- doc/rdoc/files/lib/phusion_passenger/classic_rails/framework_spawner_rb.html
-- doc/rdoc/files/lib/phusion_passenger/classic_rails/request_handler_rb.html
-- doc/rdoc/files/lib/phusion_passenger/classic_rails_extensions/init_rb.html
-- doc/rdoc/files/lib/phusion_passenger/console_text_template_rb.html
-- doc/rdoc/files/lib/phusion_passenger/constants_rb.html
-- doc/rdoc/files/lib/phusion_passenger/debug_logging_rb.html
-- doc/rdoc/files/lib/phusion_passenger/dependencies_rb.html
-- doc/rdoc/files/lib/phusion_passenger/exceptions_rb.html
-- doc/rdoc/files/lib/phusion_passenger/html_template_rb.html
-- doc/rdoc/files/lib/phusion_passenger/message_channel_rb.html
-- doc/rdoc/files/lib/phusion_passenger/message_client_rb.html
-- doc/rdoc/files/lib/phusion_passenger/native_support_rb.html
-- doc/rdoc/files/lib/phusion_passenger/packaging_rb.html
-- doc/rdoc/files/lib/phusion_passenger/platform_info/apache_rb.html
-- doc/rdoc/files/lib/phusion_passenger/platform_info/binary_compatibility_rb.html
-- doc/rdoc/files/lib/phusion_passenger/platform_info/compiler_rb.html
-- doc/rdoc/files/lib/phusion_passenger/platform_info/curl_rb.html
-- doc/rdoc/files/lib/phusion_passenger/platform_info/documentation_tools_rb.html
-- doc/rdoc/files/lib/phusion_passenger/platform_info/linux_rb.html
-- doc/rdoc/files/lib/phusion_passenger/platform_info/operating_system_rb.html
-- doc/rdoc/files/lib/phusion_passenger/platform_info/ruby_rb.html
-- doc/rdoc/files/lib/phusion_passenger/platform_info/zlib_rb.html
-- doc/rdoc/files/lib/phusion_passenger/platform_info_rb.html
-- doc/rdoc/files/lib/phusion_passenger/plugin_rb.html
-- doc/rdoc/files/lib/phusion_passenger/public_api_rb.html
-- doc/rdoc/files/lib/phusion_passenger/rack/application_spawner_rb.html
-- doc/rdoc/files/lib/phusion_passenger/rack/request_handler_rb.html
-- doc/rdoc/files/lib/phusion_passenger/rails3_extensions/init_rb.html
-- doc/rdoc/files/lib/phusion_passenger/simple_benchmarking_rb.html
-- doc/rdoc/files/lib/phusion_passenger/spawn_manager_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/app_finder_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/command_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/config_file_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/help_command_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/main_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/package_runtime_command_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/runtime_installer_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/start_command_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/status_command_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/stop_command_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/utils_rb.html
-- doc/rdoc/files/lib/phusion_passenger/standalone/version_command_rb.html
-- doc/rdoc/files/lib/phusion_passenger/utils/file_system_watcher_rb.html
-- doc/rdoc/files/lib/phusion_passenger/utils/hosts_file_parser_rb.html
-- doc/rdoc/files/lib/phusion_passenger/utils/rewindable_input_rb.html
-- doc/rdoc/files/lib/phusion_passenger/utils/tmpdir_rb.html
-- doc/rdoc/files/lib/phusion_passenger/utils/unseekable_socket_rb.html
-- doc/rdoc/files/lib/phusion_passenger/utils_rb.html
-- doc/rdoc/files/lib/phusion_passenger/wsgi/application_spawner_rb.html
-- doc/rdoc/files/README.html
-- doc/rdoc/fr_class_index.html
-- doc/rdoc/fr_file_index.html
-- doc/rdoc/fr_method_index.html
-- doc/rdoc/index.html
-- doc/rdoc/rdoc-style.css
 - doc/Security of user switching support.html
 - doc/Security of user switching support.txt
 - doc/template/horo.rb
@@ -873,8 +698,6 @@ files:
 - ext/common/AgentBase.cpp
 - ext/common/AgentsStarter.cpp
 - ext/common/BCrypt.cpp
-- ext/common/libboost_oxt/aggregate.cpp
-- ext/common/libpassenger_common/aggregate.cpp
 - ext/common/Logging.cpp
 - ext/common/LoggingAgent/FilterSupport.cpp
 - ext/common/LoggingAgent/Main.cpp

data/doc/rdoc/classes/ConditionVariable.html

@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-  <head>
-    <title>Class: ConditionVariable</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
-
-    <script language="JavaScript" type="text/javascript">
-    // <![CDATA[
-
-        function toggleSource( id )
-        {
-          var elem
-          var link
-
-          if( document.getElementById )
-          {
-            elem = document.getElementById( id )
-            link = document.getElementById( "l_" + id )
-          }
-          else if ( document.all )
-          {
-            elem = eval( "document.all." + id )
-            link = eval( "document.all.l_" + id )
-          }
-          else
-            return false;
-
-          if( elem.style.display == "block" )
-          {
-            elem.style.display = "none"
-            link.innerHTML = "show source"
-          }
-          else
-          {
-            elem.style.display = "block"
-            link.innerHTML = "hide source"
-          }
-        }
-
-        function openCode( url )
-        {
-          window.open( url, "SOURCE_CODE", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=480,width=750" ).focus();
-        }
-      // ]]>
-    </script>
-  </head>
-
-  <body>
-  <table width="100%" border='0' cellpadding='0' cellspacing='0' class='banner'><tr>
-  <td class="file-title"><span class="file-title-prefix">Class</span><br />ConditionVariable</td>
-  <td align="right">
-    <table cellspacing="0" cellpadding="2">
-      <tr valign="top">
-        <td>In:</td>
-        <td>
-<a href="../files/lib/phusion_passenger/utils_rb.html">lib/phusion_passenger/utils.rb</a>
-        </td>
-      </tr>
-    <tr>
-      <td>Parent:</td>
-      <td>
-Object
-     </td>
-   </tr>
-         </table>
-        </td>
-        </tr>
-      </table>
- <!-- banner header -->
-
-  <div id="bodyContent">
-      <div id="content">
-
-
-
-
-  <div class="sectiontitle">Methods</div>
-  <ul>
-  <li><a href="#M000003">timed_wait</a></li>
-  <li><a href="#M000004">timed_wait!</a></li>
-  </ul>
-
-
-
-
-
-
-<div class="sectiontitle">Public Instance methods</div>
-<div class="method">
-  <div class="title">
-    <a name="M000003"></a><b>timed_wait</b>(mutex, secs)
-  </div>
-  <div class="description">
-  <p>
-This is like ConditionVariable.wait(), but allows one to wait a maximum
-amount of time. Returns true if this condition was signaled, false if a
-timeout occurred.
-</p>
-  </div>
-<div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000003_source')" id="l_M000003_source">show source</a> ]</p>
-  <div id="M000003_source" class="dyn-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 882</span>
-882:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">timed_wait</span>(<span class="ruby-identifier">mutex</span>, <span class="ruby-identifier">secs</span>)
-883:                 <span class="ruby-identifier">ruby_engine</span> = <span class="ruby-keyword kw">defined?</span>(<span class="ruby-constant">RUBY_ENGINE</span>) <span class="ruby-operator">?</span> <span class="ruby-constant">RUBY_ENGINE</span> <span class="ruby-operator">:</span> <span class="ruby-value str">&quot;ruby&quot;</span>
-884:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">secs</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">100000000</span>
-885:                         <span class="ruby-comment cmt"># NOTE: If one calls timeout() on FreeBSD 5 with an</span>
-886:                         <span class="ruby-comment cmt"># argument of more than 100000000, then MRI will become</span>
-887:                         <span class="ruby-comment cmt"># stuck in an infite loop, blocking all threads. It seems</span>
-888:                         <span class="ruby-comment cmt"># that MRI uses select() to implement sleeping.</span>
-889:                         <span class="ruby-comment cmt"># I think that a value of more than 100000000 overflows</span>
-890:                         <span class="ruby-comment cmt"># select()'s data structures, causing it to behave incorrectly.</span>
-891:                         <span class="ruby-comment cmt"># So we just make sure we can't sleep more than 100000000</span>
-892:                         <span class="ruby-comment cmt"># seconds.</span>
-893:                         <span class="ruby-identifier">secs</span> = <span class="ruby-value">100000000</span>
-894:                 <span class="ruby-keyword kw">end</span>
-895:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">ruby_engine</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;jruby&quot;</span>
-896:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">secs</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-897:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>, <span class="ruby-identifier">secs</span>)
-898:                         <span class="ruby-keyword kw">else</span>
-899:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>)
-900:                         <span class="ruby-keyword kw">end</span>
-901:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">RUBY_VERSION</span> <span class="ruby-operator">&gt;=</span> <span class="ruby-value str">'1.9.2'</span>
-902:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">secs</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-903:                                 <span class="ruby-identifier">t1</span> = <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>
-904:                                 <span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>, <span class="ruby-identifier">secs</span>)
-905:                                 <span class="ruby-identifier">t2</span> = <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>
-906:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">t2</span>.<span class="ruby-identifier">to_f</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">t1</span>.<span class="ruby-identifier">to_f</span> <span class="ruby-operator">&lt;</span> <span class="ruby-identifier">secs</span>
-907:                         <span class="ruby-keyword kw">else</span>
-908:                                 <span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>)
-909:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>
-910:                         <span class="ruby-keyword kw">end</span>
-911:                 <span class="ruby-keyword kw">else</span>
-912:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">secs</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-913:                                 <span class="ruby-constant">Timeout</span>.<span class="ruby-identifier">timeout</span>(<span class="ruby-identifier">secs</span>) <span class="ruby-keyword kw">do</span>
-914:                                         <span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>)
-915:                                 <span class="ruby-keyword kw">end</span>
-916:                         <span class="ruby-keyword kw">else</span>
-917:                                 <span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>)
-918:                         <span class="ruby-keyword kw">end</span>
-919:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>
-920:                 <span class="ruby-keyword kw">end</span>
-921:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Timeout</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span>
-922:                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
-923:         <span class="ruby-keyword kw">end</span>
-</pre>
-  </div>
-</div>
-</div>
-<div class="method">
-  <div class="title">
-    <a name="M000004"></a><b>timed_wait!</b>(mutex, secs)
-  </div>
-  <div class="description">
-  <p>
-This is like ConditionVariable.wait(), but allows one to wait a maximum
-amount of time. Raises Timeout::Error if the timeout has elapsed.
-</p>
-  </div>
-<div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000004_source')" id="l_M000004_source">show source</a> ]</p>
-  <div id="M000004_source" class="dyn-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/utils.rb, line 927</span>
-927:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">timed_wait!</span>(<span class="ruby-identifier">mutex</span>, <span class="ruby-identifier">secs</span>)
-928:                 <span class="ruby-identifier">ruby_engine</span> = <span class="ruby-keyword kw">defined?</span>(<span class="ruby-constant">RUBY_ENGINE</span>) <span class="ruby-operator">?</span> <span class="ruby-constant">RUBY_ENGINE</span> <span class="ruby-operator">:</span> <span class="ruby-value str">&quot;ruby&quot;</span>
-929:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">secs</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">100000000</span>
-930:                         <span class="ruby-comment cmt"># See the corresponding note for timed_wait().</span>
-931:                         <span class="ruby-identifier">secs</span> = <span class="ruby-value">100000000</span>
-932:                 <span class="ruby-keyword kw">end</span>
-933:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">ruby_engine</span> <span class="ruby-operator">==</span> <span class="ruby-value str">&quot;jruby&quot;</span>
-934:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">secs</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-935:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>, <span class="ruby-identifier">secs</span>)
-936:                                         <span class="ruby-identifier">raise</span> <span class="ruby-constant">Timeout</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span>, <span class="ruby-value str">&quot;Timeout&quot;</span>
-937:                                 <span class="ruby-keyword kw">end</span>
-938:                         <span class="ruby-keyword kw">else</span>
-939:                                 <span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>)
-940:                         <span class="ruby-keyword kw">end</span>
-941:                 <span class="ruby-keyword kw">elsif</span> <span class="ruby-constant">RUBY_VERSION</span> <span class="ruby-operator">&gt;=</span> <span class="ruby-value str">'1.9.2'</span>
-942:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">secs</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-943:                                 <span class="ruby-identifier">t1</span> = <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>
-944:                                 <span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>, <span class="ruby-identifier">secs</span>)
-945:                                 <span class="ruby-identifier">t2</span> = <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>
-946:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">t2</span>.<span class="ruby-identifier">to_f</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">t1</span>.<span class="ruby-identifier">to_f</span> <span class="ruby-operator">&gt;=</span> <span class="ruby-identifier">secs</span>
-947:                                         <span class="ruby-identifier">raise</span> <span class="ruby-constant">Timeout</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span>, <span class="ruby-value str">&quot;Timeout&quot;</span>
-948:                                 <span class="ruby-keyword kw">end</span>
-949:                         <span class="ruby-keyword kw">else</span>
-950:                                 <span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>)
-951:                         <span class="ruby-keyword kw">end</span>
-952:                 <span class="ruby-keyword kw">else</span>
-953:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">secs</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-954:                                 <span class="ruby-constant">Timeout</span>.<span class="ruby-identifier">timeout</span>(<span class="ruby-identifier">secs</span>) <span class="ruby-keyword kw">do</span>
-955:                                         <span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>)
-956:                                 <span class="ruby-keyword kw">end</span>
-957:                         <span class="ruby-keyword kw">else</span>
-958:                                 <span class="ruby-identifier">wait</span>(<span class="ruby-identifier">mutex</span>)
-959:                         <span class="ruby-keyword kw">end</span>
-960:                 <span class="ruby-keyword kw">end</span>
-961:                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-962:         <span class="ruby-keyword kw">end</span>
-</pre>
-  </div>
-</div>
-</div>
-</div>
-
-  </div>
-
-    </body>
-</html>