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,262 @@
|
|
1
|
+
#include "tut.h"
|
2
|
+
#include "CachedFileStat.h"
|
3
|
+
#include "SystemTime.h"
|
4
|
+
#include <sys/types.h>
|
5
|
+
#include <utime.h>
|
6
|
+
|
7
|
+
using namespace std;
|
8
|
+
using namespace Passenger;
|
9
|
+
|
10
|
+
namespace tut {
|
11
|
+
struct CachedFileStatTest {
|
12
|
+
CachedFileStat *stat;
|
13
|
+
CachedMultiFileStat *mstat;
|
14
|
+
|
15
|
+
CachedFileStatTest() {
|
16
|
+
stat = (CachedFileStat *) NULL;
|
17
|
+
mstat = (CachedMultiFileStat *) NULL;
|
18
|
+
}
|
19
|
+
|
20
|
+
~CachedFileStatTest() {
|
21
|
+
if (stat != NULL) {
|
22
|
+
delete stat;
|
23
|
+
}
|
24
|
+
if (mstat != NULL) {
|
25
|
+
cached_multi_file_stat_free(mstat);
|
26
|
+
}
|
27
|
+
SystemTime::release();
|
28
|
+
unlink("test.txt");
|
29
|
+
unlink("test2.txt");
|
30
|
+
unlink("test3.txt");
|
31
|
+
unlink("test4.txt");
|
32
|
+
}
|
33
|
+
};
|
34
|
+
|
35
|
+
static void touch(const char *filename, time_t timestamp = 0) {
|
36
|
+
FILE *f = fopen(filename, "w");
|
37
|
+
fprintf(f, "hi");
|
38
|
+
fclose(f);
|
39
|
+
if (timestamp != 0) {
|
40
|
+
struct utimbuf buf;
|
41
|
+
buf.actime = timestamp;
|
42
|
+
buf.modtime = timestamp;
|
43
|
+
utime(filename, &buf);
|
44
|
+
}
|
45
|
+
}
|
46
|
+
|
47
|
+
DEFINE_TEST_GROUP(CachedFileStatTest);
|
48
|
+
|
49
|
+
/************ Tests for CachedFileStat ************/
|
50
|
+
|
51
|
+
TEST_METHOD(1) {
|
52
|
+
// cached_file_stat_new() does not stat the file immediately.
|
53
|
+
touch("test.txt");
|
54
|
+
stat = new CachedFileStat("test.txt");
|
55
|
+
ensure_equals((long) stat->info.st_size, (long) 0);
|
56
|
+
ensure_equals(stat->info.st_mtime, (time_t) 0);
|
57
|
+
}
|
58
|
+
|
59
|
+
TEST_METHOD(2) {
|
60
|
+
// cached_file_stat_refresh() on a newly created
|
61
|
+
// CachedFileStat works.
|
62
|
+
touch("test.txt");
|
63
|
+
stat = new CachedFileStat("test.txt");
|
64
|
+
ensure_equals(stat->refresh(1), 0);
|
65
|
+
ensure_equals((long) stat->info.st_size, (long) 2);
|
66
|
+
}
|
67
|
+
|
68
|
+
TEST_METHOD(3) {
|
69
|
+
// cached_file_stat_refresh() does not re-stat the file
|
70
|
+
// until the cache has expired.
|
71
|
+
SystemTime::force(5);
|
72
|
+
stat = new CachedFileStat("test.txt");
|
73
|
+
touch("test.txt", 1);
|
74
|
+
ensure_equals("1st refresh succceeded",
|
75
|
+
stat->refresh(1),
|
76
|
+
0);
|
77
|
+
|
78
|
+
touch("test.txt", 1000);
|
79
|
+
ensure_equals("2nd refresh succceeded",
|
80
|
+
stat->refresh(1),
|
81
|
+
0);
|
82
|
+
ensure_equals("Cached value was used",
|
83
|
+
stat->info.st_mtime,
|
84
|
+
(time_t) 1);
|
85
|
+
|
86
|
+
SystemTime::force(6);
|
87
|
+
ensure_equals("3rd refresh succceeded",
|
88
|
+
stat->refresh(1),
|
89
|
+
0);
|
90
|
+
ensure_equals("Cache has been invalidated",
|
91
|
+
stat->info.st_mtime,
|
92
|
+
(time_t) 1000);
|
93
|
+
}
|
94
|
+
|
95
|
+
TEST_METHOD(5) {
|
96
|
+
// cached_file_stat_refresh() on a nonexistant file returns
|
97
|
+
// an error.
|
98
|
+
stat = new CachedFileStat("test.txt");
|
99
|
+
ensure_equals(stat->refresh(1), -1);
|
100
|
+
ensure_equals("It sets errno appropriately", errno, ENOENT);
|
101
|
+
}
|
102
|
+
|
103
|
+
TEST_METHOD(6) {
|
104
|
+
// cached_file_stat_refresh() on a nonexistant file does not
|
105
|
+
// re-stat the file until the cache has expired.
|
106
|
+
SystemTime::force(5);
|
107
|
+
stat = new CachedFileStat("test.txt");
|
108
|
+
ensure_equals("1st refresh failed",
|
109
|
+
stat->refresh(1),
|
110
|
+
-1);
|
111
|
+
ensure_equals("It sets errno appropriately", errno, ENOENT);
|
112
|
+
|
113
|
+
errno = EEXIST;
|
114
|
+
ensure_equals("2nd refresh failed",
|
115
|
+
stat->refresh(1),
|
116
|
+
-1);
|
117
|
+
ensure_equals("It sets errno appropriately", errno, ENOENT);
|
118
|
+
ensure_equals("Cached value was used",
|
119
|
+
stat->info.st_mtime,
|
120
|
+
(time_t) 0);
|
121
|
+
|
122
|
+
touch("test.txt", 1000);
|
123
|
+
SystemTime::force(6);
|
124
|
+
ensure_equals("3rd refresh succeeded",
|
125
|
+
stat->refresh(1),
|
126
|
+
0);
|
127
|
+
ensure_equals("Cache has been invalidated",
|
128
|
+
stat->info.st_mtime,
|
129
|
+
(time_t) 1000);
|
130
|
+
|
131
|
+
unlink("test.txt");
|
132
|
+
ensure_equals("4th refresh succeeded even though file was unlinked",
|
133
|
+
stat->refresh(1),
|
134
|
+
0);
|
135
|
+
ensure_equals("Cached value was used",
|
136
|
+
stat->info.st_mtime,
|
137
|
+
(time_t) 1000);
|
138
|
+
}
|
139
|
+
|
140
|
+
|
141
|
+
/************ Tests for CachedMultiFileStat ************/
|
142
|
+
|
143
|
+
TEST_METHOD(10) {
|
144
|
+
// Statting an existing file works.
|
145
|
+
struct stat buf;
|
146
|
+
|
147
|
+
touch("test.txt");
|
148
|
+
mstat = cached_multi_file_stat_new(1);
|
149
|
+
ensure_equals(
|
150
|
+
cached_multi_file_stat_perform(mstat, "test.txt", &buf, 0),
|
151
|
+
0);
|
152
|
+
ensure_equals((long) buf.st_size, (long) 2);
|
153
|
+
}
|
154
|
+
|
155
|
+
TEST_METHOD(11) {
|
156
|
+
// Statting a nonexistant file works.
|
157
|
+
struct stat buf;
|
158
|
+
|
159
|
+
mstat = cached_multi_file_stat_new(1);
|
160
|
+
ensure_equals(
|
161
|
+
cached_multi_file_stat_perform(mstat, "test.txt", &buf, 0),
|
162
|
+
-1);
|
163
|
+
}
|
164
|
+
|
165
|
+
TEST_METHOD(12) {
|
166
|
+
// Throttling works.
|
167
|
+
struct stat buf;
|
168
|
+
|
169
|
+
mstat = cached_multi_file_stat_new(2);
|
170
|
+
SystemTime::force(5);
|
171
|
+
|
172
|
+
// Touch and stat test.txt. The next stat should return
|
173
|
+
// the old info.
|
174
|
+
|
175
|
+
touch("test.txt", 10);
|
176
|
+
ensure_equals(
|
177
|
+
cached_multi_file_stat_perform(mstat, "test.txt", &buf, 1),
|
178
|
+
0);
|
179
|
+
ensure_equals(buf.st_mtime, (time_t) 10);
|
180
|
+
|
181
|
+
touch("test.txt", 20);
|
182
|
+
ensure_equals(
|
183
|
+
cached_multi_file_stat_perform(mstat, "test.txt", &buf, 1),
|
184
|
+
0);
|
185
|
+
ensure_equals(buf.st_mtime, (time_t) 10);
|
186
|
+
|
187
|
+
// Touch and stat test2.txt. The next stat should return
|
188
|
+
// the old info.
|
189
|
+
|
190
|
+
touch("test2.txt", 30);
|
191
|
+
ensure_equals(
|
192
|
+
cached_multi_file_stat_perform(mstat, "test2.txt", &buf, 1),
|
193
|
+
0);
|
194
|
+
ensure_equals(buf.st_mtime, (time_t) 30);
|
195
|
+
|
196
|
+
touch("test2.txt", 40);
|
197
|
+
ensure_equals(
|
198
|
+
cached_multi_file_stat_perform(mstat, "test2.txt", &buf, 1),
|
199
|
+
0);
|
200
|
+
ensure_equals(buf.st_mtime, (time_t) 30);
|
201
|
+
|
202
|
+
// Forward timer, then stat both files again. The most recent
|
203
|
+
// information should be returned.
|
204
|
+
|
205
|
+
SystemTime::force(6);
|
206
|
+
ensure_equals(
|
207
|
+
cached_multi_file_stat_perform(mstat, "test.txt", &buf, 1),
|
208
|
+
0);
|
209
|
+
ensure_equals(buf.st_mtime, (time_t) 20);
|
210
|
+
ensure_equals(
|
211
|
+
cached_multi_file_stat_perform(mstat, "test2.txt", &buf, 1),
|
212
|
+
0);
|
213
|
+
ensure_equals(buf.st_mtime, (time_t) 40);
|
214
|
+
}
|
215
|
+
|
216
|
+
TEST_METHOD(13) {
|
217
|
+
// Cache limiting works.
|
218
|
+
struct stat buf;
|
219
|
+
|
220
|
+
mstat = cached_multi_file_stat_new(3);
|
221
|
+
SystemTime::force(5);
|
222
|
+
|
223
|
+
// Create and stat test.txt, test2.txt and test3.txt.
|
224
|
+
|
225
|
+
touch("test.txt", 1000);
|
226
|
+
ensure_equals(
|
227
|
+
cached_multi_file_stat_perform(mstat, "test.txt", &buf, 1),
|
228
|
+
0);
|
229
|
+
ensure_equals(buf.st_mtime, (time_t) 1000);
|
230
|
+
|
231
|
+
touch("test2.txt", 1001);
|
232
|
+
ensure_equals(
|
233
|
+
cached_multi_file_stat_perform(mstat, "test2.txt", &buf, 1),
|
234
|
+
0);
|
235
|
+
ensure_equals(buf.st_mtime, (time_t) 1001);
|
236
|
+
|
237
|
+
touch("test3.txt", 1003);
|
238
|
+
ensure_equals(
|
239
|
+
cached_multi_file_stat_perform(mstat, "test3.txt", &buf, 1),
|
240
|
+
0);
|
241
|
+
ensure_equals(buf.st_mtime, (time_t) 1003);
|
242
|
+
|
243
|
+
// Stat test2.txt, then create and stat test4.txt, then touch test.txt.
|
244
|
+
// test.txt should have been removed from the cache, and thus
|
245
|
+
// upon statting it again its new timestamp should be returned.
|
246
|
+
|
247
|
+
ensure_equals(
|
248
|
+
cached_multi_file_stat_perform(mstat, "test2.txt", &buf, 1),
|
249
|
+
0);
|
250
|
+
|
251
|
+
touch("test4.txt", 1004);
|
252
|
+
ensure_equals(
|
253
|
+
cached_multi_file_stat_perform(mstat, "test4.txt", &buf, 1),
|
254
|
+
0);
|
255
|
+
|
256
|
+
touch("test.txt", 3000);
|
257
|
+
ensure_equals(
|
258
|
+
cached_multi_file_stat_perform(mstat, "test.txt", &buf, 1),
|
259
|
+
0);
|
260
|
+
ensure_equals(buf.st_mtime, (time_t) 3000);
|
261
|
+
}
|
262
|
+
}
|
@@ -0,0 +1,79 @@
|
|
1
|
+
#include "tut.h"
|
2
|
+
#include "FileChecker.h"
|
3
|
+
#include "SystemTime.h"
|
4
|
+
#include <stdio.h>
|
5
|
+
#include <utime.h>
|
6
|
+
|
7
|
+
using namespace Passenger;
|
8
|
+
using namespace std;
|
9
|
+
|
10
|
+
namespace tut {
|
11
|
+
struct FileCheckerTest {
|
12
|
+
FileCheckerTest() {
|
13
|
+
}
|
14
|
+
|
15
|
+
~FileCheckerTest() {
|
16
|
+
unlink("test.txt");
|
17
|
+
SystemTime::release();
|
18
|
+
}
|
19
|
+
};
|
20
|
+
|
21
|
+
static void touch(const char *filename, time_t timestamp = 0) {
|
22
|
+
FILE *f = fopen(filename, "w");
|
23
|
+
fclose(f);
|
24
|
+
if (timestamp != 0) {
|
25
|
+
struct utimbuf buf;
|
26
|
+
buf.actime = timestamp;
|
27
|
+
buf.modtime = timestamp;
|
28
|
+
utime(filename, &buf);
|
29
|
+
}
|
30
|
+
}
|
31
|
+
|
32
|
+
DEFINE_TEST_GROUP(FileCheckerTest);
|
33
|
+
|
34
|
+
TEST_METHOD(1) {
|
35
|
+
// File is not changed if it didn't exist.
|
36
|
+
FileChecker checker("test.txt");
|
37
|
+
ensure(!checker.changed());
|
38
|
+
}
|
39
|
+
|
40
|
+
TEST_METHOD(2) {
|
41
|
+
// File is not changed if its ctime and mtime didn't change.
|
42
|
+
touch("test.txt");
|
43
|
+
FileChecker checker("test.txt");
|
44
|
+
ensure(!checker.changed());
|
45
|
+
}
|
46
|
+
|
47
|
+
TEST_METHOD(3) {
|
48
|
+
// File is changed if it didn't exist but has now been created.
|
49
|
+
FileChecker checker("test.txt");
|
50
|
+
touch("test.txt");
|
51
|
+
ensure(checker.changed());
|
52
|
+
}
|
53
|
+
|
54
|
+
TEST_METHOD(4) {
|
55
|
+
// File is changed if its mtime changed.
|
56
|
+
touch("test.txt", time(NULL) - 5);
|
57
|
+
FileChecker checker("test.txt");
|
58
|
+
touch("test.txt");
|
59
|
+
ensure("First check: changed", checker.changed());
|
60
|
+
ensure("Second check: unchanged", !checker.changed());
|
61
|
+
}
|
62
|
+
|
63
|
+
TEST_METHOD(5) {
|
64
|
+
// Throttling works.
|
65
|
+
SystemTime::force(5);
|
66
|
+
|
67
|
+
FileChecker checker("test.txt");
|
68
|
+
checker.changed(3);
|
69
|
+
touch("test.txt");
|
70
|
+
ensure(!checker.changed(3));
|
71
|
+
|
72
|
+
SystemTime::force(6);
|
73
|
+
ensure(!checker.changed(3));
|
74
|
+
|
75
|
+
SystemTime::force(8);
|
76
|
+
ensure(checker.changed(3));
|
77
|
+
ensure(!checker.changed(3));
|
78
|
+
}
|
79
|
+
}
|
data/test/MessageChannelTest.cpp
CHANGED
@@ -91,7 +91,7 @@ namespace tut {
|
|
91
91
|
close(p1[1]);
|
92
92
|
close(p2[0]);
|
93
93
|
close(p2[1]);
|
94
|
-
execlp("ruby", "ruby", "./stub/message_channel.rb",
|
94
|
+
execlp("ruby", "ruby", "./stub/message_channel.rb", (char *) 0);
|
95
95
|
perror("Cannot execute ruby");
|
96
96
|
_exit(1);
|
97
97
|
} else {
|
@@ -203,7 +203,7 @@ namespace tut {
|
|
203
203
|
close(p1[1]);
|
204
204
|
close(p2[0]);
|
205
205
|
close(p2[1]);
|
206
|
-
execlp("ruby", "ruby", "./stub/message_channel_2.rb",
|
206
|
+
execlp("ruby", "ruby", "./stub/message_channel_2.rb", (void *) 0);
|
207
207
|
perror("Cannot execute ruby");
|
208
208
|
_exit(1);
|
209
209
|
} else {
|
@@ -245,7 +245,7 @@ namespace tut {
|
|
245
245
|
dup2(fd[0], 3);
|
246
246
|
close(fd[0]);
|
247
247
|
close(fd[1]);
|
248
|
-
execlp("ruby", "ruby", "./stub/message_channel_3.rb",
|
248
|
+
execlp("ruby", "ruby", "./stub/message_channel_3.rb", (void *) 0);
|
249
249
|
perror("Cannot execute ruby");
|
250
250
|
_exit(1);
|
251
251
|
} else {
|
@@ -0,0 +1,37 @@
|
|
1
|
+
#include "tut.h"
|
2
|
+
#include "PoolOptions.h"
|
3
|
+
|
4
|
+
using namespace Passenger;
|
5
|
+
using namespace std;
|
6
|
+
|
7
|
+
namespace tut {
|
8
|
+
struct PoolOptionsTest {
|
9
|
+
};
|
10
|
+
|
11
|
+
DEFINE_TEST_GROUP(PoolOptionsTest);
|
12
|
+
|
13
|
+
// Test the PoolOptions constructors and toVector().
|
14
|
+
TEST_METHOD(1) {
|
15
|
+
PoolOptions options;
|
16
|
+
options.appRoot = "/foo";
|
17
|
+
options.frameworkSpawnerTimeout = 123;
|
18
|
+
options.appSpawnerTimeout = 456;
|
19
|
+
options.maxRequests = 789;
|
20
|
+
|
21
|
+
vector<string> args;
|
22
|
+
args.push_back("abc");
|
23
|
+
args.push_back("def");
|
24
|
+
options.toVector(args);
|
25
|
+
|
26
|
+
PoolOptions copy(args, 2);
|
27
|
+
ensure_equals(options.appRoot, copy.appRoot);
|
28
|
+
ensure_equals(options.lowerPrivilege, copy.lowerPrivilege);
|
29
|
+
ensure_equals(options.lowestUser, copy.lowestUser);
|
30
|
+
ensure_equals(options.environment, copy.environment);
|
31
|
+
ensure_equals(options.spawnMethod, copy.spawnMethod);
|
32
|
+
ensure_equals(options.appType, copy.appType);
|
33
|
+
ensure_equals(options.frameworkSpawnerTimeout, copy.frameworkSpawnerTimeout);
|
34
|
+
ensure_equals(options.appSpawnerTimeout, copy.appSpawnerTimeout);
|
35
|
+
ensure_equals(options.maxRequests, copy.maxRequests);
|
36
|
+
}
|
37
|
+
}
|
data/test/SpawnManagerTest.cpp
CHANGED
@@ -19,7 +19,7 @@ namespace tut {
|
|
19
19
|
|
20
20
|
TEST_METHOD(1) {
|
21
21
|
// Spawning an application should return a valid Application object.
|
22
|
-
ApplicationPtr app(manager.spawn("."));
|
22
|
+
ApplicationPtr app(manager.spawn(PoolOptions(".")));
|
23
23
|
ensure_equals("The Application object's PID is the same as the one specified by the stub",
|
24
24
|
app->getPid(), 1234);
|
25
25
|
}
|
@@ -32,7 +32,7 @@ namespace tut {
|
|
32
32
|
// Give the spawn server the time to properly terminate.
|
33
33
|
usleep(500000);
|
34
34
|
|
35
|
-
ApplicationPtr app(manager.spawn("."));
|
35
|
+
ApplicationPtr app(manager.spawn(PoolOptions(".")));
|
36
36
|
ensure_equals("The Application object's PID is the same as the one specified by the stub",
|
37
37
|
app->getPid(), 1234);
|
38
38
|
|
@@ -51,10 +51,10 @@ namespace tut {
|
|
51
51
|
kill(manager.getServerPid(), SIGTERM);
|
52
52
|
// Give the spawn server the time to properly terminate.
|
53
53
|
usleep(500000);
|
54
|
-
|
54
|
+
|
55
55
|
try {
|
56
56
|
manager.nextRestartShouldFail = true;
|
57
|
-
ApplicationPtr app(manager.spawn("."));
|
57
|
+
ApplicationPtr app(manager.spawn(PoolOptions(".")));
|
58
58
|
fail("SpawnManager did not throw a SpawnException");
|
59
59
|
} catch (const SpawnException &e) {
|
60
60
|
// Success.
|