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,37 @@
|
|
1
|
+
#include "tut.h"
|
2
|
+
#include "SystemTime.h"
|
3
|
+
|
4
|
+
using namespace Passenger;
|
5
|
+
using namespace std;
|
6
|
+
|
7
|
+
namespace tut {
|
8
|
+
struct SystemTimeTest {
|
9
|
+
~SystemTimeTest() {
|
10
|
+
SystemTime::release();
|
11
|
+
}
|
12
|
+
};
|
13
|
+
|
14
|
+
DEFINE_TEST_GROUP(SystemTimeTest);
|
15
|
+
|
16
|
+
TEST_METHOD(1) {
|
17
|
+
time_t begin = SystemTime::get();
|
18
|
+
|
19
|
+
SystemTime::force(1);
|
20
|
+
ensure_equals(SystemTime::get(), (time_t) 1);
|
21
|
+
SystemTime::release();
|
22
|
+
|
23
|
+
time_t now = SystemTime::get();
|
24
|
+
ensure(now >= begin && now <= begin + 2);
|
25
|
+
}
|
26
|
+
|
27
|
+
TEST_METHOD(2) {
|
28
|
+
time_t begin = SystemTime::get();
|
29
|
+
|
30
|
+
SystemTime::force(1);
|
31
|
+
ensure_equals(SystemTime::get(), (time_t) 1);
|
32
|
+
SystemTime::release();
|
33
|
+
|
34
|
+
time_t now = SystemTime::get();
|
35
|
+
ensure(now >= begin && now <= begin + 2);
|
36
|
+
}
|
37
|
+
}
|
data/test/UtilsTest.cpp
CHANGED
@@ -1,5 +1,9 @@
|
|
1
1
|
#include "tut.h"
|
2
2
|
#include "Utils.h"
|
3
|
+
#include <sys/types.h>
|
4
|
+
#include <sys/stat.h>
|
5
|
+
#include <stdio.h>
|
6
|
+
#include <dirent.h>
|
3
7
|
#include <unistd.h>
|
4
8
|
#include <limits.h>
|
5
9
|
|
@@ -13,12 +17,31 @@ namespace tut {
|
|
13
17
|
|
14
18
|
UtilsTest() {
|
15
19
|
oldPath = getenv("PATH");
|
20
|
+
unsetenv("TMPDIR");
|
21
|
+
unsetenv("PHUSION_PASSENGER_TMP");
|
16
22
|
}
|
17
23
|
|
18
24
|
~UtilsTest() {
|
19
25
|
setenv("PATH", oldPath.c_str(), 1);
|
26
|
+
unsetenv("TMPDIR");
|
27
|
+
unsetenv("PHUSION_PASSENGER_TMP");
|
20
28
|
}
|
21
29
|
};
|
30
|
+
|
31
|
+
static vector<string>
|
32
|
+
listDir(const char *path) {
|
33
|
+
vector<string> result;
|
34
|
+
DIR *d = opendir(path);
|
35
|
+
struct dirent *ent;
|
36
|
+
|
37
|
+
while ((ent = readdir(d)) != NULL) {
|
38
|
+
if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) {
|
39
|
+
continue;
|
40
|
+
}
|
41
|
+
result.push_back(ent->d_name);
|
42
|
+
}
|
43
|
+
return result;
|
44
|
+
}
|
22
45
|
|
23
46
|
DEFINE_TEST_GROUP(UtilsTest);
|
24
47
|
|
@@ -98,4 +121,118 @@ namespace tut {
|
|
98
121
|
setenv("PATH", binpath.c_str(), 1);
|
99
122
|
ensure("Spawn server is found.", !findSpawnServer().empty());
|
100
123
|
}
|
124
|
+
|
125
|
+
|
126
|
+
/***** Test getTempDir() *****/
|
127
|
+
|
128
|
+
TEST_METHOD(11) {
|
129
|
+
// It returns "/tmp" if the TMPDIR environment is NULL.
|
130
|
+
ensure_equals(string(getTempDir()), "/tmp");
|
131
|
+
}
|
132
|
+
|
133
|
+
TEST_METHOD(12) {
|
134
|
+
// It returns "/tmp" if the TMPDIR environment is an empty string.
|
135
|
+
setenv("TMPDIR", "", 1);
|
136
|
+
ensure_equals(string(getTempDir()), "/tmp");
|
137
|
+
}
|
138
|
+
|
139
|
+
TEST_METHOD(13) {
|
140
|
+
// It returns the value of the TMPDIR environment if it is not NULL and not empty.
|
141
|
+
setenv("TMPDIR", "/foo", 1);
|
142
|
+
ensure_equals(string(getTempDir()), "/foo");
|
143
|
+
}
|
144
|
+
|
145
|
+
|
146
|
+
/***** Test getPassengerTempDir() *****/
|
147
|
+
|
148
|
+
TEST_METHOD(15) {
|
149
|
+
// It returns "(tempdir)/passenger.(pid)"
|
150
|
+
char dir[128];
|
151
|
+
|
152
|
+
snprintf(dir, sizeof(dir), "/tmp/passenger.%lu", (unsigned long) getpid());
|
153
|
+
ensure_equals(getPassengerTempDir(), dir);
|
154
|
+
}
|
155
|
+
|
156
|
+
TEST_METHOD(16) {
|
157
|
+
// It caches the result into the PHUSION_PASSENGER_TMP environment variable.
|
158
|
+
char dir[128];
|
159
|
+
|
160
|
+
snprintf(dir, sizeof(dir), "/tmp/passenger.%lu", (unsigned long) getpid());
|
161
|
+
getPassengerTempDir();
|
162
|
+
ensure_equals(getenv("PHUSION_PASSENGER_TMP"), string(dir));
|
163
|
+
}
|
164
|
+
|
165
|
+
TEST_METHOD(17) {
|
166
|
+
// It returns the value of the PHUSION_PASSENGER_TMP environment variable if it's not NULL and not an empty string.
|
167
|
+
setenv("PHUSION_PASSENGER_TMP", "/foo", 1);
|
168
|
+
ensure_equals(getPassengerTempDir(), "/foo");
|
169
|
+
}
|
170
|
+
|
171
|
+
TEST_METHOD(18) {
|
172
|
+
// It does not use query the PHUSION_PASSENGER_TMP environment variable if bypassCache is true.
|
173
|
+
char dir[128];
|
174
|
+
|
175
|
+
setenv("PHUSION_PASSENGER_TMP", "/foo", 1);
|
176
|
+
snprintf(dir, sizeof(dir), "/tmp/passenger.%lu", (unsigned long) getpid());
|
177
|
+
ensure_equals(getPassengerTempDir(true), dir);
|
178
|
+
}
|
179
|
+
|
180
|
+
|
181
|
+
/***** Test TempFile *****/
|
182
|
+
|
183
|
+
TEST_METHOD(20) {
|
184
|
+
// It creates a temp file inside getPassengerTempDir().
|
185
|
+
setenv("PHUSION_PASSENGER_TMP", "utils_test.tmp", 1);
|
186
|
+
mkdir("utils_test.tmp", S_IRWXU);
|
187
|
+
TempFile t("temp", false);
|
188
|
+
unsigned int size = listDir("utils_test.tmp").size();
|
189
|
+
removeDirTree("utils_test.tmp");
|
190
|
+
ensure_equals(size, 1u);
|
191
|
+
}
|
192
|
+
|
193
|
+
TEST_METHOD(21) {
|
194
|
+
// It deletes the temp file upon destruction.
|
195
|
+
setenv("PHUSION_PASSENGER_TMP", "utils_test.tmp", 1);
|
196
|
+
mkdir("utils_test.tmp", S_IRWXU);
|
197
|
+
{
|
198
|
+
TempFile t("temp", false);
|
199
|
+
}
|
200
|
+
bool dirEmpty = listDir("utils_test.tmp").empty();
|
201
|
+
removeDirTree("utils_test.tmp");
|
202
|
+
ensure(dirEmpty);
|
203
|
+
}
|
204
|
+
|
205
|
+
TEST_METHOD(22) {
|
206
|
+
// The temp file's filename is constructed using the given identifier.
|
207
|
+
setenv("PHUSION_PASSENGER_TMP", "utils_test.tmp", 1);
|
208
|
+
mkdir("utils_test.tmp", S_IRWXU);
|
209
|
+
TempFile t("foobar", false);
|
210
|
+
vector<string> files(listDir("utils_test.tmp"));
|
211
|
+
removeDirTree("utils_test.tmp");
|
212
|
+
|
213
|
+
ensure(files[0].find("foobar") != string::npos);
|
214
|
+
}
|
215
|
+
|
216
|
+
TEST_METHOD(23) {
|
217
|
+
// It immediately unlinks the temp file if 'anonymous' is true.
|
218
|
+
// It creates a temp file inside getPassengerTempDir().
|
219
|
+
setenv("PHUSION_PASSENGER_TMP", "utils_test.tmp", 1);
|
220
|
+
mkdir("utils_test.tmp", S_IRWXU);
|
221
|
+
TempFile t;
|
222
|
+
unsigned int size = listDir("utils_test.tmp").size();
|
223
|
+
removeDirTree("utils_test.tmp");
|
224
|
+
ensure_equals(size, 0u);
|
225
|
+
}
|
226
|
+
|
227
|
+
/***** Test escapeForXml() *****/
|
228
|
+
|
229
|
+
TEST_METHOD(25) {
|
230
|
+
ensure_equals(escapeForXml(""), "");
|
231
|
+
ensure_equals(escapeForXml("hello world"), "hello world");
|
232
|
+
ensure_equals(escapeForXml("./hello_world/foo.txt"), "./hello_world/foo.txt");
|
233
|
+
ensure_equals(escapeForXml("hello<world"), "hello<world");
|
234
|
+
ensure_equals(escapeForXml("hello\xFFworld"), "helloÿworld");
|
235
|
+
ensure_equals(escapeForXml("hello\xFF\xCCworld"), "helloÿÌworld");
|
236
|
+
ensure_equals(escapeForXml("hello\xFFworld\xCC"), "helloÿworldÌ");
|
237
|
+
}
|
101
238
|
}
|
data/test/integration_tests.rb
CHANGED
@@ -8,9 +8,7 @@ require 'support/config'
|
|
8
8
|
require 'support/test_helper'
|
9
9
|
require 'support/multipart'
|
10
10
|
require 'support/apache2_controller'
|
11
|
-
require '
|
12
|
-
|
13
|
-
include PlatformInfo
|
11
|
+
require 'phusion_passenger/platform_info'
|
14
12
|
|
15
13
|
# TODO: test the 'RailsUserSwitching' and 'RailsDefaultUser' option.
|
16
14
|
# TODO: test custom page caching directory
|
@@ -80,11 +78,20 @@ shared_examples_for "MyCook(tm) beta" do
|
|
80
78
|
response = get_response('/welcome/headers_test')
|
81
79
|
response["X-Foo"].should == "Bar"
|
82
80
|
end
|
83
|
-
|
81
|
+
|
82
|
+
it "supports %2f in URIs" do
|
83
|
+
get('/welcome/show_id/foo%2fbar').should == 'foo/bar'
|
84
|
+
end
|
85
|
+
|
86
|
+
it "has AbstractRequest which returns a request_uri without hostname, with query_string" do
|
87
|
+
get('/welcome/request_uri?foo=bar%20escaped').should =~ %r{/welcome/request_uri\?foo=bar%20escaped}
|
88
|
+
end
|
89
|
+
|
84
90
|
it "supports restarting via restart.txt" do
|
85
91
|
begin
|
86
92
|
controller = "#{@stub.app_root}/app/controllers/test_controller.rb"
|
87
93
|
restart_file = "#{@stub.app_root}/tmp/restart.txt"
|
94
|
+
now = Time.now
|
88
95
|
|
89
96
|
File.open(controller, 'w') do |f|
|
90
97
|
f.write %q{
|
@@ -96,9 +103,10 @@ shared_examples_for "MyCook(tm) beta" do
|
|
96
103
|
end
|
97
104
|
}
|
98
105
|
end
|
99
|
-
File.open(restart_file, 'w')
|
106
|
+
File.open(restart_file, 'w').close
|
107
|
+
File.utime(now - 10, now - 10, restart_file)
|
100
108
|
get('/test').should == "foo"
|
101
|
-
|
109
|
+
|
102
110
|
File.open(controller, 'w') do |f|
|
103
111
|
f.write %q{
|
104
112
|
class TestController < ApplicationController
|
@@ -110,7 +118,7 @@ shared_examples_for "MyCook(tm) beta" do
|
|
110
118
|
}
|
111
119
|
end
|
112
120
|
|
113
|
-
File.
|
121
|
+
File.utime(now - 5, now - 5, restart_file)
|
114
122
|
get('/test').should == 'bar'
|
115
123
|
ensure
|
116
124
|
File.unlink(controller) rescue nil
|
@@ -124,6 +132,30 @@ shared_examples_for "MyCook(tm) beta" do
|
|
124
132
|
get('/').should =~ /Welcome to MyCook/
|
125
133
|
end
|
126
134
|
|
135
|
+
it "does not conflict with Phusion Passenger if there's a model named 'Passenger'" do
|
136
|
+
Dir.mkdir("#{@stub.app_root}/app/models") rescue nil
|
137
|
+
File.open("#{@stub.app_root}/app/models/passenger.rb", 'w') do |f|
|
138
|
+
f.write(%q{
|
139
|
+
class Passenger
|
140
|
+
def name
|
141
|
+
return "Gourry Gabriev"
|
142
|
+
end
|
143
|
+
end
|
144
|
+
})
|
145
|
+
end
|
146
|
+
begin
|
147
|
+
system "touch '#{@stub.app_root}/tmp/restart.txt'"
|
148
|
+
get('/welcome/passenger_name').should == 'Gourry Gabriev'
|
149
|
+
ensure
|
150
|
+
File.unlink("#{@stub.app_root}/app/models/passenger.rb") rescue nil
|
151
|
+
end
|
152
|
+
end
|
153
|
+
|
154
|
+
it "sets the 'Status' header" do
|
155
|
+
response = get_response('/nonexistant')
|
156
|
+
response["Status"].should == "404 Not Found"
|
157
|
+
end
|
158
|
+
|
127
159
|
if Process.uid == 0
|
128
160
|
it "runs as an unprivileged user" do
|
129
161
|
post('/welcome/touch')
|
@@ -157,7 +189,6 @@ shared_examples_for "HelloWorld Rack application" do
|
|
157
189
|
})
|
158
190
|
File.new("#{@stub.app_root}/tmp/restart.txt", "w").close
|
159
191
|
get('/').should == "changed"
|
160
|
-
File.exist?("#{@stub.app_root}/tmp/restart.txt").should == false
|
161
192
|
end
|
162
193
|
|
163
194
|
if Process.uid == 0
|
@@ -199,7 +230,6 @@ shared_examples_for "HelloWorld WSGI application" do
|
|
199
230
|
File.write("#{@stub.app_root}/passenger_wsgi.py", code)
|
200
231
|
File.new("#{@stub.app_root}/tmp/restart.txt", "w").close
|
201
232
|
get('/').should == "changed"
|
202
|
-
File.exist?("#{@stub.app_root}/tmp/restart.txt").should == false
|
203
233
|
end
|
204
234
|
|
205
235
|
if Process.uid == 0
|
@@ -238,7 +268,7 @@ describe "mod_passenger running in Apache 2" do
|
|
238
268
|
@server = "http://passenger.test:#{@apache2.port}"
|
239
269
|
@stub = setup_rails_stub('mycook')
|
240
270
|
@apache2 << "RailsMaxPoolSize 1"
|
241
|
-
@apache2.
|
271
|
+
@apache2.set_vhost("passenger.test", File.expand_path("#{@stub.app_root}/public"))
|
242
272
|
@apache2.start
|
243
273
|
end
|
244
274
|
|
@@ -305,7 +335,7 @@ describe "mod_passenger running in Apache 2" do
|
|
305
335
|
FileUtils.cp_r('stub/zsfa/.', 'tmp.webdir')
|
306
336
|
FileUtils.ln_sf(File.expand_path(@stub.app_root) + "/public", 'tmp.webdir/mycook')
|
307
337
|
|
308
|
-
@apache2.
|
338
|
+
@apache2.set_vhost('passenger.test', File.expand_path('tmp.webdir')) do |vhost|
|
309
339
|
vhost << "RailsBaseURI /mycook"
|
310
340
|
end
|
311
341
|
@apache2.start
|
@@ -330,18 +360,24 @@ describe "mod_passenger running in Apache 2" do
|
|
330
360
|
|
331
361
|
describe "configuration options" do
|
332
362
|
before :all do
|
363
|
+
@apache2 << "PassengerMaxPoolSize 3"
|
364
|
+
|
333
365
|
@stub = setup_rails_stub('mycook')
|
334
366
|
rails_dir = File.expand_path(@stub.app_root) + "/public"
|
335
|
-
|
336
|
-
@apache2.
|
367
|
+
|
368
|
+
@apache2.set_vhost('mycook.passenger.test', rails_dir)
|
369
|
+
|
370
|
+
@apache2.set_vhost('norails.passenger.test', rails_dir) do |vhost|
|
337
371
|
vhost << "RailsAutoDetect off"
|
338
372
|
end
|
339
373
|
|
340
374
|
@stub2 = setup_rails_stub('foobar', 'tmp.stub2')
|
341
375
|
rails_dir = File.expand_path(@stub2.app_root) + "/public"
|
342
|
-
@apache2.
|
376
|
+
@apache2.set_vhost('passenger.test', rails_dir) do |vhost|
|
343
377
|
vhost << "RailsEnv development"
|
344
378
|
vhost << "RailsSpawnMethod conservative"
|
379
|
+
vhost << "PassengerUseGlobalQueue on"
|
380
|
+
vhost << "PassengerRestartDir #{rails_dir}"
|
345
381
|
end
|
346
382
|
@apache2.start
|
347
383
|
end
|
@@ -356,12 +392,12 @@ describe "mod_passenger running in Apache 2" do
|
|
356
392
|
get('/').should_not =~ /MyCook/
|
357
393
|
end
|
358
394
|
|
359
|
-
|
395
|
+
specify "setting RailsAutoDetect for one virtual host should not interfere with others" do
|
360
396
|
@server = "http://mycook.passenger.test:#{@apache2.port}"
|
361
397
|
get('/').should =~ /MyCook/
|
362
398
|
end
|
363
399
|
|
364
|
-
|
400
|
+
specify "RailsEnv is per-virtual host" do
|
365
401
|
@server = "http://mycook.passenger.test:#{@apache2.port}"
|
366
402
|
get('/welcome/rails_env').should == "production"
|
367
403
|
|
@@ -374,10 +410,218 @@ describe "mod_passenger running in Apache 2" do
|
|
374
410
|
get('/foo/backtrace').should_not =~ /framework_spawner/
|
375
411
|
end
|
376
412
|
|
377
|
-
|
413
|
+
specify "RailsSpawnMethod spawning is per-virtual host" do
|
378
414
|
@server = "http://mycook.passenger.test:#{@apache2.port}"
|
379
|
-
get('/welcome/backtrace').should =~ /
|
415
|
+
get('/welcome/backtrace').should =~ /application_spawner/
|
416
|
+
end
|
417
|
+
|
418
|
+
it "looks for restart.txt in the directory specified by PassengerRestartDir" do
|
419
|
+
@server = "http://passenger.test:#{@apache2.port}"
|
420
|
+
controller = "#{@stub2.app_root}/app/controllers/bar_controller.rb"
|
421
|
+
restart_file = "#{@stub2.app_root}/public/restart.txt"
|
422
|
+
begin
|
423
|
+
File.open(controller, 'w') do |f|
|
424
|
+
f.write(%Q{
|
425
|
+
class BarController < ApplicationController
|
426
|
+
def index
|
427
|
+
render :text => 'hello world'
|
428
|
+
end
|
429
|
+
end
|
430
|
+
})
|
431
|
+
end
|
432
|
+
|
433
|
+
File.open(restart_file, 'w').close
|
434
|
+
get('/bar').should == "hello world"
|
435
|
+
|
436
|
+
File.open(controller, 'w') do |f|
|
437
|
+
f.write(%Q{
|
438
|
+
class BarController < ApplicationController
|
439
|
+
def index
|
440
|
+
render :text => 'oh hai'
|
441
|
+
end
|
442
|
+
end
|
443
|
+
})
|
444
|
+
end
|
445
|
+
|
446
|
+
now = Time.now
|
447
|
+
File.open(restart_file, 'w').close
|
448
|
+
File.utime(now - 10, now - 10, restart_file)
|
449
|
+
get('/bar').should == "oh hai"
|
450
|
+
ensure
|
451
|
+
File.unlink(controller) rescue nil
|
452
|
+
File.unlink(restart_file) rescue nil
|
453
|
+
end
|
454
|
+
end
|
455
|
+
|
456
|
+
describe "PassengerUseGlobalQueue" do
|
457
|
+
after :each do
|
458
|
+
# Restart Apache to reset the application pool's state.
|
459
|
+
@apache2.start
|
460
|
+
end
|
461
|
+
|
462
|
+
it "is off by default" do
|
463
|
+
@server = "http://mycook.passenger.test:#{@apache2.port}"
|
464
|
+
|
465
|
+
# Spawn the application.
|
466
|
+
get('/')
|
467
|
+
|
468
|
+
threads = []
|
469
|
+
# Reserve all application pool slots.
|
470
|
+
3.times do |i|
|
471
|
+
thread = Thread.new do
|
472
|
+
File.unlink("#{@stub.app_root}/#{i}.txt") rescue nil
|
473
|
+
get("/welcome/sleep_until_exists?name=#{i}.txt")
|
474
|
+
end
|
475
|
+
threads << thread
|
476
|
+
end
|
477
|
+
|
478
|
+
# Wait until all application instances are waiting
|
479
|
+
# for the quit file.
|
480
|
+
while !File.exist?("#{@stub.app_root}/waiting_0.txt") ||
|
481
|
+
!File.exist?("#{@stub.app_root}/waiting_1.txt") ||
|
482
|
+
!File.exist?("#{@stub.app_root}/waiting_2.txt")
|
483
|
+
sleep 0.1
|
484
|
+
end
|
485
|
+
|
486
|
+
# While all slots are reserved, make two more requests.
|
487
|
+
first_request_done = false
|
488
|
+
second_request_done = false
|
489
|
+
thread = Thread.new do
|
490
|
+
get("/")
|
491
|
+
first_request_done = true
|
492
|
+
end
|
493
|
+
threads << thread
|
494
|
+
thread = Thread.new do
|
495
|
+
get("/")
|
496
|
+
second_request_done = true
|
497
|
+
end
|
498
|
+
threads << thread
|
499
|
+
|
500
|
+
# These requests should both block.
|
501
|
+
sleep 0.5
|
502
|
+
first_request_done.should be_false
|
503
|
+
second_request_done.should be_false
|
504
|
+
|
505
|
+
# One of the requests should still be blocked
|
506
|
+
# if one application instance frees up.
|
507
|
+
File.open("#{@stub.app_root}/2.txt", 'w')
|
508
|
+
begin
|
509
|
+
Timeout.timeout(5) do
|
510
|
+
while !first_request_done && !second_request_done
|
511
|
+
sleep 0.1
|
512
|
+
end
|
513
|
+
end
|
514
|
+
rescue Timeout::Error
|
515
|
+
end
|
516
|
+
(first_request_done || second_request_done).should be_true
|
517
|
+
|
518
|
+
File.open("#{@stub.app_root}/0.txt", 'w')
|
519
|
+
File.open("#{@stub.app_root}/1.txt", 'w')
|
520
|
+
File.open("#{@stub.app_root}/2.txt", 'w')
|
521
|
+
threads.each do |thread|
|
522
|
+
thread.join
|
523
|
+
end
|
524
|
+
end
|
525
|
+
|
526
|
+
it "works and is per-virtual host" do
|
527
|
+
@server = "http://passenger.test:#{@apache2.port}"
|
528
|
+
|
529
|
+
# Spawn the application.
|
530
|
+
get('/')
|
531
|
+
|
532
|
+
threads = []
|
533
|
+
# Reserve all application pool slots.
|
534
|
+
3.times do |i|
|
535
|
+
thread = Thread.new do
|
536
|
+
File.unlink("#{@stub2.app_root}/#{i}.txt") rescue nil
|
537
|
+
get("/foo/sleep_until_exists?name=#{i}.txt")
|
538
|
+
end
|
539
|
+
threads << thread
|
540
|
+
end
|
541
|
+
|
542
|
+
# Wait until all application instances are waiting
|
543
|
+
# for the quit file.
|
544
|
+
while !File.exist?("#{@stub2.app_root}/waiting_0.txt") ||
|
545
|
+
!File.exist?("#{@stub2.app_root}/waiting_1.txt") ||
|
546
|
+
!File.exist?("#{@stub2.app_root}/waiting_2.txt")
|
547
|
+
sleep 0.1
|
548
|
+
end
|
549
|
+
|
550
|
+
# While all slots are reserved, make two more requests.
|
551
|
+
first_request_done = false
|
552
|
+
second_request_done = false
|
553
|
+
thread = Thread.new do
|
554
|
+
get("/")
|
555
|
+
first_request_done = true
|
556
|
+
end
|
557
|
+
threads << thread
|
558
|
+
thread = Thread.new do
|
559
|
+
get("/")
|
560
|
+
second_request_done = true
|
561
|
+
end
|
562
|
+
threads << thread
|
563
|
+
|
564
|
+
# These requests should both block.
|
565
|
+
sleep 0.5
|
566
|
+
first_request_done.should be_false
|
567
|
+
second_request_done.should be_false
|
568
|
+
|
569
|
+
# Both requests should be processed if one application instance frees up.
|
570
|
+
File.open("#{@stub2.app_root}/2.txt", 'w')
|
571
|
+
begin
|
572
|
+
Timeout.timeout(5) do
|
573
|
+
while !first_request_done || !second_request_done
|
574
|
+
sleep 0.1
|
575
|
+
end
|
576
|
+
end
|
577
|
+
rescue Timeout::Error
|
578
|
+
end
|
579
|
+
first_request_done.should be_true
|
580
|
+
second_request_done.should be_true
|
581
|
+
|
582
|
+
File.open("#{@stub2.app_root}/0.txt", 'w')
|
583
|
+
File.open("#{@stub2.app_root}/1.txt", 'w')
|
584
|
+
File.open("#{@stub2.app_root}/2.txt", 'w')
|
585
|
+
threads.each do |thread|
|
586
|
+
thread.join
|
587
|
+
end
|
588
|
+
end
|
589
|
+
end
|
590
|
+
|
591
|
+
describe "PassengerAppRoot" do
|
592
|
+
before :all do
|
593
|
+
@stub3 = setup_rails_stub('mycook', 'tmp.stub3')
|
594
|
+
doc_root = File.expand_path(@stub3.app_root) + "/sites/some.site/public"
|
595
|
+
@apache2.set_vhost('passenger.test', doc_root) do |vhost|
|
596
|
+
vhost << "PassengerAppRoot #{File.expand_path(@stub3.app_root).inspect}"
|
597
|
+
end
|
598
|
+
@apache2.start
|
599
|
+
end
|
600
|
+
|
601
|
+
after :all do
|
602
|
+
@stub3.destroy
|
603
|
+
end
|
604
|
+
|
605
|
+
it "supports page caching on non-index URIs" do
|
606
|
+
@server = "http://passenger.test:#{@apache2.port}"
|
607
|
+
get('/welcome/cached.html').should =~ %r{This is the cached version of some.site/public/welcome/cached}
|
608
|
+
end
|
609
|
+
|
610
|
+
it "supports page caching on index URIs" do
|
611
|
+
@server = "http://passenger.test:#{@apache2.port}"
|
612
|
+
get('/uploads.html').should =~ %r{This is the cached version of some.site/public/uploads}
|
613
|
+
end
|
614
|
+
|
615
|
+
it "works as a rails application" do
|
616
|
+
@server = "http://passenger.test:#{@apache2.port}"
|
617
|
+
result = get('/welcome/parameters_test?hello=world&recipe[name]=Green+Bananas')
|
618
|
+
result.should =~ %r{<hello>world</hello>}
|
619
|
+
result.should =~ %r{<recipe>}
|
620
|
+
result.should =~ %r{<name>Green Bananas</name>}
|
621
|
+
end
|
380
622
|
end
|
623
|
+
|
624
|
+
####################################
|
381
625
|
end
|
382
626
|
|
383
627
|
describe "error handling" do
|
@@ -385,7 +629,7 @@ describe "mod_passenger running in Apache 2" do
|
|
385
629
|
FileUtils.rm_rf('tmp.webdir')
|
386
630
|
FileUtils.mkdir_p('tmp.webdir')
|
387
631
|
@webdir = File.expand_path('tmp.webdir')
|
388
|
-
@apache2.
|
632
|
+
@apache2.set_vhost('passenger.test', @webdir) do |vhost|
|
389
633
|
vhost << "RailsBaseURI /app-with-nonexistant-rails-version/public"
|
390
634
|
vhost << "RailsBaseURI /app-that-crashes-during-startup/public"
|
391
635
|
vhost << "RailsBaseURI /app-with-crashing-vendor-rails/public"
|
@@ -435,7 +679,7 @@ describe "mod_passenger running in Apache 2" do
|
|
435
679
|
describe "Rack application running in root URI" do
|
436
680
|
before :all do
|
437
681
|
@stub = setup_stub('rack')
|
438
|
-
@apache2.
|
682
|
+
@apache2.set_vhost('passenger.test', File.expand_path(@stub.app_root) + "/public")
|
439
683
|
@apache2.start
|
440
684
|
@server = "http://passenger.test:#{@apache2.port}"
|
441
685
|
end
|
@@ -452,7 +696,7 @@ describe "mod_passenger running in Apache 2" do
|
|
452
696
|
FileUtils.rm_rf('tmp.webdir')
|
453
697
|
FileUtils.mkdir_p('tmp.webdir')
|
454
698
|
@stub = setup_stub('rack')
|
455
|
-
@apache2.
|
699
|
+
@apache2.set_vhost('passenger.test', File.expand_path('tmp.webdir')) do |vhost|
|
456
700
|
FileUtils.ln_s(File.expand_path(@stub.app_root) + "/public", 'tmp.webdir/rack')
|
457
701
|
vhost << "RackBaseURI /rack"
|
458
702
|
end
|
@@ -471,7 +715,7 @@ describe "mod_passenger running in Apache 2" do
|
|
471
715
|
describe "WSGI application running in root URI" do
|
472
716
|
before :all do
|
473
717
|
@stub = setup_stub('wsgi')
|
474
|
-
@apache2.
|
718
|
+
@apache2.set_vhost('passenger.test', File.expand_path(@stub.app_root) + "/public")
|
475
719
|
@apache2.start
|
476
720
|
@server = "http://passenger.test:#{@apache2.port}"
|
477
721
|
end
|
@@ -522,7 +766,10 @@ describe "mod_passenger running in Apache 2" do
|
|
522
766
|
def check_hosts_configuration
|
523
767
|
begin
|
524
768
|
ok = Resolv.getaddress("passenger.test") == "127.0.0.1"
|
525
|
-
rescue Resolv::ResolvError
|
769
|
+
rescue Resolv::ResolvError, ArgumentError
|
770
|
+
# There's a bug in Ruby 1.8.6-p287's resolv.rb library, which causes
|
771
|
+
# an ArgumentError to be raised instead of ResolvError when resolving
|
772
|
+
# failed.
|
526
773
|
ok = false
|
527
774
|
end
|
528
775
|
if !ok
|