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,57 @@
|
|
1
|
+
require 'uri'
|
2
|
+
|
3
|
+
module Rack
|
4
|
+
# Rack::ForwardRequest gets caught by Rack::Recursive and redirects
|
5
|
+
# the current request to the app at +url+.
|
6
|
+
#
|
7
|
+
# raise ForwardRequest.new("/not-found")
|
8
|
+
#
|
9
|
+
|
10
|
+
class ForwardRequest < Exception
|
11
|
+
attr_reader :url, :env
|
12
|
+
|
13
|
+
def initialize(url, env={})
|
14
|
+
@url = URI(url)
|
15
|
+
@env = env
|
16
|
+
|
17
|
+
@env["PATH_INFO"] = @url.path
|
18
|
+
@env["QUERY_STRING"] = @url.query if @url.query
|
19
|
+
@env["HTTP_HOST"] = @url.host if @url.host
|
20
|
+
@env["HTTP_PORT"] = @url.port if @url.port
|
21
|
+
@env["rack.url_scheme"] = @url.scheme if @url.scheme
|
22
|
+
|
23
|
+
super "forwarding to #{url}"
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
# Rack::Recursive allows applications called down the chain to
|
28
|
+
# include data from other applications (by using
|
29
|
+
# <tt>rack['rack.recursive.include'][...]</tt> or raise a
|
30
|
+
# ForwardRequest to redirect internally.
|
31
|
+
|
32
|
+
class Recursive
|
33
|
+
def initialize(app)
|
34
|
+
@app = app
|
35
|
+
end
|
36
|
+
|
37
|
+
def call(env)
|
38
|
+
@script_name = env["SCRIPT_NAME"]
|
39
|
+
@app.call(env.merge('rack.recursive.include' => method(:include)))
|
40
|
+
rescue ForwardRequest => req
|
41
|
+
call(env.merge(req.env))
|
42
|
+
end
|
43
|
+
|
44
|
+
def include(env, path)
|
45
|
+
unless path.index(@script_name) == 0 && (path[@script_name.size] == ?/ ||
|
46
|
+
path[@script_name.size].nil?)
|
47
|
+
raise ArgumentError, "can only include below #{@script_name}, not #{path}"
|
48
|
+
end
|
49
|
+
|
50
|
+
env = env.merge("PATH_INFO" => path, "SCRIPT_NAME" => @script_name,
|
51
|
+
"REQUEST_METHOD" => "GET",
|
52
|
+
"CONTENT_LENGTH" => "0", "CONTENT_TYPE" => "",
|
53
|
+
"rack.input" => StringIO.new(""))
|
54
|
+
@app.call(env)
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
@@ -0,0 +1,64 @@
|
|
1
|
+
require 'thread'
|
2
|
+
|
3
|
+
module Rack
|
4
|
+
# Rack::Reloader checks on every request, but at most every +secs+
|
5
|
+
# seconds, if a file loaded changed, and reloads it, logging to
|
6
|
+
# rack.errors.
|
7
|
+
#
|
8
|
+
# It is recommended you use ShowExceptions to catch SyntaxErrors etc.
|
9
|
+
|
10
|
+
class Reloader
|
11
|
+
def initialize(app, secs=10)
|
12
|
+
@app = app
|
13
|
+
@secs = secs # reload every @secs seconds max
|
14
|
+
@last = Time.now
|
15
|
+
end
|
16
|
+
|
17
|
+
def call(env)
|
18
|
+
if Time.now > @last + @secs
|
19
|
+
Thread.exclusive {
|
20
|
+
reload!(env['rack.errors'])
|
21
|
+
@last = Time.now
|
22
|
+
}
|
23
|
+
end
|
24
|
+
|
25
|
+
@app.call(env)
|
26
|
+
end
|
27
|
+
|
28
|
+
def reload!(stderr=STDERR)
|
29
|
+
need_reload = $LOADED_FEATURES.find_all { |loaded|
|
30
|
+
begin
|
31
|
+
if loaded =~ /\A[.\/]/ # absolute filename or 1.9
|
32
|
+
abs = loaded
|
33
|
+
else
|
34
|
+
abs = $LOAD_PATH.map { |path| ::File.join(path, loaded) }.
|
35
|
+
find { |file| ::File.exist? file }
|
36
|
+
end
|
37
|
+
|
38
|
+
if abs
|
39
|
+
::File.mtime(abs) > @last - @secs rescue false
|
40
|
+
else
|
41
|
+
false
|
42
|
+
end
|
43
|
+
end
|
44
|
+
}
|
45
|
+
|
46
|
+
need_reload.each { |l|
|
47
|
+
$LOADED_FEATURES.delete l
|
48
|
+
}
|
49
|
+
|
50
|
+
need_reload.each { |to_load|
|
51
|
+
begin
|
52
|
+
if require to_load
|
53
|
+
stderr.puts "#{self.class}: reloaded `#{to_load}'"
|
54
|
+
end
|
55
|
+
rescue LoadError, SyntaxError => e
|
56
|
+
raise e # Possibly ShowExceptions
|
57
|
+
end
|
58
|
+
}
|
59
|
+
|
60
|
+
stderr.flush
|
61
|
+
need_reload
|
62
|
+
end
|
63
|
+
end
|
64
|
+
end
|
@@ -0,0 +1,218 @@
|
|
1
|
+
require 'rack/utils'
|
2
|
+
|
3
|
+
module Rack
|
4
|
+
# Rack::Request provides a convenient interface to a Rack
|
5
|
+
# environment. It is stateless, the environment +env+ passed to the
|
6
|
+
# constructor will be directly modified.
|
7
|
+
#
|
8
|
+
# req = Rack::Request.new(env)
|
9
|
+
# req.post?
|
10
|
+
# req.params["data"]
|
11
|
+
|
12
|
+
class Request
|
13
|
+
# The environment of the request.
|
14
|
+
attr_reader :env
|
15
|
+
|
16
|
+
def initialize(env)
|
17
|
+
@env = env
|
18
|
+
end
|
19
|
+
|
20
|
+
def body; @env["rack.input"] end
|
21
|
+
def scheme; @env["rack.url_scheme"] end
|
22
|
+
def script_name; @env["SCRIPT_NAME"].to_s end
|
23
|
+
def path_info; @env["PATH_INFO"].to_s end
|
24
|
+
def port; @env["SERVER_PORT"].to_i end
|
25
|
+
def request_method; @env["REQUEST_METHOD"] end
|
26
|
+
def query_string; @env["QUERY_STRING"].to_s end
|
27
|
+
def content_length; @env['CONTENT_LENGTH'] end
|
28
|
+
def content_type; @env['CONTENT_TYPE'] end
|
29
|
+
|
30
|
+
# The media type (type/subtype) portion of the CONTENT_TYPE header
|
31
|
+
# without any media type parameters. e.g., when CONTENT_TYPE is
|
32
|
+
# "text/plain;charset=utf-8", the media-type is "text/plain".
|
33
|
+
#
|
34
|
+
# For more information on the use of media types in HTTP, see:
|
35
|
+
# http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7
|
36
|
+
def media_type
|
37
|
+
content_type && content_type.split(/\s*[;,]\s*/, 2)[0].downcase
|
38
|
+
end
|
39
|
+
|
40
|
+
# The media type parameters provided in CONTENT_TYPE as a Hash, or
|
41
|
+
# an empty Hash if no CONTENT_TYPE or media-type parameters were
|
42
|
+
# provided. e.g., when the CONTENT_TYPE is "text/plain;charset=utf-8",
|
43
|
+
# this method responds with the following Hash:
|
44
|
+
# { 'charset' => 'utf-8' }
|
45
|
+
def media_type_params
|
46
|
+
return {} if content_type.nil?
|
47
|
+
content_type.split(/\s*[;,]\s*/)[1..-1].
|
48
|
+
collect { |s| s.split('=', 2) }.
|
49
|
+
inject({}) { |hash,(k,v)| hash[k.downcase] = v ; hash }
|
50
|
+
end
|
51
|
+
|
52
|
+
# The character set of the request body if a "charset" media type
|
53
|
+
# parameter was given, or nil if no "charset" was specified. Note
|
54
|
+
# that, per RFC2616, text/* media types that specify no explicit
|
55
|
+
# charset are to be considered ISO-8859-1.
|
56
|
+
def content_charset
|
57
|
+
media_type_params['charset']
|
58
|
+
end
|
59
|
+
|
60
|
+
def host
|
61
|
+
# Remove port number.
|
62
|
+
(@env["HTTP_HOST"] || @env["SERVER_NAME"]).gsub(/:\d+\z/, '')
|
63
|
+
end
|
64
|
+
|
65
|
+
def script_name=(s); @env["SCRIPT_NAME"] = s.to_s end
|
66
|
+
def path_info=(s); @env["PATH_INFO"] = s.to_s end
|
67
|
+
|
68
|
+
def get?; request_method == "GET" end
|
69
|
+
def post?; request_method == "POST" end
|
70
|
+
def put?; request_method == "PUT" end
|
71
|
+
def delete?; request_method == "DELETE" end
|
72
|
+
def head?; request_method == "HEAD" end
|
73
|
+
|
74
|
+
# The set of form-data media-types. Requests that do not indicate
|
75
|
+
# one of the media types presents in this list will not be eligible
|
76
|
+
# for form-data / param parsing.
|
77
|
+
FORM_DATA_MEDIA_TYPES = [
|
78
|
+
nil,
|
79
|
+
'application/x-www-form-urlencoded',
|
80
|
+
'multipart/form-data'
|
81
|
+
]
|
82
|
+
|
83
|
+
# Determine whether the request body contains form-data by checking
|
84
|
+
# the request media_type against registered form-data media-types:
|
85
|
+
# "application/x-www-form-urlencoded" and "multipart/form-data". The
|
86
|
+
# list of form-data media types can be modified through the
|
87
|
+
# +FORM_DATA_MEDIA_TYPES+ array.
|
88
|
+
def form_data?
|
89
|
+
FORM_DATA_MEDIA_TYPES.include?(media_type)
|
90
|
+
end
|
91
|
+
|
92
|
+
# Returns the data recieved in the query string.
|
93
|
+
def GET
|
94
|
+
if @env["rack.request.query_string"] == query_string
|
95
|
+
@env["rack.request.query_hash"]
|
96
|
+
else
|
97
|
+
@env["rack.request.query_string"] = query_string
|
98
|
+
@env["rack.request.query_hash"] =
|
99
|
+
Utils.parse_query(query_string)
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
# Returns the data recieved in the request body.
|
104
|
+
#
|
105
|
+
# This method support both application/x-www-form-urlencoded and
|
106
|
+
# multipart/form-data.
|
107
|
+
def POST
|
108
|
+
if @env["rack.request.form_input"].eql? @env["rack.input"]
|
109
|
+
@env["rack.request.form_hash"]
|
110
|
+
elsif form_data?
|
111
|
+
@env["rack.request.form_input"] = @env["rack.input"]
|
112
|
+
unless @env["rack.request.form_hash"] =
|
113
|
+
Utils::Multipart.parse_multipart(env)
|
114
|
+
@env["rack.request.form_vars"] = @env["rack.input"].read
|
115
|
+
@env["rack.request.form_hash"] = Utils.parse_query(@env["rack.request.form_vars"])
|
116
|
+
@env["rack.input"].rewind if @env["rack.input"].respond_to?(:rewind)
|
117
|
+
end
|
118
|
+
@env["rack.request.form_hash"]
|
119
|
+
else
|
120
|
+
{}
|
121
|
+
end
|
122
|
+
end
|
123
|
+
|
124
|
+
# The union of GET and POST data.
|
125
|
+
def params
|
126
|
+
self.put? ? self.GET : self.GET.update(self.POST)
|
127
|
+
rescue EOFError => e
|
128
|
+
self.GET
|
129
|
+
end
|
130
|
+
|
131
|
+
# shortcut for request.params[key]
|
132
|
+
def [](key)
|
133
|
+
params[key.to_s]
|
134
|
+
end
|
135
|
+
|
136
|
+
# shortcut for request.params[key] = value
|
137
|
+
def []=(key, value)
|
138
|
+
params[key.to_s] = value
|
139
|
+
end
|
140
|
+
|
141
|
+
# like Hash#values_at
|
142
|
+
def values_at(*keys)
|
143
|
+
keys.map{|key| params[key] }
|
144
|
+
end
|
145
|
+
|
146
|
+
# the referer of the client or '/'
|
147
|
+
def referer
|
148
|
+
@env['HTTP_REFERER'] || '/'
|
149
|
+
end
|
150
|
+
alias referrer referer
|
151
|
+
|
152
|
+
|
153
|
+
def cookies
|
154
|
+
return {} unless @env["HTTP_COOKIE"]
|
155
|
+
|
156
|
+
if @env["rack.request.cookie_string"] == @env["HTTP_COOKIE"]
|
157
|
+
@env["rack.request.cookie_hash"]
|
158
|
+
else
|
159
|
+
@env["rack.request.cookie_string"] = @env["HTTP_COOKIE"]
|
160
|
+
# According to RFC 2109:
|
161
|
+
# If multiple cookies satisfy the criteria above, they are ordered in
|
162
|
+
# the Cookie header such that those with more specific Path attributes
|
163
|
+
# precede those with less specific. Ordering with respect to other
|
164
|
+
# attributes (e.g., Domain) is unspecified.
|
165
|
+
@env["rack.request.cookie_hash"] =
|
166
|
+
Utils.parse_query(@env["rack.request.cookie_string"], ';,').inject({}) {|h,(k,v)|
|
167
|
+
h[k] = Array === v ? v.first : v
|
168
|
+
h
|
169
|
+
}
|
170
|
+
end
|
171
|
+
end
|
172
|
+
|
173
|
+
def xhr?
|
174
|
+
@env["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest"
|
175
|
+
end
|
176
|
+
|
177
|
+
# Tries to return a remake of the original request URL as a string.
|
178
|
+
def url
|
179
|
+
url = scheme + "://"
|
180
|
+
url << host
|
181
|
+
|
182
|
+
if scheme == "https" && port != 443 ||
|
183
|
+
scheme == "http" && port != 80
|
184
|
+
url << ":#{port}"
|
185
|
+
end
|
186
|
+
|
187
|
+
url << fullpath
|
188
|
+
|
189
|
+
url
|
190
|
+
end
|
191
|
+
|
192
|
+
def fullpath
|
193
|
+
path = script_name + path_info
|
194
|
+
path << "?" << query_string unless query_string.empty?
|
195
|
+
path
|
196
|
+
end
|
197
|
+
|
198
|
+
def accept_encoding
|
199
|
+
@env["HTTP_ACCEPT_ENCODING"].to_s.split(/,\s*/).map do |part|
|
200
|
+
m = /^([^\s,]+?)(?:;\s*q=(\d+(?:\.\d+)?))?$/.match(part) # From WEBrick
|
201
|
+
|
202
|
+
if m
|
203
|
+
[m[1], (m[2] || 1.0).to_f]
|
204
|
+
else
|
205
|
+
raise "Invalid value for Accept-Encoding: #{part.inspect}"
|
206
|
+
end
|
207
|
+
end
|
208
|
+
end
|
209
|
+
|
210
|
+
def ip
|
211
|
+
if addr = @env['HTTP_X_FORWARDED_FOR']
|
212
|
+
addr.split(',').last.strip
|
213
|
+
else
|
214
|
+
@env['REMOTE_ADDR']
|
215
|
+
end
|
216
|
+
end
|
217
|
+
end
|
218
|
+
end
|
@@ -0,0 +1,171 @@
|
|
1
|
+
require 'rack/request'
|
2
|
+
require 'rack/utils'
|
3
|
+
|
4
|
+
module Rack
|
5
|
+
# Rack::Response provides a convenient interface to create a Rack
|
6
|
+
# response.
|
7
|
+
#
|
8
|
+
# It allows setting of headers and cookies, and provides useful
|
9
|
+
# defaults (a OK response containing HTML).
|
10
|
+
#
|
11
|
+
# You can use Response#write to iteratively generate your response,
|
12
|
+
# but note that this is buffered by Rack::Response until you call
|
13
|
+
# +finish+. +finish+ however can take a block inside which calls to
|
14
|
+
# +write+ are syncronous with the Rack response.
|
15
|
+
#
|
16
|
+
# Your application's +call+ should end returning Response#finish.
|
17
|
+
|
18
|
+
class Response
|
19
|
+
def initialize(body=[], status=200, header={}, &block)
|
20
|
+
@status = status
|
21
|
+
@header = Utils::HeaderHash.new({"Content-Type" => "text/html"}.
|
22
|
+
merge(header))
|
23
|
+
|
24
|
+
@writer = lambda { |x| @body << x }
|
25
|
+
@block = nil
|
26
|
+
@length = 0
|
27
|
+
|
28
|
+
@body = []
|
29
|
+
|
30
|
+
if body.respond_to? :to_str
|
31
|
+
write body.to_str
|
32
|
+
elsif body.respond_to?(:each)
|
33
|
+
body.each { |part|
|
34
|
+
write part.to_s
|
35
|
+
}
|
36
|
+
else
|
37
|
+
raise TypeError, "stringable or iterable required"
|
38
|
+
end
|
39
|
+
|
40
|
+
yield self if block_given?
|
41
|
+
end
|
42
|
+
|
43
|
+
attr_reader :header
|
44
|
+
attr_accessor :status, :body
|
45
|
+
|
46
|
+
def [](key)
|
47
|
+
header[key]
|
48
|
+
end
|
49
|
+
|
50
|
+
def []=(key, value)
|
51
|
+
header[key] = value
|
52
|
+
end
|
53
|
+
|
54
|
+
def set_cookie(key, value)
|
55
|
+
case value
|
56
|
+
when Hash
|
57
|
+
domain = "; domain=" + value[:domain] if value[:domain]
|
58
|
+
path = "; path=" + value[:path] if value[:path]
|
59
|
+
# According to RFC 2109, we need dashes here.
|
60
|
+
# N.B.: cgi.rb uses spaces...
|
61
|
+
expires = "; expires=" + value[:expires].clone.gmtime.
|
62
|
+
strftime("%a, %d-%b-%Y %H:%M:%S GMT") if value[:expires]
|
63
|
+
secure = "; secure" if value[:secure]
|
64
|
+
value = value[:value]
|
65
|
+
end
|
66
|
+
value = [value] unless Array === value
|
67
|
+
cookie = Utils.escape(key) + "=" +
|
68
|
+
value.map { |v| Utils.escape v }.join("&") +
|
69
|
+
"#{domain}#{path}#{expires}#{secure}"
|
70
|
+
|
71
|
+
case self["Set-Cookie"]
|
72
|
+
when Array
|
73
|
+
self["Set-Cookie"] << cookie
|
74
|
+
when String
|
75
|
+
self["Set-Cookie"] = [self["Set-Cookie"], cookie]
|
76
|
+
when nil
|
77
|
+
self["Set-Cookie"] = cookie
|
78
|
+
end
|
79
|
+
end
|
80
|
+
|
81
|
+
def delete_cookie(key, value={})
|
82
|
+
unless Array === self["Set-Cookie"]
|
83
|
+
self["Set-Cookie"] = [self["Set-Cookie"]].compact
|
84
|
+
end
|
85
|
+
|
86
|
+
self["Set-Cookie"].reject! { |cookie|
|
87
|
+
cookie =~ /\A#{Utils.escape(key)}=/
|
88
|
+
}
|
89
|
+
|
90
|
+
set_cookie(key,
|
91
|
+
{:value => '', :path => nil, :domain => nil,
|
92
|
+
:expires => Time.at(0) }.merge(value))
|
93
|
+
end
|
94
|
+
|
95
|
+
|
96
|
+
def finish(&block)
|
97
|
+
@block = block
|
98
|
+
|
99
|
+
if [204, 304].include?(status.to_i)
|
100
|
+
header.delete "Content-Type"
|
101
|
+
[status.to_i, header.to_hash, []]
|
102
|
+
else
|
103
|
+
header["Content-Length"] ||= @length.to_s
|
104
|
+
[status.to_i, header.to_hash, self]
|
105
|
+
end
|
106
|
+
end
|
107
|
+
alias to_a finish # For *response
|
108
|
+
|
109
|
+
def each(&callback)
|
110
|
+
@body.each(&callback)
|
111
|
+
@writer = callback
|
112
|
+
@block.call(self) if @block
|
113
|
+
end
|
114
|
+
|
115
|
+
def write(str)
|
116
|
+
s = str.to_s
|
117
|
+
@length += s.size
|
118
|
+
@writer.call s
|
119
|
+
str
|
120
|
+
end
|
121
|
+
|
122
|
+
def close
|
123
|
+
body.close if body.respond_to?(:close)
|
124
|
+
end
|
125
|
+
|
126
|
+
def empty?
|
127
|
+
@block == nil && @body.empty?
|
128
|
+
end
|
129
|
+
|
130
|
+
alias headers header
|
131
|
+
|
132
|
+
module Helpers
|
133
|
+
def invalid?; @status < 100 || @status >= 600; end
|
134
|
+
|
135
|
+
def informational?; @status >= 100 && @status < 200; end
|
136
|
+
def successful?; @status >= 200 && @status < 300; end
|
137
|
+
def redirection?; @status >= 300 && @status < 400; end
|
138
|
+
def client_error?; @status >= 400 && @status < 500; end
|
139
|
+
def server_error?; @status >= 500 && @status < 600; end
|
140
|
+
|
141
|
+
def ok?; @status == 200; end
|
142
|
+
def forbidden?; @status == 403; end
|
143
|
+
def not_found?; @status == 404; end
|
144
|
+
|
145
|
+
def redirect?; [301, 302, 303, 307].include? @status; end
|
146
|
+
def empty?; [201, 204, 304].include? @status; end
|
147
|
+
|
148
|
+
# Headers
|
149
|
+
attr_reader :headers, :original_headers
|
150
|
+
|
151
|
+
def include?(header)
|
152
|
+
!!headers[header]
|
153
|
+
end
|
154
|
+
|
155
|
+
def content_type
|
156
|
+
headers["Content-Type"]
|
157
|
+
end
|
158
|
+
|
159
|
+
def content_length
|
160
|
+
cl = headers["Content-Length"]
|
161
|
+
cl ? cl.to_i : cl
|
162
|
+
end
|
163
|
+
|
164
|
+
def location
|
165
|
+
headers["Location"]
|
166
|
+
end
|
167
|
+
end
|
168
|
+
|
169
|
+
include Helpers
|
170
|
+
end
|
171
|
+
end
|