passenger 2.0.3 → 2.0.4

data/test/ApplicationPoolTest.cpp

@@ -356,5 +356,41 @@
 		pool->setMaxPerApp(1);
 		// TODO: how do we test this?
 	}
+	
+	struct SpawnRackAppFunction {
+		ApplicationPoolPtr pool;
+		bool *done;
+		
+		void operator()() {
+			spawnRackApp(pool, "stub/rack");
+			*done = true;
+		}
+	};
+	
+	TEST_METHOD(19) {
+		// If global queueing mode is enabled, then get() waits until
+		// there's at least one idle backend process for this application
+		// domain.
+		pool->setUseGlobalQueue(true);
+		pool->setMax(1);
+		Application::SessionPtr session = spawnRackApp(pool, "stub/rack");
+		
+		bool done = false;
+		SpawnRackAppFunction func;
+		func.pool = pool2;
+		func.done = &done;
+		boost::thread thr(func);
+		usleep(100000);
+		
+		// Previous session hasn't been closed yet, so pool should still
+		// be waiting.
+		ensure(!done);
+		
+		// Close the previous session. The thread should now finish.
+		session.reset();
+		thr.join();
+	}
+	
+	// TODO: test maxIdleTime == 0
 
 #endif /* USE_TEMPLATE */

data/test/ruby/rails/minimal_spawner_spec.rb

@@ -34,4 +34,12 @@ shared_examples_for "a minimal spawner" do
 			environment.should == "development"
 		end
 	end
+	
+	it "loads application_controller.rb instead of application.rb, if the former exists" do
+		use_rails_stub('foobar') do |stub|
+			File.rename("#{stub.app_root}/app/controllers/application.rb",
+				"#{stub.app_root}/app/controllers/application_controller.rb")
+			lambda { spawn_stub_application(stub).close }.should_not raise_error
+		end
+	end
 end

data/test/ruby/utils_spec.rb

@@ -0,0 +1,33 @@
+require 'support/config'
+
+require 'tempfile'
+require 'passenger/utils'
+
+include Passenger
+
+describe Utils do
+	include Utils
+	
+	specify "#close_all_io_objects_for_fds closes all IO objects that are associated with the given file descriptors" do
+		filename = "#{Dir.tmpdir}/passenger_test.#{Process.pid}.txt"
+		begin
+			pid = fork do
+				begin
+					a, b = IO.pipe
+					close_all_io_objects_for_fds([0, 1, 2])
+					File.open(filename, "w") do |f|
+						f.write("#{a.closed?}, #{b.closed?}")
+					end
+				rescue Exception => e
+					print_exception("utils_spec", e)
+				ensure
+					exit!
+				end
+			end
+			Process.waitpid(pid) rescue nil
+			File.read(filename).should == "true, true"
+		ensure
+			File.unlink(filename) rescue nil
+		end
+	end
+end

data/test/stub/rails_apps/foobar/config/environments/production.rb

@@ -10,7 +10,6 @@ config.cache_classes = true
 # Full error reports are disabled and caching is turned on
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
-config.action_view.cache_template_loading            = true
 
 # Enable serving of images, stylesheets, and javascripts from an asset server
 # config.action_controller.asset_host                  = "http://assets.example.com"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-09 00:00:00 +02:00
+date: 2008-12-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,15 +113,214 @@ files:
 - bin/passenger-status
 - bin/passenger-make-enterprisey
 - doc/Doxyfile
+- doc/cxxapi
 - doc/definitions.h
 - doc/images
+- doc/Users guide.html
 - doc/ApplicationPool algorithm.txt
 - doc/Architectural overview.txt
+- doc/rdoc
 - doc/template
 - doc/Users guide.txt
-- doc/Security of user switching support.txt
-- doc/Users guide.html
+- doc/Architectural overview.html
 - doc/Security of user switching support.html
