passenger 2.0.6 → 2.1.2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of passenger might be problematic. Click here for more details.
- data/DEVELOPERS.TXT +10 -4
- data/LICENSE +1 -1
- data/NEWS +0 -0
- data/Rakefile +183 -117
- data/benchmark/dispatcher.rb +5 -9
- data/bin/passenger-install-apache2-module +52 -18
- data/bin/passenger-memory-stats +67 -13
- data/bin/passenger-spawn-server +8 -4
- data/bin/passenger-status +21 -46
- data/bin/passenger-stress-test +5 -5
- data/debian/postinst +1 -1
- data/doc/ApplicationPool algorithm.txt +180 -128
- data/doc/Architectural overview.html +1 -778
- data/doc/Security of user switching support.html +1 -643
- data/doc/Users guide Apache.html +3127 -0
- data/doc/Users guide Nginx.html +1458 -0
- data/doc/Users guide.html +1404 -467
- data/doc/Users guide.txt +843 -105
- data/doc/cxxapi/ApplicationPoolServer_8h-source.html +751 -641
- data/doc/cxxapi/ApplicationPool_8h-source.html +168 -171
- data/doc/cxxapi/Application_8h-source.html +494 -394
- data/doc/cxxapi/Bucket_8h-source.html +21 -15
- data/doc/cxxapi/CachedFileStat_8h-source.html +191 -0
- data/doc/cxxapi/Configuration_8h-source.html +311 -149
- data/doc/cxxapi/DirectoryMapper_8h-source.html +309 -0
- data/doc/cxxapi/DummySpawnManager_8h-source.html +3 -4
- data/doc/cxxapi/Exceptions_8h-source.html +182 -165
- data/doc/cxxapi/FileChecker_8h-source.html +130 -0
- data/doc/cxxapi/Hooks_8h-source.html +2 -3
- data/doc/cxxapi/Logging_8h-source.html +92 -89
- data/doc/cxxapi/MessageChannel_8h-source.html +585 -477
- data/doc/cxxapi/PoolOptions_8h-source.html +305 -0
- data/doc/cxxapi/SpawnManager_8h-source.html +515 -540
- data/doc/cxxapi/StandardApplicationPool_8h-source.html +779 -679
- data/doc/cxxapi/SystemTime_8h-source.html +104 -0
- data/doc/cxxapi/Utils_8h-source.html +331 -227
- data/doc/cxxapi/annotated.html +6 -7
- data/doc/cxxapi/classClient-members.html +1 -2
- data/doc/cxxapi/classClient.html +1 -2
- data/doc/cxxapi/classHooks-members.html +5 -2
- data/doc/cxxapi/classHooks.html +112 -2
- data/doc/cxxapi/classPassenger_1_1Application-members.html +2 -3
- data/doc/cxxapi/classPassenger_1_1Application.html +8 -9
- data/doc/cxxapi/classPassenger_1_1ApplicationPool-members.html +4 -4
- data/doc/cxxapi/classPassenger_1_1ApplicationPool.html +42 -81
- data/doc/cxxapi/classPassenger_1_1ApplicationPoolServer-members.html +1 -2
- data/doc/cxxapi/classPassenger_1_1ApplicationPoolServer.html +3 -4
- data/doc/cxxapi/classPassenger_1_1ApplicationPool__inherit__graph.png +0 -0
- data/doc/cxxapi/classPassenger_1_1Application_1_1Session-members.html +3 -2
- data/doc/cxxapi/classPassenger_1_1Application_1_1Session.html +74 -3
- data/doc/cxxapi/classPassenger_1_1BusyException-members.html +1 -2
- data/doc/cxxapi/classPassenger_1_1BusyException.html +2 -3
- data/doc/cxxapi/classPassenger_1_1ConfigurationException-members.html +1 -2
- data/doc/cxxapi/classPassenger_1_1ConfigurationException.html +2 -3
- data/doc/cxxapi/classPassenger_1_1DirectoryMapper-members.html +38 -0
- data/doc/cxxapi/classPassenger_1_1DirectoryMapper.html +256 -0
- data/doc/cxxapi/classPassenger_1_1DummySpawnManager-members.html +1 -2
- data/doc/cxxapi/classPassenger_1_1DummySpawnManager.html +2 -3
- data/doc/cxxapi/{classPassenger_1_1Thread-members.html → classPassenger_1_1FileChecker-members.html} +4 -5
- data/doc/cxxapi/classPassenger_1_1FileChecker.html +121 -0
- data/doc/cxxapi/classPassenger_1_1FileNotFoundException-members.html +1 -2
- data/doc/cxxapi/classPassenger_1_1FileNotFoundException.html +2 -3
- data/doc/cxxapi/classPassenger_1_1FileNotFoundException__inherit__graph.png +0 -0
- data/doc/cxxapi/classPassenger_1_1FileSystemException-members.html +2 -3
- data/doc/cxxapi/classPassenger_1_1FileSystemException.html +2 -3
- data/doc/cxxapi/classPassenger_1_1FileSystemException__inherit__graph.png +0 -0
- data/doc/cxxapi/classPassenger_1_1IOException-members.html +1 -2
- data/doc/cxxapi/classPassenger_1_1IOException.html +2 -3
- data/doc/cxxapi/classPassenger_1_1IOException__inherit__graph.png +0 -0
- data/doc/cxxapi/classPassenger_1_1MessageChannel-members.html +5 -2
- data/doc/cxxapi/classPassenger_1_1MessageChannel.html +155 -5
- data/doc/cxxapi/{classboost_1_1this__thread_1_1enable__syscall__interruption-members.html → classPassenger_1_1RuntimeException-members.html} +2 -3
- data/doc/cxxapi/{classboost_1_1this__thread_1_1enable__syscall__interruption.html → classPassenger_1_1RuntimeException.html} +10 -8
- data/doc/cxxapi/classPassenger_1_1SpawnException-members.html +1 -2
- data/doc/cxxapi/classPassenger_1_1SpawnException.html +2 -3
- data/doc/cxxapi/classPassenger_1_1SpawnManager-members.html +2 -3
- data/doc/cxxapi/classPassenger_1_1SpawnManager.html +15 -56
- data/doc/cxxapi/classPassenger_1_1StandardApplicationPool-members.html +5 -4
- data/doc/cxxapi/classPassenger_1_1StandardApplicationPool.html +20 -81
- data/doc/cxxapi/classPassenger_1_1StandardApplicationPool__inherit__graph.png +0 -0
- data/doc/cxxapi/classPassenger_1_1SystemException-members.html +2 -3
- data/doc/cxxapi/classPassenger_1_1SystemException.html +9 -10
- data/doc/cxxapi/classPassenger_1_1SystemException__inherit__graph.png +0 -0
- data/doc/cxxapi/{classboost_1_1this__thread_1_1disable__syscall__interruption-members.html → classPassenger_1_1SystemTime-members.html} +5 -3
- data/doc/cxxapi/classPassenger_1_1SystemTime.html +86 -0
- data/doc/cxxapi/classPassenger_1_1TempFile-members.html +2 -3
- data/doc/cxxapi/classPassenger_1_1TempFile.html +17 -9
- data/doc/cxxapi/definitions_8h-source.html +1 -2
- data/doc/cxxapi/files.html +6 -3
- data/doc/cxxapi/functions.html +98 -35
- data/doc/cxxapi/functions_func.html +60 -32
- data/doc/cxxapi/functions_type.html +1 -2
- data/doc/cxxapi/functions_vars.html +27 -2
- data/doc/cxxapi/graph_legend.html +1 -2
- data/doc/cxxapi/graph_legend.png +0 -0
- data/doc/cxxapi/group__Configuration.html +3 -4
- data/doc/cxxapi/group__Configuration.png +0 -0
- data/doc/cxxapi/group__Core.html +3 -4
- data/doc/cxxapi/group__Core.png +0 -0
- data/doc/cxxapi/group__Exceptions.html +4 -2
- data/doc/cxxapi/group__Hooks.html +1 -6
- data/doc/cxxapi/group__Hooks.png +0 -0
- data/doc/cxxapi/group__Support.html +259 -36
- data/doc/cxxapi/hierarchy.html +6 -7
- data/doc/cxxapi/inherit__graph__0.map +1 -1
- data/doc/cxxapi/inherit__graph__0.md5 +1 -1
- data/doc/cxxapi/inherit__graph__0.png +0 -0
- data/doc/cxxapi/inherit__graph__1.map +1 -1
- data/doc/cxxapi/inherit__graph__1.md5 +1 -1
- data/doc/cxxapi/inherit__graph__1.png +0 -0
- data/doc/cxxapi/inherit__graph__10.map +1 -1
- data/doc/cxxapi/inherit__graph__10.md5 +1 -1
- data/doc/cxxapi/inherit__graph__10.png +0 -0
- data/doc/cxxapi/inherit__graph__11.map +1 -1
- data/doc/cxxapi/inherit__graph__11.md5 +1 -1
- data/doc/cxxapi/inherit__graph__11.png +0 -0
- data/doc/cxxapi/inherit__graph__12.map +2 -1
- data/doc/cxxapi/inherit__graph__12.md5 +1 -1
- data/doc/cxxapi/inherit__graph__12.png +0 -0
- data/doc/cxxapi/inherit__graph__13.map +1 -1
- data/doc/cxxapi/inherit__graph__13.md5 +1 -1
- data/doc/cxxapi/inherit__graph__13.png +0 -0
- data/doc/cxxapi/inherit__graph__14.map +1 -2
- data/doc/cxxapi/inherit__graph__14.md5 +1 -1
- data/doc/cxxapi/inherit__graph__14.png +0 -0
- data/doc/cxxapi/inherit__graph__15.map +1 -1
- data/doc/cxxapi/inherit__graph__15.md5 +1 -1
- data/doc/cxxapi/inherit__graph__15.png +0 -0
- data/doc/cxxapi/inherit__graph__16.map +1 -1
- data/doc/cxxapi/inherit__graph__16.md5 +1 -1
- data/doc/cxxapi/inherit__graph__16.png +0 -0
- data/doc/cxxapi/inherit__graph__17.png +0 -0
- data/doc/cxxapi/inherit__graph__18.png +0 -0
- data/doc/cxxapi/inherit__graph__19.png +0 -0
- data/doc/cxxapi/inherit__graph__2.map +1 -1
- data/doc/cxxapi/inherit__graph__2.md5 +1 -1
- data/doc/cxxapi/inherit__graph__2.png +0 -0
- data/doc/cxxapi/inherit__graph__20.map +1 -1
- data/doc/cxxapi/inherit__graph__20.md5 +1 -1
- data/doc/cxxapi/inherit__graph__20.png +0 -0
- data/doc/cxxapi/inherit__graph__21.map +1 -1
- data/doc/cxxapi/inherit__graph__21.md5 +1 -1
- data/doc/cxxapi/inherit__graph__21.png +0 -0
- data/doc/cxxapi/inherit__graph__3.map +1 -1
- data/doc/cxxapi/inherit__graph__3.md5 +1 -1
- data/doc/cxxapi/inherit__graph__3.png +0 -0
- data/doc/cxxapi/inherit__graph__4.map +1 -1
- data/doc/cxxapi/inherit__graph__4.md5 +1 -1
- data/doc/cxxapi/inherit__graph__4.png +0 -0
- data/doc/cxxapi/inherit__graph__5.map +2 -1
- data/doc/cxxapi/inherit__graph__5.md5 +1 -1
- data/doc/cxxapi/inherit__graph__5.png +0 -0
- data/doc/cxxapi/inherit__graph__6.map +1 -1
- data/doc/cxxapi/inherit__graph__6.md5 +1 -1
- data/doc/cxxapi/inherit__graph__6.png +0 -0
- data/doc/cxxapi/inherit__graph__7.map +1 -1
- data/doc/cxxapi/inherit__graph__7.md5 +1 -1
- data/doc/cxxapi/inherit__graph__7.png +0 -0
- data/doc/cxxapi/inherit__graph__8.map +1 -1
- data/doc/cxxapi/inherit__graph__8.md5 +1 -1
- data/doc/cxxapi/inherit__graph__8.png +0 -0
- data/doc/cxxapi/inherit__graph__9.map +1 -2
- data/doc/cxxapi/inherit__graph__9.md5 +1 -1
- data/doc/cxxapi/inherit__graph__9.png +0 -0
- data/doc/cxxapi/inherits.html +30 -31
- data/doc/cxxapi/main.html +1 -2
- data/doc/cxxapi/modules.html +1 -2
- data/doc/cxxapi/structPassenger_1_1AnythingToString-members.html +1 -2
- data/doc/cxxapi/structPassenger_1_1AnythingToString.html +2 -3
- data/doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4-members.html +1 -2
- data/doc/cxxapi/structPassenger_1_1AnythingToString_3_01vector_3_01string_01_4_01_4.html +2 -3
- data/doc/cxxapi/structPassenger_1_1PoolOptions-members.html +49 -0
- data/doc/cxxapi/structPassenger_1_1PoolOptions.html +404 -0
- data/doc/cxxapi/tree.html +18 -20
- data/doc/images/conservative_spawning.png +0 -0
- data/doc/images/conservative_spawning.svg +248 -0
- data/doc/images/smart-lv2.png +0 -0
- data/doc/images/smart-lv2.svg +320 -0
- data/doc/rdoc/classes/ConditionVariable.html +68 -34
- data/doc/rdoc/classes/Exception.html +16 -16
- data/doc/rdoc/classes/GC.html +9 -9
- data/doc/rdoc/classes/IO.html +36 -17
- data/doc/rdoc/classes/PhusionPassenger.html +183 -0
- data/doc/rdoc/classes/PhusionPassenger/AbstractRequestHandler.html +511 -0
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/AbstractServer.html +285 -242
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/AbstractServer/ServerAlreadyStarted.html +3 -3
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/AbstractServer/ServerError.html +3 -3
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/AbstractServer/ServerNotStarted.html +3 -3
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/AbstractServer/UnknownMessage.html +3 -3
- data/doc/rdoc/classes/PhusionPassenger/AbstractServerCollection.html +598 -0
- data/doc/rdoc/classes/PhusionPassenger/AdminTools.html +140 -0
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/ControlProcess.html +247 -0
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/ControlProcess/Instance.html +138 -0
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/AppInitError.html +36 -19
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/Application.html +81 -96
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/ConsoleTextTemplate.html +18 -18
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/FrameworkInitError.html +20 -18
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/HTMLTemplate.html +18 -18
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/InitializationError.html +9 -9
- data/doc/rdoc/classes/PhusionPassenger/InvalidPath.html +92 -0
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/MessageChannel.html +93 -92
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/NativeSupport.html +55 -25
- data/doc/rdoc/classes/PhusionPassenger/Rack.html +91 -0
- data/doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner.html +185 -0
- data/doc/rdoc/classes/PhusionPassenger/Rack/RequestHandler.html +182 -0
- data/doc/rdoc/classes/PhusionPassenger/Railz.html +95 -0
- data/doc/rdoc/classes/PhusionPassenger/Railz/ApplicationSpawner.html +424 -0
- data/doc/rdoc/classes/PhusionPassenger/Railz/ApplicationSpawner/Error.html +98 -0
- data/doc/rdoc/classes/PhusionPassenger/Railz/CGIFixed.html +200 -0
- data/doc/rdoc/classes/PhusionPassenger/Railz/FrameworkSpawner.html +444 -0
- data/doc/rdoc/classes/PhusionPassenger/Railz/FrameworkSpawner/Error.html +98 -0
- data/doc/rdoc/classes/PhusionPassenger/Railz/RequestHandler.html +154 -0
- data/doc/rdoc/classes/PhusionPassenger/SpawnManager.html +408 -0
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/UnknownError.html +13 -13
- data/doc/rdoc/classes/PhusionPassenger/Utils.html +687 -0
- data/doc/rdoc/classes/{Passenger → PhusionPassenger}/VersionNotFound.html +8 -8
- data/doc/rdoc/classes/PhusionPassenger/WSGI.html +89 -0
- data/doc/rdoc/classes/PhusionPassenger/WSGI/ApplicationSpawner.html +188 -0
- data/doc/rdoc/classes/PlatformInfo.html +663 -159
- data/doc/rdoc/classes/RakeExtensions.html +4 -4
- data/doc/rdoc/classes/Signal.html +134 -0
- data/doc/rdoc/created.rid +1 -1
- data/doc/rdoc/files/DEVELOPERS_TXT.html +15 -10
- data/doc/rdoc/files/README.html +5 -7
- data/doc/rdoc/files/ext/{passenger → phusion_passenger}/native_support_c.html +2 -2
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/abstract_request_handler_rb.html +7 -9
- data/doc/rdoc/files/lib/phusion_passenger/abstract_server_collection_rb.html +120 -0
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/abstract_server_rb.html +7 -10
- data/doc/rdoc/files/lib/phusion_passenger/admin_tools/control_process_rb.html +99 -0
- data/doc/rdoc/files/lib/phusion_passenger/admin_tools_rb.html +92 -0
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/application_rb.html +6 -8
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/console_text_template_rb.html +5 -7
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/constants_rb.html +4 -5
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/dependencies_rb.html +6 -8
- data/doc/rdoc/files/lib/phusion_passenger/events_rb.html +116 -0
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/exceptions_rb.html +5 -7
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/html_template_rb.html +5 -7
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/message_channel_rb.html +5 -7
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/platform_info_rb.html +6 -7
- data/doc/rdoc/files/lib/phusion_passenger/rack/application_spawner_rb.html +123 -0
- data/doc/rdoc/files/lib/phusion_passenger/rack/request_handler_rb.html +117 -0
- data/doc/rdoc/files/lib/{passenger/utils_rb.html → phusion_passenger/railz/application_spawner_rb.html} +24 -17
- data/doc/rdoc/files/lib/phusion_passenger/railz/cgi_fixed_rb.html +126 -0
- data/doc/rdoc/files/lib/phusion_passenger/railz/framework_spawner_rb.html +139 -0
- data/doc/rdoc/files/lib/phusion_passenger/railz/request_handler_rb.html +118 -0
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/simple_benchmarking_rb.html +5 -7
- data/doc/rdoc/files/lib/{passenger → phusion_passenger}/spawn_manager_rb.html +40 -24
- data/doc/rdoc/files/lib/phusion_passenger/utils_rb.html +169 -0
- data/doc/rdoc/files/lib/phusion_passenger/wsgi/application_spawner_rb.html +120 -0
- data/doc/rdoc/files/lib/rake/extensions_rb.html +3 -4
- data/doc/rdoc/fr_class_index.html +37 -19
- data/doc/rdoc/fr_file_index.html +25 -14
- data/doc/rdoc/fr_method_index.html +145 -74
- data/ext/apache2/Application.h +145 -44
- data/ext/apache2/ApplicationPool.h +27 -29
- data/ext/apache2/ApplicationPoolServer.h +183 -72
- data/ext/apache2/ApplicationPoolServerExecutable.cpp +249 -42
- data/ext/apache2/Bucket.cpp +61 -9
- data/ext/apache2/Bucket.h +15 -8
- data/ext/apache2/CachedFileStat.cpp +114 -0
- data/ext/apache2/CachedFileStat.h +169 -0
- data/ext/apache2/Configuration.cpp +213 -22
- data/ext/apache2/Configuration.h +176 -13
- data/ext/apache2/DirectoryMapper.h +287 -0
- data/ext/apache2/Exceptions.h +30 -12
- data/ext/apache2/FileChecker.h +108 -0
- data/ext/apache2/Hooks.cpp +709 -493
- data/ext/apache2/LICENSE-CNRI.TXT +15 -0
- data/ext/apache2/Logging.h +26 -22
- data/ext/apache2/MessageChannel.h +124 -15
- data/ext/apache2/PoolOptions.h +283 -0
- data/ext/apache2/SpawnManager.h +75 -99
- data/ext/apache2/StandardApplicationPool.h +296 -195
- data/ext/apache2/SystemTime.cpp +28 -0
- data/ext/apache2/SystemTime.h +82 -0
- data/ext/apache2/Utils.cpp +172 -18
- data/ext/apache2/Utils.h +124 -19
- data/ext/boost/cstdint.hpp +4 -2
- data/ext/boost/current_function.hpp +67 -0
- data/ext/boost/detail/sp_counted_base.hpp +4 -4
- data/ext/boost/thread/exceptions.hpp +2 -1
- data/ext/boost/thread/pthread/thread.hpp +11 -3
- data/ext/boost/thread/pthread/thread_data.hpp +2 -1
- data/ext/oxt/backtrace.cpp +172 -0
- data/ext/oxt/backtrace.hpp +135 -0
- data/ext/oxt/detail/backtrace_disabled.hpp +39 -0
- data/ext/oxt/detail/backtrace_enabled.hpp +155 -0
- data/ext/oxt/detail/spin_lock_gcc_x86.hpp +82 -0
- data/ext/oxt/detail/spin_lock_portable.hpp +38 -0
- data/ext/oxt/detail/spin_lock_pthreads.hpp +97 -0
- data/ext/oxt/detail/tracable_exception_disabled.hpp +46 -0
- data/ext/oxt/detail/tracable_exception_enabled.hpp +48 -0
- data/ext/oxt/macros.hpp +58 -0
- data/ext/oxt/spin_lock.hpp +55 -0
- data/ext/{apache2/System.cpp → oxt/system_calls.cpp} +87 -52
- data/ext/oxt/system_calls.hpp +234 -0
- data/ext/oxt/thread.cpp +32 -0
- data/ext/oxt/thread.hpp +223 -0
- data/ext/oxt/tracable_exception.cpp +87 -0
- data/ext/oxt/tracable_exception.hpp +35 -0
- data/{lib/passenger/constants.rb → ext/phusion_passenger/extconf.rb} +14 -9
- data/ext/{passenger → phusion_passenger}/native_support.c +33 -6
- data/lib/{passenger → phusion_passenger}/abstract_request_handler.rb +209 -93
- data/lib/{passenger → phusion_passenger}/abstract_server.rb +23 -8
- data/lib/phusion_passenger/abstract_server_collection.rb +301 -0
- data/lib/phusion_passenger/admin_tools.rb +25 -0
- data/lib/phusion_passenger/admin_tools/control_process.rb +107 -0
- data/lib/{passenger → phusion_passenger}/application.rb +13 -16
- data/lib/{passenger → phusion_passenger}/console_text_template.rb +2 -2
- data/{ext/passenger/extconf.rb → lib/phusion_passenger/constants.rb} +5 -5
- data/lib/{passenger → phusion_passenger}/dependencies.rb +38 -32
- data/lib/phusion_passenger/events.rb +45 -0
- data/lib/{passenger → phusion_passenger}/exceptions.rb +12 -5
- data/lib/{passenger → phusion_passenger}/html_template.rb +2 -2
- data/lib/{passenger → phusion_passenger}/message_channel.rb +3 -2
- data/lib/phusion_passenger/platform_info.rb +500 -0
- data/lib/{passenger → phusion_passenger}/rack/application_spawner.rb +29 -22
- data/lib/{passenger → phusion_passenger}/rack/request_handler.rb +14 -9
- data/lib/{passenger → phusion_passenger}/railz/application_spawner.rb +94 -74
- data/lib/{passenger → phusion_passenger}/railz/cgi_fixed.rb +2 -2
- data/lib/{passenger → phusion_passenger}/railz/framework_spawner.rb +86 -98
- data/lib/{passenger → phusion_passenger}/railz/request_handler.rb +6 -6
- data/lib/{passenger → phusion_passenger}/simple_benchmarking.rb +0 -0
- data/lib/{passenger → phusion_passenger}/spawn_manager.rb +136 -128
- data/lib/{passenger → phusion_passenger}/templates/apache2_config_snippets.txt.erb +0 -0
- data/lib/{passenger → phusion_passenger}/templates/apache_must_be_compiled_with_compatible_mpm.txt.erb +0 -0
- data/lib/phusion_passenger/templates/app_exited_during_initialization.html.erb +38 -0
- data/lib/{passenger → phusion_passenger}/templates/app_init_error.html.erb +0 -0
- data/lib/{passenger → phusion_passenger}/templates/database_error.html.erb +0 -0
- data/lib/{passenger → phusion_passenger}/templates/deployment_example.txt.erb +1 -1
- data/lib/{passenger → phusion_passenger}/templates/error_layout.css +0 -0
- data/lib/{passenger → phusion_passenger}/templates/error_layout.html.erb +0 -0
- data/lib/{passenger → phusion_passenger}/templates/framework_init_error.html.erb +0 -0
- data/lib/{passenger → phusion_passenger}/templates/general_error.html.erb +0 -0
- data/lib/{passenger → phusion_passenger}/templates/invalid_app_root.html.erb +1 -1
- data/lib/{passenger → phusion_passenger}/templates/load_error.html.erb +0 -0
- data/lib/{passenger → phusion_passenger}/templates/no_write_permission_to_passenger_root.txt.erb +0 -0
- data/lib/{passenger → phusion_passenger}/templates/possible_solutions_for_compilation_and_installation_problems.txt.erb +0 -0
- data/lib/{passenger → phusion_passenger}/templates/run_installer_as_root.txt.erb +0 -0
- data/lib/{passenger → phusion_passenger}/templates/version_not_found.html.erb +0 -0
- data/lib/{passenger → phusion_passenger}/templates/welcome.txt.erb +0 -0
- data/lib/{passenger → phusion_passenger}/utils.rb +210 -44
- data/lib/{passenger → phusion_passenger}/wsgi/application_spawner.rb +18 -15
- data/lib/{passenger → phusion_passenger}/wsgi/request_handler.py +7 -1
- data/man/passenger-memory-stats.8 +1 -1
- data/misc/render_error_pages.rb +1 -1
- data/test/ApplicationPoolServerTest.cpp +0 -28
- data/test/ApplicationPoolServer_ApplicationPoolTest.cpp +4 -0
- data/test/ApplicationPoolTest.cpp +307 -69
- data/test/CachedFileStatTest.cpp +262 -0
- data/test/FileCheckerTest.cpp +79 -0
- data/test/MessageChannelTest.cpp +3 -3
- data/test/PoolOptionsTest.cpp +37 -0
- data/test/SpawnManagerTest.cpp +4 -4
- data/test/StandardApplicationPoolTest.cpp +4 -0
- data/test/SystemTimeTest.cpp +37 -0
- data/test/UtilsTest.cpp +137 -0
- data/test/integration_tests.rb +270 -23
- data/test/oxt/backtrace_test.cpp +128 -0
- data/test/oxt/oxt_test_main.cpp +25 -0
- data/test/oxt/syscall_interruption_test.cpp +50 -0
- data/test/ruby/abstract_request_handler_spec.rb +83 -0
- data/test/ruby/abstract_server_collection_spec.rb +246 -0
- data/test/ruby/application_spec.rb +3 -3
- data/test/ruby/message_channel_spec.rb +2 -2
- data/test/ruby/rack/application_spawner_spec.rb +3 -5
- data/test/ruby/rails/application_spawner_spec.rb +54 -15
- data/test/ruby/rails/framework_spawner_spec.rb +6 -8
- data/test/ruby/rails/minimal_spawner_spec.rb +29 -0
- data/test/ruby/rails/spawner_error_handling_spec.rb +1 -1
- data/test/ruby/rails/spawner_privilege_lowering_spec.rb +3 -3
- data/test/ruby/spawn_manager_spec.rb +23 -12
- data/test/ruby/utils_spec.rb +36 -2
- data/test/ruby/wsgi/application_spawner_spec.rb +47 -0
- data/test/stub/apache2/httpd.conf.erb +3 -5
- data/test/stub/message_channel.rb +2 -2
- data/test/stub/message_channel_2.rb +2 -2
- data/test/stub/message_channel_3.rb +3 -3
- data/test/stub/minimal-railsapp/README +0 -0
- data/test/stub/minimal-railsapp/config/application.rb +0 -0
- data/test/stub/minimal-railsapp/config/environment.rb +0 -0
- data/test/stub/minimal-railsapp/vendor/rails/actionmailer/lib/action_mailer.rb +0 -0
- data/test/stub/minimal-railsapp/vendor/rails/actionpack/lib/action_controller.rb +0 -0
- data/test/stub/minimal-railsapp/vendor/rails/actionpack/lib/action_pack.rb +0 -0
- data/test/stub/minimal-railsapp/vendor/rails/actionpack/lib/action_view.rb +0 -0
- data/test/stub/minimal-railsapp/vendor/rails/activerecord/lib/active_record.rb +0 -0
- data/test/stub/minimal-railsapp/vendor/rails/activeresource/lib/active_resource.rb +0 -0
- data/test/stub/minimal-railsapp/vendor/rails/activesupport/lib/active_support.rb +0 -0
- data/test/stub/minimal-railsapp/vendor/rails/activesupport/lib/active_support/whiny_nil.rb +0 -0
- data/test/stub/minimal-railsapp/vendor/rails/railties/lib/dispatcher.rb +0 -0
- data/test/stub/minimal-railsapp/vendor/rails/railties/lib/initializer.rb +0 -0
- data/test/stub/minimal-railsapp/vendor/rails/railties/lib/ruby_version_check.rb +0 -0
- data/test/stub/rails_apps/foobar/app/controllers/foo_controller.rb +8 -0
- data/test/stub/rails_apps/foobar/config/environments/development.rb +1 -2
- data/test/stub/rails_apps/mycook/app/controllers/welcome_controller.rb +21 -1
- data/test/stub/rails_apps/mycook/sites/some.site/public/uploads.html +26 -0
- data/test/stub/rails_apps/mycook/sites/some.site/public/welcome/cached.html +26 -0
- data/test/stub/railsapp/app/controllers/application.rb +0 -0
- data/test/stub/railsapp/app/controllers/bar_controller_1.rb +0 -0
- data/test/stub/railsapp/app/controllers/bar_controller_2.rb +1 -1
- data/test/stub/railsapp/app/controllers/foo_controller.rb +4 -0
- data/test/stub/railsapp/app/helpers/application_helper.rb +0 -0
- data/test/stub/railsapp/config/boot.rb +0 -0
- data/test/stub/railsapp/config/database.yml +0 -0
- data/test/stub/railsapp/config/environment.rb +0 -0
- data/test/stub/railsapp/config/environments/development.rb +0 -0
- data/test/stub/railsapp/config/environments/production.rb +0 -0
- data/test/stub/railsapp/config/initializers/inflections.rb +0 -0
- data/test/stub/railsapp/config/initializers/mime_types.rb +0 -0
- data/test/stub/railsapp/config/routes.rb +0 -0
- data/test/stub/railsapp/public/useless.txt +0 -0
- data/test/stub/spawn_server.rb +3 -4
- data/test/stub/wsgi/passenger_wsgi.pyc +0 -0
- data/test/support/apache2_controller.rb +57 -7
- data/test/support/tut.h +15 -0
- data/vendor/README +12 -0
- data/vendor/README_FOR_PACKAGERS +1 -0
- data/vendor/rack-0.9.1/AUTHORS +8 -0
- data/vendor/rack-0.9.1/COPYING +18 -0
- data/vendor/rack-0.9.1/ChangeLog +1423 -0
- data/vendor/rack-0.9.1/KNOWN-ISSUES +18 -0
- data/vendor/rack-0.9.1/README +306 -0
- data/vendor/rack-0.9.1/Rakefile +188 -0
- data/vendor/rack-0.9.1/SPEC +129 -0
- data/vendor/rack-0.9.1/lib/rack.rb +86 -0
- data/vendor/rack-0.9.1/lib/rack/adapter/camping.rb +22 -0
- data/vendor/rack-0.9.1/lib/rack/auth/abstract/handler.rb +28 -0
- data/vendor/rack-0.9.1/lib/rack/auth/abstract/request.rb +37 -0
- data/vendor/rack-0.9.1/lib/rack/auth/basic.rb +58 -0
- data/vendor/rack-0.9.1/lib/rack/auth/digest/md5.rb +124 -0
- data/vendor/rack-0.9.1/lib/rack/auth/digest/nonce.rb +51 -0
- data/vendor/rack-0.9.1/lib/rack/auth/digest/params.rb +55 -0
- data/vendor/rack-0.9.1/lib/rack/auth/digest/request.rb +40 -0
- data/vendor/rack-0.9.1/lib/rack/auth/openid.rb +438 -0
- data/vendor/rack-0.9.1/lib/rack/builder.rb +67 -0
- data/vendor/rack-0.9.1/lib/rack/cascade.rb +36 -0
- data/vendor/rack-0.9.1/lib/rack/commonlogger.rb +61 -0
- data/vendor/rack-0.9.1/lib/rack/conditionalget.rb +43 -0
- data/vendor/rack-0.9.1/lib/rack/content_length.rb +25 -0
- data/vendor/rack-0.9.1/lib/rack/deflater.rb +87 -0
- data/vendor/rack-0.9.1/lib/rack/directory.rb +150 -0
- data/vendor/rack-0.9.1/lib/rack/file.rb +85 -0
- data/vendor/rack-0.9.1/lib/rack/handler.rb +48 -0
- data/vendor/rack-0.9.1/lib/rack/handler/cgi.rb +57 -0
- data/vendor/rack-0.9.1/lib/rack/handler/evented_mongrel.rb +8 -0
- data/vendor/rack-0.9.1/lib/rack/handler/fastcgi.rb +86 -0
- data/vendor/rack-0.9.1/lib/rack/handler/lsws.rb +52 -0
- data/vendor/rack-0.9.1/lib/rack/handler/mongrel.rb +82 -0
- data/vendor/rack-0.9.1/lib/rack/handler/scgi.rb +57 -0
- data/vendor/rack-0.9.1/lib/rack/handler/swiftiplied_mongrel.rb +8 -0
- data/vendor/rack-0.9.1/lib/rack/handler/thin.rb +15 -0
- data/vendor/rack-0.9.1/lib/rack/handler/webrick.rb +61 -0
- data/vendor/rack-0.9.1/lib/rack/head.rb +19 -0
- data/vendor/rack-0.9.1/lib/rack/lint.rb +465 -0
- data/vendor/rack-0.9.1/lib/rack/lobster.rb +65 -0
- data/vendor/rack-0.9.1/lib/rack/methodoverride.rb +27 -0
- data/vendor/rack-0.9.1/lib/rack/mime.rb +204 -0
- data/vendor/rack-0.9.1/lib/rack/mock.rb +160 -0
- data/vendor/rack-0.9.1/lib/rack/recursive.rb +57 -0
- data/vendor/rack-0.9.1/lib/rack/reloader.rb +64 -0
- data/vendor/rack-0.9.1/lib/rack/request.rb +218 -0
- data/vendor/rack-0.9.1/lib/rack/response.rb +171 -0
- data/vendor/rack-0.9.1/lib/rack/session/abstract/id.rb +153 -0
- data/vendor/rack-0.9.1/lib/rack/session/cookie.rb +89 -0
- data/vendor/rack-0.9.1/lib/rack/session/memcache.rb +97 -0
- data/vendor/rack-0.9.1/lib/rack/session/pool.rb +73 -0
- data/vendor/rack-0.9.1/lib/rack/showexceptions.rb +348 -0
- data/vendor/rack-0.9.1/lib/rack/showstatus.rb +106 -0
- data/vendor/rack-0.9.1/lib/rack/static.rb +38 -0
- data/vendor/rack-0.9.1/lib/rack/urlmap.rb +48 -0
- data/vendor/rack-0.9.1/lib/rack/utils.rb +347 -0
- metadata +1197 -1055
- data/doc/cxxapi/System_8h-source.html +0 -251
- data/doc/cxxapi/classDirectoryMapper-members.html +0 -38
- data/doc/cxxapi/classDirectoryMapper.html +0 -203
- data/doc/cxxapi/classPassenger_1_1Thread.html +0 -100
- data/doc/cxxapi/classboost_1_1this__thread_1_1disable__syscall__interruption.html +0 -46
- data/doc/cxxapi/classboost_1_1this__thread_1_1restore__syscall__interruption-members.html +0 -33
- data/doc/cxxapi/classboost_1_1this__thread_1_1restore__syscall__interruption.html +0 -44
- data/doc/cxxapi/namespacePassenger.html +0 -208
- data/doc/cxxapi/namespacePassenger_1_1InterruptableCalls.html +0 -43
- data/doc/cxxapi/namespacemembers.html +0 -70
- data/doc/cxxapi/namespacemembers_func.html +0 -66
- data/doc/cxxapi/namespacemembers_type.html +0 -46
- data/doc/cxxapi/namespaces.html +0 -35
- data/doc/rdoc/classes/Passenger.html +0 -136
- data/doc/rdoc/classes/Passenger/AbstractRequestHandler.html +0 -402
- data/doc/rdoc/classes/Passenger/SpawnManager.html +0 -379
- data/doc/rdoc/classes/Passenger/Utils.html +0 -578
- data/ext/apache2/System.h +0 -228
- data/lib/passenger/platform_info.rb +0 -302
- data/lib/passenger/templates/app_exited_during_initialization.html.erb +0 -19
- data/test/stub/apache2/httpd.conf +0 -75
- data/test/stub/rails_apps/foobar/config/environments/test.rb +0 -22
- data/test/stub/rails_apps/mycook/config/environments/test.rb +0 -22
- data/test/stub/railsapp/config/environments/test.rb +0 -22
- data/test/stub/railsapp2/config/environments/test.rb +0 -22
@@ -0,0 +1,128 @@
|
|
1
|
+
#include "tut.h"
|
2
|
+
#include <oxt/backtrace.hpp>
|
3
|
+
#include <oxt/tracable_exception.hpp>
|
4
|
+
#include <oxt/thread.hpp>
|
5
|
+
|
6
|
+
using namespace oxt;
|
7
|
+
using namespace std;
|
8
|
+
|
9
|
+
namespace tut {
|
10
|
+
struct backtrace_test {
|
11
|
+
};
|
12
|
+
|
13
|
+
DEFINE_TEST_GROUP(backtrace_test);
|
14
|
+
|
15
|
+
TEST_METHOD(1) {
|
16
|
+
// Test TRACE_POINT() and tracable_exception.
|
17
|
+
struct {
|
18
|
+
void foo() {
|
19
|
+
TRACE_POINT();
|
20
|
+
bar();
|
21
|
+
}
|
22
|
+
|
23
|
+
void bar() {
|
24
|
+
TRACE_POINT();
|
25
|
+
baz();
|
26
|
+
}
|
27
|
+
|
28
|
+
void baz() {
|
29
|
+
TRACE_POINT();
|
30
|
+
throw tracable_exception();
|
31
|
+
}
|
32
|
+
} object;
|
33
|
+
|
34
|
+
try {
|
35
|
+
object.foo();
|
36
|
+
fail("tracable_exception expected.");
|
37
|
+
} catch (const tracable_exception &e) {
|
38
|
+
ensure("Backtrace contains foo()",
|
39
|
+
e.backtrace().find("foo()") != string::npos);
|
40
|
+
ensure("Backtrace contains bar()",
|
41
|
+
e.backtrace().find("bar()") != string::npos);
|
42
|
+
ensure("Backtrace contains baz()",
|
43
|
+
e.backtrace().find("baz()") != string::npos);
|
44
|
+
}
|
45
|
+
}
|
46
|
+
|
47
|
+
struct QuitEvent {
|
48
|
+
bool is_done;
|
49
|
+
boost::mutex mutex;
|
50
|
+
boost::condition_variable cond;
|
51
|
+
|
52
|
+
QuitEvent() {
|
53
|
+
is_done = false;
|
54
|
+
}
|
55
|
+
|
56
|
+
void wait() {
|
57
|
+
boost::unique_lock<boost::mutex> l(mutex);
|
58
|
+
while (!is_done) {
|
59
|
+
cond.wait(l);
|
60
|
+
}
|
61
|
+
}
|
62
|
+
|
63
|
+
void done() {
|
64
|
+
is_done = true;
|
65
|
+
cond.notify_all();
|
66
|
+
}
|
67
|
+
};
|
68
|
+
|
69
|
+
struct FooCaller {
|
70
|
+
QuitEvent *quit_event;
|
71
|
+
|
72
|
+
static void foo(QuitEvent *quit_event) {
|
73
|
+
TRACE_POINT();
|
74
|
+
quit_event->wait();
|
75
|
+
}
|
76
|
+
|
77
|
+
void operator()() {
|
78
|
+
foo(quit_event);
|
79
|
+
}
|
80
|
+
};
|
81
|
+
|
82
|
+
struct BarCaller {
|
83
|
+
QuitEvent *quit_event;
|
84
|
+
|
85
|
+
static void bar(QuitEvent *quit_event) {
|
86
|
+
TRACE_POINT();
|
87
|
+
quit_event->wait();
|
88
|
+
}
|
89
|
+
|
90
|
+
void operator()() {
|
91
|
+
bar(quit_event);
|
92
|
+
}
|
93
|
+
};
|
94
|
+
|
95
|
+
TEST_METHOD(2) {
|
96
|
+
// Test whether oxt::thread's backtrace support works.
|
97
|
+
FooCaller foo;
|
98
|
+
QuitEvent foo_quit;
|
99
|
+
foo.quit_event = &foo_quit;
|
100
|
+
|
101
|
+
BarCaller bar;
|
102
|
+
QuitEvent bar_quit;
|
103
|
+
bar.quit_event = &bar_quit;
|
104
|
+
|
105
|
+
oxt::thread foo_thread(foo);
|
106
|
+
oxt::thread bar_thread(bar);
|
107
|
+
usleep(20000);
|
108
|
+
|
109
|
+
ensure("Foo thread's backtrace contains foo()",
|
110
|
+
foo_thread.backtrace().find("foo") != string::npos);
|
111
|
+
ensure("Foo thread's backtrace doesn't contain bar()",
|
112
|
+
foo_thread.backtrace().find("bar") == string::npos);
|
113
|
+
ensure("Bar thread's backtrace contains bar()",
|
114
|
+
bar_thread.backtrace().find("bar") != string::npos);
|
115
|
+
ensure("Bar thread's backtrace doesn't contain foo()",
|
116
|
+
bar_thread.backtrace().find("foo") == string::npos);
|
117
|
+
|
118
|
+
string all_backtraces(oxt::thread::all_backtraces());
|
119
|
+
ensure(all_backtraces.find("foo") != string::npos);
|
120
|
+
ensure(all_backtraces.find("bar") != string::npos);
|
121
|
+
|
122
|
+
foo_quit.done();
|
123
|
+
bar_quit.done();
|
124
|
+
foo_thread.join();
|
125
|
+
bar_thread.join();
|
126
|
+
}
|
127
|
+
}
|
128
|
+
|
@@ -0,0 +1,25 @@
|
|
1
|
+
#include "tut.h"
|
2
|
+
#include "tut_reporter.h"
|
3
|
+
#include <oxt/system_calls.hpp>
|
4
|
+
#include <signal.h>
|
5
|
+
#include <cstdlib>
|
6
|
+
|
7
|
+
namespace tut {
|
8
|
+
test_runner_singleton runner;
|
9
|
+
}
|
10
|
+
|
11
|
+
int main() {
|
12
|
+
tut::reporter reporter;
|
13
|
+
tut::runner.get().set_callback(&reporter);
|
14
|
+
signal(SIGPIPE, SIG_IGN);
|
15
|
+
setenv("RAILS_ENV", "production", 1);
|
16
|
+
setenv("TESTING_PASSENGER", "1", 1);
|
17
|
+
oxt::setup_syscall_interruption_support();
|
18
|
+
try {
|
19
|
+
tut::runner.get().run_tests();
|
20
|
+
} catch (const std::exception &ex) {
|
21
|
+
std::cerr << "Exception raised: " << ex.what() << std::endl;
|
22
|
+
return 1;
|
23
|
+
}
|
24
|
+
return 0;
|
25
|
+
}
|
@@ -0,0 +1,50 @@
|
|
1
|
+
#include "tut.h"
|
2
|
+
#include <boost/bind.hpp>
|
3
|
+
#include <oxt/thread.hpp>
|
4
|
+
#include <oxt/system_calls.hpp>
|
5
|
+
#include <unistd.h>
|
6
|
+
#include <ctime>
|
7
|
+
|
8
|
+
using namespace oxt;
|
9
|
+
using namespace std;
|
10
|
+
|
11
|
+
namespace tut {
|
12
|
+
struct SyscallInterruptionTest {
|
13
|
+
SyscallInterruptionTest() {
|
14
|
+
setup_syscall_interruption_support();
|
15
|
+
}
|
16
|
+
|
17
|
+
~SyscallInterruptionTest() {
|
18
|
+
struct sigaction action;
|
19
|
+
|
20
|
+
action.sa_handler = SIG_DFL;
|
21
|
+
action.sa_flags = 0;
|
22
|
+
sigemptyset(&action.sa_mask);
|
23
|
+
sigaction(INTERRUPTION_SIGNAL, &action, NULL);
|
24
|
+
}
|
25
|
+
};
|
26
|
+
|
27
|
+
DEFINE_TEST_GROUP(SyscallInterruptionTest);
|
28
|
+
|
29
|
+
struct SleepFunction {
|
30
|
+
void operator()() {
|
31
|
+
syscalls::usleep(6000000);
|
32
|
+
}
|
33
|
+
};
|
34
|
+
|
35
|
+
TEST_METHOD(1) {
|
36
|
+
// System call interruption works.
|
37
|
+
SleepFunction s;
|
38
|
+
oxt::thread thr(s);
|
39
|
+
usleep(20000);
|
40
|
+
|
41
|
+
time_t begin, end, time_spent_in_thread;
|
42
|
+
begin = time(NULL);
|
43
|
+
thr.interrupt_and_join();
|
44
|
+
end = time(NULL);
|
45
|
+
time_spent_in_thread = end - begin;
|
46
|
+
|
47
|
+
ensure(time_spent_in_thread <= 2);
|
48
|
+
}
|
49
|
+
}
|
50
|
+
|
@@ -0,0 +1,83 @@
|
|
1
|
+
require 'support/config'
|
2
|
+
require 'support/test_helper'
|
3
|
+
require 'phusion_passenger/abstract_request_handler'
|
4
|
+
|
5
|
+
require 'fileutils'
|
6
|
+
|
7
|
+
include PhusionPassenger
|
8
|
+
|
9
|
+
describe AbstractRequestHandler do
|
10
|
+
before :each do
|
11
|
+
ENV['PHUSION_PASSENGER_TMP'] = "abstract_request_handler_spec.tmp"
|
12
|
+
@owner_pipe = IO.pipe
|
13
|
+
@request_handler = AbstractRequestHandler.new(@owner_pipe[1])
|
14
|
+
def @request_handler.process_request(*args)
|
15
|
+
# Do nothing.
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
after :each do
|
20
|
+
@request_handler.cleanup
|
21
|
+
@owner_pipe[0].close rescue nil
|
22
|
+
ENV.delete('PHUSION_PASSENGER_TMP')
|
23
|
+
FileUtils.rm_rf("abstract_request_handler_spec.tmp")
|
24
|
+
end
|
25
|
+
|
26
|
+
def prepare
|
27
|
+
# Do nothing. To be overrided by sub describe blocks.
|
28
|
+
end
|
29
|
+
|
30
|
+
it "exits if the owner pipe is closed" do
|
31
|
+
@request_handler.start_main_loop_thread
|
32
|
+
@owner_pipe[0].close
|
33
|
+
begin
|
34
|
+
Timeout.timeout(5) do
|
35
|
+
wait_until do
|
36
|
+
!@request_handler.main_loop_running?
|
37
|
+
end
|
38
|
+
end
|
39
|
+
rescue Timeout::Error
|
40
|
+
violated
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
it "ignores new connections that don't send any data" do
|
45
|
+
def @request_handler.accept_connection
|
46
|
+
return nil
|
47
|
+
end
|
48
|
+
@request_handler.start_main_loop_thread
|
49
|
+
wait_until do
|
50
|
+
@request_handler.iterations != 0
|
51
|
+
end
|
52
|
+
@request_handler.processed_requests.should == 0
|
53
|
+
end
|
54
|
+
|
55
|
+
it "creates a socket file in the Phusion Passenger temp folder, unless when using TCP sockets" do
|
56
|
+
if @request_handler.socket_type == "unix"
|
57
|
+
Dir["abstract_request_handler_spec.tmp/*"].should_not be_empty
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
it "accepts pings" do
|
62
|
+
@request_handler.start_main_loop_thread
|
63
|
+
if @request_handler.socket_type == "unix"
|
64
|
+
client = UNIXSocket.new(@request_handler.socket_name)
|
65
|
+
else
|
66
|
+
addr, port = @request_handler.socket_name.split(/:/)
|
67
|
+
client = TCPSocket.new(addr, port.to_i)
|
68
|
+
end
|
69
|
+
begin
|
70
|
+
channel = MessageChannel.new(client)
|
71
|
+
channel.write_scalar("REQUEST_METHOD\0ping\0")
|
72
|
+
client.read.should == "pong"
|
73
|
+
ensure
|
74
|
+
client.close
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
78
|
+
def wait_until
|
79
|
+
while !yield
|
80
|
+
sleep 0.01
|
81
|
+
end
|
82
|
+
end
|
83
|
+
end
|
@@ -0,0 +1,246 @@
|
|
1
|
+
require 'support/config'
|
2
|
+
require 'support/test_helper'
|
3
|
+
require 'phusion_passenger/abstract_server'
|
4
|
+
require 'phusion_passenger/abstract_server_collection'
|
5
|
+
|
6
|
+
include PhusionPassenger
|
7
|
+
|
8
|
+
describe AbstractServerCollection do
|
9
|
+
before :each do
|
10
|
+
@collection = AbstractServerCollection.new
|
11
|
+
end
|
12
|
+
|
13
|
+
after :each do
|
14
|
+
@collection.cleanup
|
15
|
+
end
|
16
|
+
|
17
|
+
specify "#lookup_or_add adds the server returned by its block" do
|
18
|
+
@collection.synchronize do
|
19
|
+
@collection.lookup_or_add('foo') do
|
20
|
+
AbstractServer.new
|
21
|
+
end
|
22
|
+
@collection.should have_key('foo')
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
26
|
+
specify "#lookup_or_add does not execute the block if the key exists" do
|
27
|
+
@collection.synchronize do
|
28
|
+
@collection.lookup_or_add('foo') do
|
29
|
+
AbstractServer.new
|
30
|
+
end
|
31
|
+
@collection.lookup_or_add('foo') do
|
32
|
+
violated
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
specify "#lookup_or_add returns the found server" do
|
38
|
+
@collection.synchronize do
|
39
|
+
server = AbstractServer.new
|
40
|
+
@collection.lookup_or_add('foo') { server }
|
41
|
+
result = @collection.lookup_or_add('foo') { AbstractServer.new }
|
42
|
+
result.should == server
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
specify "#lookup_or_add returns the value of the block if server is not already in the collection" do
|
47
|
+
@collection.synchronize do
|
48
|
+
server = AbstractServer.new
|
49
|
+
result = @collection.lookup_or_add('foo') do
|
50
|
+
server
|
51
|
+
end
|
52
|
+
result.should == server
|
53
|
+
end
|
54
|
+
end
|
55
|
+
|
56
|
+
specify "#delete deletes the server with the given key" do
|
57
|
+
@collection.synchronize do
|
58
|
+
@collection.lookup_or_add('foo') do
|
59
|
+
AbstractServer.new
|
60
|
+
end
|
61
|
+
@collection.delete('foo')
|
62
|
+
@collection.should_not have_key('foo')
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
specify "#delete stop the server if it's started" do
|
67
|
+
@collection.synchronize do
|
68
|
+
server = AbstractServer.new
|
69
|
+
@collection.lookup_or_add('foo') do
|
70
|
+
server.start
|
71
|
+
server
|
72
|
+
end
|
73
|
+
@collection.delete('foo')
|
74
|
+
server.should_not be_started
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
78
|
+
specify "#clear deletes everything" do
|
79
|
+
@collection.synchronize do
|
80
|
+
@collection.lookup_or_add('foo') do
|
81
|
+
AbstractServer.new
|
82
|
+
end
|
83
|
+
@collection.lookup_or_add('bar') do
|
84
|
+
AbstractServer.new
|
85
|
+
end
|
86
|
+
@collection.clear
|
87
|
+
@collection.should_not have_key('foo')
|
88
|
+
@collection.should_not have_key('bar')
|
89
|
+
end
|
90
|
+
end
|
91
|
+
|
92
|
+
specify "#cleanup deletes everything" do
|
93
|
+
@collection.synchronize do
|
94
|
+
@collection.lookup_or_add('foo') do
|
95
|
+
AbstractServer.new
|
96
|
+
end
|
97
|
+
@collection.lookup_or_add('bar') do
|
98
|
+
AbstractServer.new
|
99
|
+
end
|
100
|
+
end
|
101
|
+
@collection.cleanup
|
102
|
+
@collection.synchronize do
|
103
|
+
@collection.should_not have_key('foo')
|
104
|
+
@collection.should_not have_key('bar')
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
108
|
+
specify "#cleanup stops all servers" do
|
109
|
+
servers = []
|
110
|
+
3.times do
|
111
|
+
server = AbstractServer.new
|
112
|
+
server.start
|
113
|
+
servers << server
|
114
|
+
end
|
115
|
+
@collection.synchronize do
|
116
|
+
@collection.lookup_or_add('foo') { servers[0] }
|
117
|
+
@collection.lookup_or_add('bar') { servers[1] }
|
118
|
+
@collection.lookup_or_add('baz') { servers[2] }
|
119
|
+
end
|
120
|
+
@collection.cleanup
|
121
|
+
servers.each do |server|
|
122
|
+
server.should_not be_started
|
123
|
+
end
|
124
|
+
end
|
125
|
+
|
126
|
+
specify "idle servers are cleaned up periodically" do
|
127
|
+
foo = AbstractServer.new
|
128
|
+
foo.max_idle_time = 0.05
|
129
|
+
bar = AbstractServer.new
|
130
|
+
bar.max_idle_time = 2
|
131
|
+
|
132
|
+
@collection.synchronize do
|
133
|
+
@collection.lookup_or_add('foo') { foo }
|
134
|
+
@collection.lookup_or_add('bar') { bar }
|
135
|
+
end
|
136
|
+
sleep 0.3
|
137
|
+
@collection.synchronize do
|
138
|
+
@collection.should_not have_key('foo')
|
139
|
+
@collection.should have_key('bar')
|
140
|
+
end
|
141
|
+
end
|
142
|
+
|
143
|
+
specify "servers with max_idle_time of 0 are never cleaned up" do
|
144
|
+
@collection.synchronize do
|
145
|
+
@collection.lookup_or_add('foo') { AbstractServer.new }
|
146
|
+
end
|
147
|
+
original_cleaning_time = @collection.next_cleaning_time
|
148
|
+
@collection.check_idle_servers!
|
149
|
+
|
150
|
+
# Wait until the cleaner thread has run.
|
151
|
+
while original_cleaning_time == @collection.next_cleaning_time
|
152
|
+
sleep 0.01
|
153
|
+
end
|
154
|
+
|
155
|
+
@collection.synchronize do
|
156
|
+
@collection.should have_key('foo')
|
157
|
+
end
|
158
|
+
end
|
159
|
+
|
160
|
+
specify "upon adding a new server to an empty collection, the next cleaning will " <<
|
161
|
+
"be scheduled at that server's next cleaning time" do
|
162
|
+
server = AbstractServer.new
|
163
|
+
server.max_idle_time = 10
|
164
|
+
@collection.synchronize do
|
165
|
+
@collection.lookup_or_add('foo') { server }
|
166
|
+
end
|
167
|
+
@collection.next_cleaning_time.should == server.next_cleaning_time
|
168
|
+
end
|
169
|
+
|
170
|
+
specify "upon adding a new server to a nonempty collection, and that server's next cleaning " <<
|
171
|
+
"time is not the smallest of all servers' cleaning times, then the next cleaning schedule " <<
|
172
|
+
"will not change" do
|
173
|
+
server1 = AbstractServer.new
|
174
|
+
server1.max_idle_time = 10
|
175
|
+
@collection.synchronize do
|
176
|
+
@collection.lookup_or_add('foo') { server1 }
|
177
|
+
end
|
178
|
+
|
179
|
+
server2 = AbstractServer.new
|
180
|
+
server2.max_idle_time = 11
|
181
|
+
@collection.synchronize do
|
182
|
+
@collection.lookup_or_add('bar') { server2 }
|
183
|
+
end
|
184
|
+
|
185
|
+
@collection.next_cleaning_time.should == server1.next_cleaning_time
|
186
|
+
end
|
187
|
+
|
188
|
+
specify "upon deleting server from a nonempty collection, and the deleted server's next cleaning " <<
|
189
|
+
"time IS the smallest of all servers' cleaning times, then the next cleaning schedule " <<
|
190
|
+
"will be changed to the smallest cleaning time of all servers" do
|
191
|
+
server1 = AbstractServer.new
|
192
|
+
server1.max_idle_time = 10
|
193
|
+
@collection.synchronize do
|
194
|
+
@collection.lookup_or_add('foo') { server1 }
|
195
|
+
end
|
196
|
+
|
197
|
+
server2 = AbstractServer.new
|
198
|
+
server2.max_idle_time = 11
|
199
|
+
@collection.synchronize do
|
200
|
+
@collection.lookup_or_add('bar') { server2 }
|
201
|
+
end
|
202
|
+
|
203
|
+
@collection.synchronize do
|
204
|
+
@collection.delete('foo')
|
205
|
+
end
|
206
|
+
|
207
|
+
@collection.next_cleaning_time.should == server2.next_cleaning_time
|
208
|
+
end
|
209
|
+
|
210
|
+
specify "upon deleting server from a nonempty collection, and the deleted server's next cleaning " <<
|
211
|
+
"time IS NOT the smallest of all servers' cleaning times, then the next cleaning schedule " <<
|
212
|
+
"will not change" do
|
213
|
+
server1 = AbstractServer.new
|
214
|
+
server1.max_idle_time = 10
|
215
|
+
@collection.synchronize do
|
216
|
+
@collection.lookup_or_add('foo') { server1 }
|
217
|
+
end
|
218
|
+
|
219
|
+
server2 = AbstractServer.new
|
220
|
+
server2.max_idle_time = 11
|
221
|
+
@collection.synchronize do
|
222
|
+
@collection.lookup_or_add('bar') { server2 }
|
223
|
+
end
|
224
|
+
|
225
|
+
@collection.synchronize do
|
226
|
+
@collection.delete('bar')
|
227
|
+
end
|
228
|
+
|
229
|
+
@collection.next_cleaning_time.should == server1.next_cleaning_time
|
230
|
+
end
|
231
|
+
|
232
|
+
specify "bug check" do
|
233
|
+
block = lambda do
|
234
|
+
@collection.synchronize do
|
235
|
+
@collection.clear
|
236
|
+
@collection.lookup_or_add('foo') do
|
237
|
+
s = AbstractServer.new
|
238
|
+
s.max_idle_time = 0.05
|
239
|
+
s
|
240
|
+
end
|
241
|
+
@collection.lookup_or_add('bar') { AbstractServer.new }
|
242
|
+
end
|
243
|
+
end
|
244
|
+
block.should_not raise_error
|
245
|
+
end
|
246
|
+
end
|