+- doc/Security of user switching support.txt
+- doc/cxxapi/inherit__graph__15.png
+- doc/cxxapi/inherit__graph__0.png
+- doc/cxxapi/tree.html
+- doc/cxxapi/inherit__graph__3.map
+- doc/cxxapi/classPassenger_1_1Thread.html
+- doc/cxxapi/inherit__graph__9.png
+- doc/cxxapi/inherit__graph__18.md5
+- doc/cxxapi/inherit__graph__5.png
+- doc/cxxapi/inherit__graph__15.md5
+- doc/cxxapi/graph_legend.dot
+- doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.png
+- doc/cxxapi/inherit__graph__18.png
+- doc/cxxapi/inherit__graph__12.png
+- doc/cxxapi/ApplicationPoolServer_8h-source.html
+- doc/cxxapi/inherit__graph__16.png
+- doc/cxxapi/inherit__graph__15.map
+- doc/cxxapi/inherit__graph__6.map
+- doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.map
+- doc/cxxapi/inherit__graph__5.map
+- doc/cxxapi/structPassenger_1_1AnythingToString-members.html
+- doc/cxxapi/classPassenger_1_1TempFile-members.html
+- doc/cxxapi/ftv2vertline.png
+- doc/cxxapi/classPassenger_1_1SpawnManager.html
+- doc/cxxapi/classPassenger_1_1IOException__inherit__graph.map
+- doc/cxxapi/group__Core.png
+- doc/cxxapi/classboost_1_1this__thread_1_1enable__syscall__interruption-members.html
+- doc/cxxapi/ftv2folderopen.png
+- doc/cxxapi/graph_legend.png
+- doc/cxxapi/inherit__graph__10.map
+- doc/cxxapi/classPassenger_1_1FileSystemException-members.html
+- doc/cxxapi/inherit__graph__16.map
+- doc/cxxapi/namespacePassenger_1_1InterruptableCalls.html
+- doc/cxxapi/group__Core.html
+- doc/cxxapi/classPassenger_1_1SpawnException-members.html
+- doc/cxxapi/inherit__graph__6.png
+- doc/cxxapi/inherit__graph__3.png
+- doc/cxxapi/classPassenger_1_1IOException-members.html
+- doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.md5
+- doc/cxxapi/index.html
+- doc/cxxapi/inherit__graph__21.png
+- doc/cxxapi/classPassenger_1_1FileNotFoundException__inherit__graph.png
+- doc/cxxapi/inherit__graph__7.png
+- doc/cxxapi/System_8h-source.html
+- doc/cxxapi/inherit__graph__9.md5
+- doc/cxxapi/inherit__graph__7.md5
+- doc/cxxapi/classboost_1_1this__thread_1_1disable__syscall__interruption-members.html
+- doc/cxxapi/inherit__graph__12.map
+- doc/cxxapi/classPassenger_1_1IOException__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1StandardApplicationPool__inherit__graph.md5
+- doc/cxxapi/inherit__graph__19.map
+- doc/cxxapi/namespaces.html
+- doc/cxxapi/classPassenger_1_1ApplicationPool__inherit__graph.md5
+- doc/cxxapi/classDirectoryMapper.html
+- doc/cxxapi/classPassenger_1_1ApplicationPoolServer.html
+- doc/cxxapi/inherit__graph__0.md5
+- doc/cxxapi/inherit__graph__5.md5
+- doc/cxxapi/inherit__graph__2.png
+- doc/cxxapi/ApplicationPool_8h-source.html
+- doc/cxxapi/inherit__graph__4.md5
+- doc/cxxapi/group__Support.html
+- doc/cxxapi/classPassenger_1_1SystemException.html
+- doc/cxxapi/classboost_1_1this__thread_1_1enable__syscall__interruption.html
+- doc/cxxapi/classDirectoryMapper-members.html
+- doc/cxxapi/inherit__graph__13.map
+- doc/cxxapi/definitions_8h-source.html
+- doc/cxxapi/annotated.html
+- doc/cxxapi/inherit__graph__6.md5
+- doc/cxxapi/classPassenger_1_1TempFile.html
+- doc/cxxapi/ftv2mlastnode.png
+- doc/cxxapi/tab_r.gif
+- doc/cxxapi/inherit__graph__12.md5
+- doc/cxxapi/inherit__graph__11.md5
+- doc/cxxapi/classPassenger_1_1StandardApplicationPool__inherit__graph.map
+- doc/cxxapi/inherit__graph__17.md5
+- doc/cxxapi/classPassenger_1_1BusyException.html
+- doc/cxxapi/classPassenger_1_1StandardApplicationPool.html
+- doc/cxxapi/classboost_1_1this__thread_1_1restore__syscall__interruption.html
+- doc/cxxapi/Hooks_8h-source.html
+- doc/cxxapi/inherit__graph__21.map
+- doc/cxxapi/inherit__graph__18.map
+- doc/cxxapi/classPassenger_1_1DummySpawnManager-members.html
+- doc/cxxapi/inherit__graph__2.map
+- doc/cxxapi/inherit__graph__21.md5
+- doc/cxxapi/classPassenger_1_1FileNotFoundException__inherit__graph.map
+- doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4.html
+- doc/cxxapi/ftv2plastnode.png
+- doc/cxxapi/inherit__graph__3.md5
+- doc/cxxapi/classPassenger_1_1ApplicationPool-members.html
+- doc/cxxapi/doxygen.png
+- doc/cxxapi/classPassenger_1_1MessageChannel-members.html
+- doc/cxxapi/classPassenger_1_1FileSystemException__inherit__graph.png
+- doc/cxxapi/Configuration_8h-source.html
+- doc/cxxapi/inherit__graph__8.md5
+- doc/cxxapi/classPassenger_1_1ApplicationPoolServer-members.html
+- doc/cxxapi/classPassenger_1_1SystemException-members.html
+- doc/cxxapi/inherit__graph__4.map
+- doc/cxxapi/classPassenger_1_1Application.html
+- doc/cxxapi/functions.html
+- doc/cxxapi/ftv2pnode.png
+- doc/cxxapi/files.html
+- doc/cxxapi/MessageChannel_8h-source.html
+- doc/cxxapi/inherit__graph__17.png
+- doc/cxxapi/classPassenger_1_1Application_1_1Session.html
+- doc/cxxapi/functions_vars.html
+- doc/cxxapi/inherit__graph__20.map
+- doc/cxxapi/inherit__graph__8.png
+- doc/cxxapi/namespacemembers.html
+- doc/cxxapi/classPassenger_1_1FileNotFoundException__inherit__graph.md5
+- doc/cxxapi/inherit__graph__1.png
+- doc/cxxapi/classPassenger_1_1FileSystemException__inherit__graph.md5
+- doc/cxxapi/classPassenger_1_1DummySpawnManager.html
+- doc/cxxapi/group__Hooks.png
+- doc/cxxapi/namespacemembers_type.html
+- doc/cxxapi/inherit__graph__11.png
+- doc/cxxapi/DummySpawnManager_8h-source.html
+- doc/cxxapi/classPassenger_1_1SpawnManager-members.html
+- doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4-members.html
+- doc/cxxapi/namespacePassenger.html
+- doc/cxxapi/classPassenger_1_1Application-members.html
+- doc/cxxapi/group__Exceptions.html
+- doc/cxxapi/classPassenger_1_1ConfigurationException-members.html
+- doc/cxxapi/inherit__graph__0.map
+- doc/cxxapi/ftv2doc.png
+- doc/cxxapi/inherit__graph__17.map
+- doc/cxxapi/tab_b.gif
+- doc/cxxapi/classPassenger_1_1IOException.html
+- doc/cxxapi/ftv2link.png
+- doc/cxxapi/inherit__graph__1.md5
+- doc/cxxapi/inherit__graph__4.png
+- doc/cxxapi/tab_l.gif
+- doc/cxxapi/functions_func.html
+- doc/cxxapi/inherit__graph__13.md5
+- doc/cxxapi/inherit__graph__8.map
+- doc/cxxapi/inherit__graph__20.md5
+- doc/cxxapi/classPassenger_1_1Application_1_1Session-members.html
+- doc/cxxapi/graph_legend.html
+- doc/cxxapi/Logging_8h-source.html
+- doc/cxxapi/classboost_1_1this__thread_1_1restore__syscall__interruption-members.html
+- doc/cxxapi/ftv2blank.png
+- doc/cxxapi/classPassenger_1_1SpawnException.html
+- doc/cxxapi/inherit__graph__7.map
+- doc/cxxapi/group__Configuration.html
+- doc/cxxapi/SpawnManager_8h-source.html
+- doc/cxxapi/classPassenger_1_1BusyException-members.html
+- doc/cxxapi/inherit__graph__1.map
+- doc/cxxapi/inherit__graph__20.png
+- doc/cxxapi/inherit__graph__14.png
+- doc/cxxapi/classPassenger_1_1ApplicationPool__inherit__graph.png
+- doc/cxxapi/group__Hooks.html
+- doc/cxxapi/modules.html
+- doc/cxxapi/inherit__graph__11.map
+- doc/cxxapi/inherit__graph__19.md5
+- doc/cxxapi/classPassenger_1_1ApplicationPool.html
+- doc/cxxapi/main.html
+- doc/cxxapi/StandardApplicationPool_8h-source.html
+- doc/cxxapi/classPassenger_1_1FileSystemException.html
+- doc/cxxapi/hierarchy.html
+- doc/cxxapi/namespacemembers_func.html
+- doc/cxxapi/Bucket_8h-source.html
+- doc/cxxapi/classClient-members.html
+- doc/cxxapi/classPassenger_1_1FileNotFoundException.html
+- doc/cxxapi/inherit__graph__2.md5
+- doc/cxxapi/classPassenger_1_1FileSystemException__inherit__graph.map
+- doc/cxxapi/ftv2folderclosed.png
+- doc/cxxapi/classClient.html
+- doc/cxxapi/inherit__graph__14.map
+- doc/cxxapi/inherit__graph__9.map
+- doc/cxxapi/ftv2node.png
+- doc/cxxapi/classPassenger_1_1StandardApplicationPool__inherit__graph.png
+- doc/cxxapi/classHooks.html
+- doc/cxxapi/inherit__graph__19.png
+- doc/cxxapi/classPassenger_1_1IOException__inherit__graph.png
+- doc/cxxapi/classPassenger_1_1ConfigurationException.html
+- doc/cxxapi/structPassenger_1_1AnythingToString.html
+- doc/cxxapi/classboost_1_1this__thread_1_1disable__syscall__interruption.html
+- doc/cxxapi/Exceptions_8h-source.html
+- doc/cxxapi/Application_8h-source.html
+- doc/cxxapi/classPassenger_1_1FileNotFoundException-members.html
+- doc/cxxapi/classHooks-members.html
+- doc/cxxapi/Utils_8h-source.html
+- doc/cxxapi/doxygen.css
+- doc/cxxapi/group__Configuration.png
+- doc/cxxapi/classPassenger_1_1Thread-members.html
+- doc/cxxapi/inherit__graph__10.md5
+- doc/cxxapi/inherits.html
+- doc/cxxapi/tabs.css
+- doc/cxxapi/inherit__graph__16.md5
+- doc/cxxapi/ftv2lastnode.png
+- doc/cxxapi/ftv2mnode.png
+- doc/cxxapi/classPassenger_1_1MessageChannel.html
+- doc/cxxapi/inherit__graph__14.md5
+- doc/cxxapi/classPassenger_1_1ApplicationPool__inherit__graph.map
+- doc/cxxapi/classPassenger_1_1StandardApplicationPool-members.html
+- doc/cxxapi/inherit__graph__13.png
+- doc/cxxapi/functions_type.html
+- doc/cxxapi/inherit__graph__10.png
 - doc/images/typical_isolated_web_application.svg
 - doc/images/icons
 - doc/images/typical_isolated_web_application.png
@@ -131,6 +330,14 @@ files:
 - doc/images/spawn_server_architecture.svg
 - doc/images/by_sa.png
 - doc/images/phusion_banner.png
+- doc/rdoc/created.rid
+- doc/rdoc/fr_class_index.html
+- doc/rdoc/files
+- doc/rdoc/index.html
+- doc/rdoc/fr_file_index.html
+- doc/rdoc/fr_method_index.html
+- doc/rdoc/rdoc-style.css
+- doc/rdoc/classes
 - doc/template/horo.rb
 - doc/images/icons/up.png
 - doc/images/icons/warning.png
@@ -144,6 +351,18 @@ files:
 - doc/images/icons/prev.png
 - doc/images/icons/callouts
 - doc/images/icons/example.png
+- doc/rdoc/files/README.html
+- doc/rdoc/files/DEVELOPERS_TXT.html
+- doc/rdoc/files/ext
+- doc/rdoc/files/lib
+- doc/rdoc/classes/Passenger
+- doc/rdoc/classes/Exception.html
+- doc/rdoc/classes/ConditionVariable.html
+- doc/rdoc/classes/RakeExtensions.html
+- doc/rdoc/classes/GC.html
+- doc/rdoc/classes/IO.html
+- doc/rdoc/classes/Passenger.html
+- doc/rdoc/classes/PlatformInfo.html
 - doc/images/icons/callouts/10.png
 - doc/images/icons/callouts/12.png
 - doc/images/icons/callouts/3.png
@@ -159,6 +378,43 @@ files:
 - doc/images/icons/callouts/13.png
 - doc/images/icons/callouts/15.png
 - doc/images/icons/callouts/14.png
+- doc/rdoc/files/ext/passenger
+- doc/rdoc/files/lib/rake
+- doc/rdoc/files/lib/passenger
+- doc/rdoc/classes/Passenger/InitializationError.html
+- doc/rdoc/classes/Passenger/AbstractServer.html
+- doc/rdoc/classes/Passenger/HTMLTemplate.html
+- doc/rdoc/classes/Passenger/AbstractServer
+- doc/rdoc/classes/Passenger/SpawnManager.html
+- doc/rdoc/classes/Passenger/Application.html
+- doc/rdoc/classes/Passenger/MessageChannel.html
+- doc/rdoc/classes/Passenger/Utils.html
+- doc/rdoc/classes/Passenger/NativeSupport.html
+- doc/rdoc/classes/Passenger/AbstractRequestHandler.html
+- doc/rdoc/classes/Passenger/AppInitError.html
+- doc/rdoc/classes/Passenger/UnknownError.html
+- doc/rdoc/classes/Passenger/FrameworkInitError.html
+- doc/rdoc/classes/Passenger/ConsoleTextTemplate.html
+- doc/rdoc/classes/Passenger/VersionNotFound.html
+- doc/rdoc/files/ext/passenger/native_support_c.html
+- doc/rdoc/files/lib/rake/extensions_rb.html
+- doc/rdoc/files/lib/passenger/spawn_manager_rb.html
+- doc/rdoc/files/lib/passenger/console_text_template_rb.html
+- doc/rdoc/files/lib/passenger/exceptions_rb.html
+- doc/rdoc/files/lib/passenger/abstract_server_rb.html
+- doc/rdoc/files/lib/passenger/application_rb.html
+- doc/rdoc/files/lib/passenger/message_channel_rb.html
+- doc/rdoc/files/lib/passenger/dependencies_rb.html
+- doc/rdoc/files/lib/passenger/constants_rb.html
+- doc/rdoc/files/lib/passenger/platform_info_rb.html
+- doc/rdoc/files/lib/passenger/utils_rb.html
+- doc/rdoc/files/lib/passenger/simple_benchmarking_rb.html
+- doc/rdoc/files/lib/passenger/html_template_rb.html
+- doc/rdoc/files/lib/passenger/abstract_request_handler_rb.html
+- doc/rdoc/classes/Passenger/AbstractServer/ServerAlreadyStarted.html
+- doc/rdoc/classes/Passenger/AbstractServer/UnknownMessage.html
+- doc/rdoc/classes/Passenger/AbstractServer/ServerNotStarted.html
+- doc/rdoc/classes/Passenger/AbstractServer/ServerError.html
 - man/passenger-memory-stats.8
 - man/passenger-config.1
 - man/passenger-status.8
@@ -776,6 +1032,7 @@ files:
 - test/ruby/spawn_server_spec.rb
 - test/ruby/rails
 - test/ruby/abstract_server_spec.rb
+- test/ruby/utils_spec.rb
 - test/ruby/rack/application_spawner_spec.rb
 - test/ruby/rails/framework_spawner_spec.rb
 - test/ruby/rails/application_spawner_spec.rb
@@ -1077,7 +1334,7 @@ requirements:
 - fastthread
 - Apache 2 with development headers
 rubyforge_project: passenger
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Apache module for Ruby on Rails support.