passenger 3.0.0 → 3.0.1
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 +9 -6
- data/NEWS +50 -0
- data/Rakefile +2 -1
- data/bin/passenger-install-apache2-module +4 -4
- data/bin/passenger-install-nginx-module +1 -1
- data/bin/passenger-make-enterprisey +1 -1
- data/build/agents.rb +26 -19
- data/build/apache2.rb +49 -46
- data/build/basics.rb +37 -13
- data/build/common_library.rb +134 -64
- data/build/config.rb +18 -11
- data/build/cplusplus_support.rb +4 -0
- data/build/cxx_tests.rb +26 -12
- data/build/documentation.rb +18 -11
- data/build/integration_tests.rb +18 -11
- data/build/misc.rb +18 -11
- data/build/nginx.rb +27 -19
- data/build/oxt_tests.rb +18 -11
- data/build/packaging.rb +45 -37
- data/build/rpm.rb +98 -0
- data/build/ruby_extension.rb +19 -13
- data/build/ruby_tests.rb +19 -12
- data/build/test_basics.rb +23 -11
- data/debian/README.Debian +15 -0
- data/debian/changelog +185 -0
- data/debian/control +47 -19
- data/debian/copyright +20 -0
- data/debian/libapache2-mod-passenger.install +1 -0
- data/debian/libapache2-mod-passenger.postinst +36 -0
- data/debian/libapache2-mod-passenger.prerm +15 -0
- data/debian/passenger-common.install +4 -0
- data/debian/passenger.conf +4 -0
- data/debian/passenger.load +1 -0
- data/debian/rules +37 -0
- data/debian/watch +3 -0
- data/{misc → dev}/copy_boost_headers.rb +3 -0
- data/{misc → dev}/find_owner_pipe_leaks.rb +0 -0
- data/{misc → dev}/render_error_pages.rb +0 -0
- data/doc/Users guide Apache.html +39 -1
- data/doc/Users guide Apache.txt +40 -0
- data/doc/Users guide Nginx.html +1 -1
- data/doc/Users guide Standalone.html +1 -1
- data/doc/cxxapi/Constants_8h_source.html +1 -1
- data/doc/cxxapi/DirectoryMapper_8h_source.html +6 -22
- data/doc/cxxapi/EventedClient_8h_source.html +572 -468
- data/doc/cxxapi/Exceptions_8h_source.html +142 -129
- data/doc/cxxapi/FileDescriptor_8h_source.html +263 -199
- data/doc/cxxapi/MessageChannel_8h_source.html +686 -770
- data/doc/cxxapi/MessageServer_8h_source.html +1 -1
- data/doc/cxxapi/PoolOptions_8h_source.html +79 -78
- data/doc/cxxapi/ResourceLocator_8h_source.html +105 -55
- data/doc/cxxapi/SafeLibev_8h_source.html +180 -0
- data/doc/cxxapi/ServerInstanceDir_8h_source.html +114 -110
- data/doc/cxxapi/Session_8h_source.html +1 -1
- data/doc/cxxapi/SpawnManager_8h_source.html +208 -208
- data/doc/cxxapi/StaticString_8h_source.html +258 -183
- data/doc/cxxapi/Utils_8h_source.html +71 -54
- data/doc/cxxapi/annotated.html +3 -0
- data/doc/cxxapi/classAgentWatcher.html +2 -2
- data/doc/cxxapi/classPassenger_1_1DirectoryMapper-members.html +0 -1
- data/doc/cxxapi/classPassenger_1_1DirectoryMapper.html +0 -27
- data/doc/cxxapi/classPassenger_1_1EventedClient-members.html +5 -0
- data/doc/cxxapi/classPassenger_1_1EventedClient.html +102 -7
- data/doc/cxxapi/classPassenger_1_1FileDescriptor-members.html +2 -1
- data/doc/cxxapi/classPassenger_1_1FileDescriptor.html +34 -8
- data/doc/cxxapi/classPassenger_1_1FileDescriptorPair-members.html +36 -0
- data/doc/cxxapi/classPassenger_1_1FileDescriptorPair.html +52 -0
- data/doc/cxxapi/classPassenger_1_1MessageChannel-members.html +0 -3
- data/doc/cxxapi/classPassenger_1_1MessageChannel.html +0 -120
- data/doc/cxxapi/classPassenger_1_1SafeLibev-members.html +36 -0
- data/doc/cxxapi/classPassenger_1_1SafeLibev.html +51 -0
- data/doc/cxxapi/classPassenger_1_1SpawnException-members.html +1 -0
- data/doc/cxxapi/classPassenger_1_1SpawnException.html +22 -0
- data/doc/cxxapi/classes.html +14 -14
- data/doc/cxxapi/files.html +2 -0
- data/doc/cxxapi/functions_0x63.html +6 -3
- data/doc/cxxapi/functions_0x64.html +9 -2
- data/doc/cxxapi/functions_0x67.html +6 -9
- data/doc/cxxapi/functions_0x69.html +3 -0
- data/doc/cxxapi/functions_0x77.html +8 -8
- data/doc/cxxapi/functions_eval.html +6 -0
- data/doc/cxxapi/functions_func.html +18 -17
- data/doc/cxxapi/functions_vars.html +8 -0
- data/doc/cxxapi/graph_legend.png +0 -0
- data/doc/cxxapi/group__Core.png +0 -0
- data/doc/cxxapi/group__Hooks.png +0 -0
- data/doc/cxxapi/hierarchy.html +3 -0
- data/doc/cxxapi/inherit__graph__14.map +1 -1
- 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 -3
- 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 +3 -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.map +1 -1
- data/doc/cxxapi/inherit__graph__17.md5 +1 -1
- data/doc/cxxapi/inherit__graph__17.png +0 -0
- data/doc/cxxapi/inherit__graph__18.map +1 -2
- data/doc/cxxapi/inherit__graph__18.md5 +1 -1
- data/doc/cxxapi/inherit__graph__18.png +0 -0
- data/doc/cxxapi/inherit__graph__19.map +2 -1
- data/doc/cxxapi/inherit__graph__19.md5 +1 -1
- data/doc/cxxapi/inherit__graph__19.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__22.map +1 -1
- data/doc/cxxapi/inherit__graph__22.md5 +1 -1
- data/doc/cxxapi/inherit__graph__22.png +0 -0
- data/doc/cxxapi/inherit__graph__23.map +1 -1
- data/doc/cxxapi/inherit__graph__23.md5 +1 -1
- data/doc/cxxapi/inherit__graph__23.png +0 -0
- data/doc/cxxapi/inherit__graph__24.map +1 -1
- data/doc/cxxapi/inherit__graph__24.md5 +1 -1
- data/doc/cxxapi/inherit__graph__24.png +0 -0
- data/doc/cxxapi/inherit__graph__25.map +1 -1
- data/doc/cxxapi/inherit__graph__25.md5 +1 -1
- data/doc/cxxapi/inherit__graph__25.png +0 -0
- data/doc/cxxapi/inherit__graph__26.map +1 -1
- data/doc/cxxapi/inherit__graph__26.md5 +1 -1
- data/doc/cxxapi/inherit__graph__26.png +0 -0
- data/doc/cxxapi/inherit__graph__27.map +1 -1
- data/doc/cxxapi/inherit__graph__27.md5 +1 -1
- data/doc/cxxapi/inherit__graph__27.png +0 -0
- data/doc/cxxapi/inherit__graph__28.map +1 -2
- data/doc/cxxapi/inherit__graph__28.md5 +1 -1
- data/doc/cxxapi/inherit__graph__28.png +0 -0
- data/doc/cxxapi/inherit__graph__29.map +1 -1
- data/doc/cxxapi/inherit__graph__29.md5 +1 -1
- data/doc/cxxapi/inherit__graph__29.png +0 -0
- data/doc/cxxapi/inherit__graph__30.map +1 -1
- data/doc/cxxapi/inherit__graph__30.md5 +1 -1
- data/doc/cxxapi/inherit__graph__30.png +0 -0
- data/doc/cxxapi/inherit__graph__31.map +2 -1
- data/doc/cxxapi/inherit__graph__31.md5 +1 -1
- data/doc/cxxapi/inherit__graph__31.png +0 -0
- data/doc/cxxapi/inherit__graph__32.map +1 -3
- data/doc/cxxapi/inherit__graph__32.md5 +1 -1
- data/doc/cxxapi/inherit__graph__32.png +0 -0
- data/doc/cxxapi/inherit__graph__33.map +1 -1
- data/doc/cxxapi/inherit__graph__33.md5 +1 -1
- data/doc/cxxapi/inherit__graph__33.png +0 -0
- data/doc/cxxapi/inherit__graph__34.map +1 -1
- data/doc/cxxapi/inherit__graph__34.md5 +1 -1
- data/doc/cxxapi/inherit__graph__34.png +0 -0
- data/doc/cxxapi/inherit__graph__35.map +3 -1
- data/doc/cxxapi/inherit__graph__35.md5 +1 -1
- data/doc/cxxapi/inherit__graph__35.png +0 -0
- data/doc/cxxapi/inherit__graph__36.map +1 -1
- data/doc/cxxapi/inherit__graph__36.md5 +1 -1
- data/doc/cxxapi/inherit__graph__36.png +0 -0
- data/doc/cxxapi/inherit__graph__37.map +1 -1
- data/doc/cxxapi/inherit__graph__37.md5 +1 -1
- data/doc/cxxapi/inherit__graph__37.png +0 -0
- data/doc/cxxapi/inherit__graph__38.map +3 -1
- data/doc/cxxapi/inherit__graph__38.md5 +1 -1
- data/doc/cxxapi/inherit__graph__38.png +0 -0
- data/doc/cxxapi/inherit__graph__39.map +3 -1
- data/doc/cxxapi/inherit__graph__39.md5 +1 -1
- data/doc/cxxapi/inherit__graph__39.png +0 -0
- data/doc/cxxapi/inherits.html +33 -24
- data/doc/cxxapi/namespacePassenger.html +52 -0
- data/doc/cxxapi/namespacemembers.html +6 -0
- data/doc/cxxapi/namespacemembers_func.html +6 -0
- data/doc/cxxapi/tree.html +8 -0
- data/ext/apache2/Configuration.cpp +30 -8
- data/ext/apache2/Configuration.hpp +15 -14
- data/ext/apache2/DirectoryMapper.h +0 -16
- data/ext/apache2/Hooks.cpp +30 -29
- data/ext/boost/algorithm/string/detail/case_conv.hpp +6 -6
- data/ext/boost/algorithm/string/detail/find_format.hpp +14 -4
- data/ext/boost/algorithm/string/detail/find_format_all.hpp +13 -3
- data/ext/boost/algorithm/string/detail/find_format_store.hpp +11 -0
- data/ext/boost/algorithm/string/erase.hpp +2 -2
- data/ext/boost/bind/placeholders.hpp +2 -2
- data/ext/boost/concept/detail/backward_compatibility.hpp +16 -0
- data/ext/boost/concept/detail/general.hpp +15 -6
- data/ext/boost/concept/detail/has_constraints.hpp +5 -3
- data/ext/boost/concept/usage.hpp +5 -4
- data/ext/boost/concept_check.hpp +10 -1
- data/ext/boost/config/abi/borland_prefix.hpp +1 -1
- data/ext/boost/config/auto_link.hpp +68 -21
- data/ext/boost/config/compiler/borland.hpp +11 -3
- data/ext/boost/config/compiler/clang.hpp +62 -0
- data/ext/boost/config/compiler/codegear.hpp +21 -7
- data/ext/boost/config/compiler/common_edg.hpp +4 -2
- data/ext/boost/config/compiler/digitalmars.hpp +1 -1
- data/ext/boost/config/compiler/gcc.hpp +46 -7
- data/ext/boost/config/compiler/gcc_xml.hpp +25 -0
- data/ext/boost/config/compiler/intel.hpp +23 -0
- data/ext/boost/config/compiler/kai.hpp +1 -1
- data/ext/boost/config/compiler/metrowerks.hpp +1 -1
- data/ext/boost/config/compiler/nvcc.hpp +86 -0
- data/ext/boost/config/compiler/pgi.hpp +18 -3
- data/ext/boost/config/compiler/sunpro_cc.hpp +19 -5
- data/ext/boost/config/compiler/vacpp.hpp +8 -0
- data/ext/boost/config/compiler/visualc.hpp +27 -11
- data/ext/boost/config/platform/cygwin.hpp +0 -3
- data/ext/boost/config/platform/symbian.hpp +94 -0
- data/ext/boost/config/platform/win32.hpp +8 -1
- data/ext/boost/config/select_compiler_config.hpp +10 -0
- data/ext/boost/config/select_platform_config.hpp +4 -0
- data/ext/boost/config/stdlib/dinkumware.hpp +11 -1
- data/ext/boost/config/stdlib/libcomo.hpp +1 -0
- data/ext/boost/config/stdlib/libstdcpp3.hpp +1 -0
- data/ext/boost/config/stdlib/modena.hpp +1 -0
- data/ext/boost/config/stdlib/msl.hpp +1 -0
- data/ext/boost/config/stdlib/roguewave.hpp +1 -0
- data/ext/boost/config/stdlib/sgi.hpp +1 -0
- data/ext/boost/config/stdlib/stlport.hpp +1 -0
- data/ext/boost/config/stdlib/vacpp.hpp +1 -0
- data/ext/boost/config/suffix.hpp +40 -2
- data/ext/boost/cstdint.hpp +36 -7
- data/ext/boost/date_time/gregorian/conversion.hpp +4 -2
- data/ext/boost/date_time/microsec_time_clock.hpp +7 -7
- data/ext/boost/date_time/posix_time/conversion.hpp +4 -2
- data/ext/boost/date_time/time_facet.hpp +43 -4
- data/ext/boost/detail/endian.hpp +5 -2
- data/ext/boost/detail/lcast_precision.hpp +2 -2
- data/ext/boost/detail/sp_typeinfo.hpp +1 -1
- data/ext/boost/detail/workaround.hpp +5 -0
- data/ext/boost/exception/detail/error_info_impl.hpp +3 -3
- data/ext/boost/exception/detail/exception_ptr.hpp +76 -135
- data/ext/boost/exception/detail/is_output_streamable.hpp +15 -2
- data/ext/boost/exception/detail/type_info.hpp +9 -5
- data/ext/boost/exception/diagnostic_information.hpp +5 -3
- data/ext/boost/exception/exception.hpp +60 -46
- data/ext/boost/exception/info.hpp +47 -14
- data/ext/boost/function/function_base.hpp +4 -4
- data/ext/boost/integer.hpp +4 -0
- data/ext/boost/integer_fwd.hpp +9 -3
- data/ext/boost/iterator/iterator_concepts.hpp +284 -0
- data/ext/boost/iterator/transform_iterator.hpp +0 -1
- data/ext/boost/make_shared.hpp +17 -0
- data/ext/boost/mpl/aux_/config/has_xxx.hpp +4 -3
- data/ext/boost/mpl/aux_/preprocessed/gcc/template_arity.hpp +2 -6
- data/ext/boost/mpl/aux_/template_arity.hpp +4 -4
- data/ext/boost/mpl/eval_if.hpp +3 -3
- data/ext/boost/mpl/has_xxx.hpp +369 -3
- data/ext/boost/optional/optional.hpp +3 -1
- data/ext/boost/optional/optional_fwd.hpp +1 -1
- data/ext/boost/preprocessor/repetition/enum_trailing_params.hpp +38 -0
- data/ext/boost/range/algorithm/equal.hpp +188 -0
- data/ext/boost/range/as_literal.hpp +15 -15
- data/ext/boost/range/concepts.hpp +331 -0
- data/ext/boost/range/const_iterator.hpp +7 -4
- data/ext/boost/range/detail/extract_optional_type.hpp +52 -0
- data/ext/boost/range/detail/implementation_help.hpp +7 -7
- data/ext/boost/range/detail/misc_concept.hpp +33 -0
- data/ext/boost/range/iterator.hpp +32 -32
- data/ext/boost/range/iterator_range.hpp +8 -651
- data/ext/boost/range/iterator_range_core.hpp +542 -0
- data/ext/boost/range/iterator_range_io.hpp +93 -0
- data/ext/boost/range/mutable_iterator.hpp +7 -4
- data/ext/boost/range/size.hpp +1 -1
- data/ext/boost/range/size_type.hpp +2 -1
- data/ext/boost/shared_array.hpp +19 -0
- data/ext/boost/smart_ptr/detail/sp_convertible.hpp +2 -2
- data/ext/boost/smart_ptr/detail/yield_k.hpp +1 -1
- data/ext/boost/smart_ptr/make_shared.hpp +508 -0
- data/ext/boost/smart_ptr/shared_array.hpp +147 -0
- data/ext/boost/src/pthread/thread.cpp +16 -21
- data/ext/boost/src/pthread/timeconv.inl +7 -4
- data/ext/boost/thread/barrier.hpp +2 -1
- data/ext/boost/thread/detail/config.hpp +7 -1
- data/ext/boost/thread/detail/platform.hpp +1 -1
- data/ext/boost/thread/detail/thread.hpp +62 -18
- data/ext/boost/thread/detail/thread_group.hpp +5 -2
- data/ext/boost/thread/detail/tss_hooks.hpp +8 -25
- data/ext/boost/thread/future.hpp +45 -34
- data/ext/boost/thread/locks.hpp +184 -55
- data/ext/boost/thread/pthread/condition_variable.hpp +7 -7
- data/ext/boost/thread/pthread/condition_variable_fwd.hpp +4 -2
- data/ext/boost/thread/pthread/mutex.hpp +29 -17
- data/ext/boost/thread/pthread/once.hpp +5 -0
- data/ext/boost/thread/pthread/recursive_mutex.hpp +97 -18
- data/ext/boost/thread/pthread/shared_mutex.hpp +1 -1
- data/ext/boost/thread/pthread/thread_heap_alloc.hpp +1 -1
- data/ext/boost/thread/tss.hpp +2 -0
- data/ext/boost/throw_exception.hpp +21 -5
- data/ext/boost/token_functions.hpp +111 -91
- data/ext/boost/type_traits/add_reference.hpp +19 -1
- data/ext/boost/type_traits/function_traits.hpp +2 -2
- data/ext/boost/type_traits/is_const.hpp +24 -5
- data/ext/boost/type_traits/is_convertible.hpp +1 -1
- data/ext/boost/type_traits/is_function.hpp +3 -0
- data/ext/boost/type_traits/is_lvalue_reference.hpp +118 -0
- data/ext/boost/type_traits/is_reference.hpp +8 -81
- data/ext/boost/type_traits/is_rvalue_reference.hpp +29 -0
- data/ext/boost/type_traits/is_same.hpp +2 -2
- data/ext/boost/type_traits/is_volatile.hpp +26 -7
- data/ext/boost/type_traits/remove_const.hpp +12 -0
- data/ext/boost/type_traits/remove_cv.hpp +23 -1
- data/ext/boost/type_traits/remove_reference.hpp +21 -1
- data/ext/boost/type_traits/type_with_alignment.hpp +10 -10
- data/ext/boost/units/detail/utility.hpp +104 -0
- data/ext/boost/utility/compare_pointees.hpp +1 -1
- data/ext/common/AgentsStarter.hpp +151 -161
- data/ext/common/ApplicationPool/Pool.h +16 -4
- data/ext/common/Constants.h +1 -1
- data/ext/common/EventedClient.h +130 -26
- data/ext/common/Exceptions.h +15 -2
- data/ext/common/FileDescriptor.h +76 -12
- data/ext/common/IniFile.h +488 -0
- data/ext/common/LoggingAgent/LoggingServer.h +2 -2
- data/ext/common/LoggingAgent/RemoteSender.h +15 -6
- data/ext/common/MessageChannel.h +17 -101
- data/ext/common/PoolOptions.h +1 -0
- data/ext/common/ResourceLocator.h +78 -28
- data/ext/common/SafeLibev.h +149 -0
- data/ext/common/ServerInstanceDir.h +11 -7
- data/ext/common/Session.h +1 -1
- data/ext/common/SpawnManager.h +14 -14
- data/ext/common/StaticString.h +75 -0
- data/ext/common/Utils.cpp +304 -12
- data/ext/common/Utils.h +17 -0
- data/ext/common/Utils/BufferedIO.h +196 -0
- data/ext/common/Utils/IOUtils.cpp +159 -0
- data/ext/common/Utils/IOUtils.h +118 -1
- data/ext/common/Utils/ProcessMetricsCollector.h +184 -56
- data/ext/common/Utils/StrIntUtils.cpp +45 -11
- data/ext/common/Utils/StrIntUtils.h +8 -5
- data/ext/common/Utils/Timer.h +22 -0
- data/ext/common/Utils/utf8.h +35 -0
- data/ext/common/Utils/utf8/checked.h +324 -0
- data/ext/common/Utils/utf8/core.h +359 -0
- data/ext/common/Utils/utf8/unchecked.h +229 -0
- data/ext/common/Watchdog.cpp +52 -85
- data/ext/libev/config.h +122 -0
- data/ext/nginx/Configuration.c +7 -1
- data/ext/nginx/HelperAgent.cpp +16 -18
- data/ext/nginx/config +6 -4
- data/ext/oxt/system_calls.cpp +10 -0
- data/ext/oxt/system_calls.hpp +2 -0
- data/lib/phusion_passenger.rb +6 -11
- data/lib/phusion_passenger/dependencies.rb +2 -0
- data/lib/phusion_passenger/packaging.rb +5 -5
- data/lib/phusion_passenger/platform_info.rb +88 -0
- data/lib/phusion_passenger/platform_info/binary_compatibility.rb +3 -17
- data/lib/phusion_passenger/platform_info/compiler.rb +14 -32
- data/lib/phusion_passenger/platform_info/curl.rb +6 -1
- data/lib/phusion_passenger/platform_info/operating_system.rb +107 -0
- data/lib/phusion_passenger/public_api.rb +2 -2
- data/lib/phusion_passenger/rails3_extensions/init.rb +5 -2
- data/lib/phusion_passenger/standalone/command.rb +6 -2
- data/lib/phusion_passenger/standalone/package_runtime_command.rb +2 -2
- data/lib/phusion_passenger/standalone/runtime_installer.rb +17 -5
- data/lib/phusion_passenger/standalone/start_command.rb +12 -12
- data/lib/phusion_passenger/standalone/stop_command.rb +3 -3
- data/lib/phusion_passenger/standalone/utils.rb +6 -2
- data/lib/phusion_passenger/templates/standalone/config.erb +37 -5
- data/lib/phusion_passenger/utils.rb +4 -7
- data/resources/mime.types +73 -0
- data/{misc → resources}/union_station_gateway.crt +0 -0
- data/test/cxx/BufferedIOTest.cpp +364 -0
- data/test/cxx/EventedClientTest.cpp +150 -13
- data/test/cxx/IOUtilsTest.cpp +399 -1
- data/test/cxx/MessageChannelTest.cpp +5 -120
- data/test/cxx/ProcessMetricsCollectorTest.cpp +121 -0
- data/test/cxx/StaticStringTest.cpp +134 -0
- data/test/cxx/UtilsTest.cpp +16 -46
- data/test/stub/rails_apps/2.3/mycook/public/dispatch.cgi +2 -2
- data/test/stub/rails_apps/2.3/mycook/public/dispatch.fcgi +1 -1
- data/test/stub/rails_apps/2.3/mycook/public/dispatch.rb +1 -1
- data/test/stub/rails_apps/3.0/empty/Gemfile.lock +73 -0
- data/test/support/allocate_memory.c +14 -0
- data/test/support/test_helper.rb +3 -0
- metadata +57 -174
- data/bin/passenger-stress-test +0 -345
- data/debian/postinst +0 -24
- data/doc/rdoc/classes/ConditionVariable.html +0 -215
- data/doc/rdoc/classes/Exception.html +0 -120
- data/doc/rdoc/classes/GC.html +0 -113
- data/doc/rdoc/classes/IO.html +0 -221
- data/doc/rdoc/classes/PhusionPassenger.html +0 -397
- data/doc/rdoc/classes/PhusionPassenger/AbstractInstaller.html +0 -180
- data/doc/rdoc/classes/PhusionPassenger/AbstractRequestHandler.html +0 -647
- data/doc/rdoc/classes/PhusionPassenger/AbstractServer.html +0 -654
- data/doc/rdoc/classes/PhusionPassenger/AbstractServer/InvalidPassword.html +0 -92
- data/doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerAlreadyStarted.html +0 -97
- data/doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerError.html +0 -96
- data/doc/rdoc/classes/PhusionPassenger/AbstractServer/ServerNotStarted.html +0 -97
- data/doc/rdoc/classes/PhusionPassenger/AbstractServer/UnknownMessage.html +0 -96
- data/doc/rdoc/classes/PhusionPassenger/AbstractServerCollection.html +0 -619
- data/doc/rdoc/classes/PhusionPassenger/AdminTools.html +0 -142
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/MemoryStats.html +0 -368
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/MemoryStats/Process.html +0 -231
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance.html +0 -588
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/CorruptedDirectoryError.html +0 -92
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/GenerationsAbsentError.html +0 -92
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Group.html +0 -147
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Process.html +0 -279
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/RoleDeniedError.html +0 -92
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/StaleDirectoryError.html +0 -92
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/Stats.html +0 -123
- data/doc/rdoc/classes/PhusionPassenger/AdminTools/ServerInstance/UnsupportedGenerationStructureVersionError.html +0 -92
- data/doc/rdoc/classes/PhusionPassenger/AnalyticsLogger.html +0 -341
- data/doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/Log.html +0 -294
- data/doc/rdoc/classes/PhusionPassenger/AnalyticsLogger/SharedData.html +0 -199
- data/doc/rdoc/classes/PhusionPassenger/AppInitError.html +0 -155
- data/doc/rdoc/classes/PhusionPassenger/AppProcess.html +0 -367
- data/doc/rdoc/classes/PhusionPassenger/ClassicRails.html +0 -95
- data/doc/rdoc/classes/PhusionPassenger/ClassicRails/ApplicationSpawner.html +0 -351
- data/doc/rdoc/classes/PhusionPassenger/ClassicRails/ApplicationSpawner/Error.html +0 -98
- data/doc/rdoc/classes/PhusionPassenger/ClassicRails/CGIFixed.html +0 -200
- data/doc/rdoc/classes/PhusionPassenger/ClassicRails/FrameworkSpawner.html +0 -410
- data/doc/rdoc/classes/PhusionPassenger/ClassicRails/FrameworkSpawner/Error.html +0 -98
- data/doc/rdoc/classes/PhusionPassenger/ClassicRails/RequestHandler.html +0 -156
- data/doc/rdoc/classes/PhusionPassenger/ClassicRailsExtensions.html +0 -115
- data/doc/rdoc/classes/PhusionPassenger/ClassicRailsExtensions/AnalyticsLogging.html +0 -202
- data/doc/rdoc/classes/PhusionPassenger/ConsoleTextTemplate.html +0 -172
- data/doc/rdoc/classes/PhusionPassenger/DebugLogging.html +0 -273
- data/doc/rdoc/classes/PhusionPassenger/FrameworkInitError.html +0 -145
- data/doc/rdoc/classes/PhusionPassenger/HTMLTemplate.html +0 -162
- data/doc/rdoc/classes/PhusionPassenger/InitializationError.html +0 -141
- data/doc/rdoc/classes/PhusionPassenger/InvalidPath.html +0 -92
- data/doc/rdoc/classes/PhusionPassenger/MessageChannel.html +0 -673
- data/doc/rdoc/classes/PhusionPassenger/MessageChannel/InvalidHashError.html +0 -92
- data/doc/rdoc/classes/PhusionPassenger/MessageClient.html +0 -415
- data/doc/rdoc/classes/PhusionPassenger/NativeSupportLoader.html +0 -134
- data/doc/rdoc/classes/PhusionPassenger/Packaging.html +0 -129
- data/doc/rdoc/classes/PhusionPassenger/PlatformInfo.html +0 -1809
- data/doc/rdoc/classes/PhusionPassenger/Plugin.html +0 -237
- data/doc/rdoc/classes/PhusionPassenger/Rack.html +0 -91
- data/doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner.html +0 -312
- data/doc/rdoc/classes/PhusionPassenger/Rack/ApplicationSpawner/Error.html +0 -98
- data/doc/rdoc/classes/PhusionPassenger/Rack/RequestHandler.html +0 -218
- data/doc/rdoc/classes/PhusionPassenger/Rails3Extensions.html +0 -114
- data/doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging.html +0 -256
- data/doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ACExtension.html +0 -139
- data/doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ASBenchmarkableExtension.html +0 -118
- data/doc/rdoc/classes/PhusionPassenger/Rails3Extensions/AnalyticsLogging/ExceptionLogger.html +0 -135
- data/doc/rdoc/classes/PhusionPassenger/SpawnManager.html +0 -378
- data/doc/rdoc/classes/PhusionPassenger/Standalone.html +0 -111
- data/doc/rdoc/classes/PhusionPassenger/Standalone/AppFinder.html +0 -252
- data/doc/rdoc/classes/PhusionPassenger/Standalone/Command.html +0 -161
- data/doc/rdoc/classes/PhusionPassenger/Standalone/ConfigFile.html +0 -368
- data/doc/rdoc/classes/PhusionPassenger/Standalone/ConfigFile/DisallowedContextError.html +0 -132
- data/doc/rdoc/classes/PhusionPassenger/Standalone/HelpCommand.html +0 -151
- data/doc/rdoc/classes/PhusionPassenger/Standalone/Main.html +0 -189
- data/doc/rdoc/classes/PhusionPassenger/Standalone/PackageRuntimeCommand.html +0 -177
- data/doc/rdoc/classes/PhusionPassenger/Standalone/RuntimeInstaller.html +0 -341
- data/doc/rdoc/classes/PhusionPassenger/Standalone/StartCommand.html +0 -203
- data/doc/rdoc/classes/PhusionPassenger/Standalone/StatusCommand.html +0 -156
- data/doc/rdoc/classes/PhusionPassenger/Standalone/StopCommand.html +0 -168
- data/doc/rdoc/classes/PhusionPassenger/Standalone/Utils.html +0 -86
- data/doc/rdoc/classes/PhusionPassenger/Standalone/VersionCommand.html +0 -135
- data/doc/rdoc/classes/PhusionPassenger/UnknownError.html +0 -125
- data/doc/rdoc/classes/PhusionPassenger/Utils.html +0 -1550
- data/doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher.html +0 -204
- data/doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher/DirInfo.html +0 -171
- data/doc/rdoc/classes/PhusionPassenger/Utils/FileSystemWatcher/FileInfo.html +0 -140
- data/doc/rdoc/classes/PhusionPassenger/Utils/HostsFileParser.html +0 -260
- data/doc/rdoc/classes/PhusionPassenger/Utils/PseudoIO.html +0 -169
- data/doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput.html +0 -265
- data/doc/rdoc/classes/PhusionPassenger/Utils/RewindableInput/Tempfile.html +0 -120
- data/doc/rdoc/classes/PhusionPassenger/Utils/UnseekableSocket.html +0 -561
- data/doc/rdoc/classes/PhusionPassenger/VersionNotFound.html +0 -140
- data/doc/rdoc/classes/PhusionPassenger/WSGI.html +0 -89
- data/doc/rdoc/classes/PhusionPassenger/WSGI/ApplicationSpawner.html +0 -182
- data/doc/rdoc/classes/Process.html +0 -115
- data/doc/rdoc/classes/Signal.html +0 -139
- data/doc/rdoc/created.rid +0 -1
- data/doc/rdoc/files/DEVELOPERS_TXT.html +0 -276
- data/doc/rdoc/files/README.html +0 -157
- data/doc/rdoc/files/lib/phusion_passenger/abstract_installer_rb.html +0 -130
- data/doc/rdoc/files/lib/phusion_passenger/abstract_request_handler_rb.html +0 -135
- data/doc/rdoc/files/lib/phusion_passenger/abstract_server_collection_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/abstract_server_rb.html +0 -128
- data/doc/rdoc/files/lib/phusion_passenger/admin_tools/memory_stats_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/admin_tools/server_instance_rb.html +0 -132
- data/doc/rdoc/files/lib/phusion_passenger/admin_tools_rb.html +0 -122
- data/doc/rdoc/files/lib/phusion_passenger/analytics_logger_rb.html +0 -129
- data/doc/rdoc/files/lib/phusion_passenger/app_process_rb.html +0 -127
- data/doc/rdoc/files/lib/phusion_passenger/classic_rails/application_spawner_rb.html +0 -141
- data/doc/rdoc/files/lib/phusion_passenger/classic_rails/cgi_fixed_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/classic_rails/framework_spawner_rb.html +0 -146
- data/doc/rdoc/files/lib/phusion_passenger/classic_rails/request_handler_rb.html +0 -125
- data/doc/rdoc/files/lib/phusion_passenger/classic_rails_extensions/init_rb.html +0 -132
- data/doc/rdoc/files/lib/phusion_passenger/console_text_template_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/constants_rb.html +0 -122
- data/doc/rdoc/files/lib/phusion_passenger/debug_logging_rb.html +0 -122
- data/doc/rdoc/files/lib/phusion_passenger/dependencies_rb.html +0 -147
- data/doc/rdoc/files/lib/phusion_passenger/exceptions_rb.html +0 -122
- data/doc/rdoc/files/lib/phusion_passenger/html_template_rb.html +0 -127
- data/doc/rdoc/files/lib/phusion_passenger/message_channel_rb.html +0 -120
- data/doc/rdoc/files/lib/phusion_passenger/message_client_rb.html +0 -127
- data/doc/rdoc/files/lib/phusion_passenger/native_support_rb.html +0 -132
- data/doc/rdoc/files/lib/phusion_passenger/packaging_rb.html +0 -122
- data/doc/rdoc/files/lib/phusion_passenger/platform_info/apache_rb.html +0 -127
- data/doc/rdoc/files/lib/phusion_passenger/platform_info/binary_compatibility_rb.html +0 -129
- data/doc/rdoc/files/lib/phusion_passenger/platform_info/compiler_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/platform_info/curl_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/platform_info/documentation_tools_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/platform_info/linux_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/platform_info/operating_system_rb.html +0 -127
- data/doc/rdoc/files/lib/phusion_passenger/platform_info/ruby_rb.html +0 -128
- data/doc/rdoc/files/lib/phusion_passenger/platform_info/zlib_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/platform_info_rb.html +0 -122
- data/doc/rdoc/files/lib/phusion_passenger/plugin_rb.html +0 -127
- data/doc/rdoc/files/lib/phusion_passenger/public_api_rb.html +0 -127
- data/doc/rdoc/files/lib/phusion_passenger/rack/application_spawner_rb.html +0 -137
- data/doc/rdoc/files/lib/phusion_passenger/rack/request_handler_rb.html +0 -125
- data/doc/rdoc/files/lib/phusion_passenger/rails3_extensions/init_rb.html +0 -127
- data/doc/rdoc/files/lib/phusion_passenger/simple_benchmarking_rb.html +0 -122
- data/doc/rdoc/files/lib/phusion_passenger/spawn_manager_rb.html +0 -160
- data/doc/rdoc/files/lib/phusion_passenger/standalone/app_finder_rb.html +0 -127
- data/doc/rdoc/files/lib/phusion_passenger/standalone/command_rb.html +0 -135
- data/doc/rdoc/files/lib/phusion_passenger/standalone/config_file_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/standalone/help_command_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/standalone/main_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/standalone/package_runtime_command_rb.html +0 -127
- data/doc/rdoc/files/lib/phusion_passenger/standalone/runtime_installer_rb.html +0 -133
- data/doc/rdoc/files/lib/phusion_passenger/standalone/start_command_rb.html +0 -136
- data/doc/rdoc/files/lib/phusion_passenger/standalone/status_command_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/standalone/stop_command_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/standalone/utils_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/standalone/version_command_rb.html +0 -127
- data/doc/rdoc/files/lib/phusion_passenger/utils/file_system_watcher_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/utils/hosts_file_parser_rb.html +0 -120
- data/doc/rdoc/files/lib/phusion_passenger/utils/rewindable_input_rb.html +0 -100
- data/doc/rdoc/files/lib/phusion_passenger/utils/tmpdir_rb.html +0 -122
- data/doc/rdoc/files/lib/phusion_passenger/utils/unseekable_socket_rb.html +0 -126
- data/doc/rdoc/files/lib/phusion_passenger/utils_rb.html +0 -179
- data/doc/rdoc/files/lib/phusion_passenger/wsgi/application_spawner_rb.html +0 -132
- data/doc/rdoc/fr_class_index.html +0 -138
- data/doc/rdoc/fr_file_index.html +0 -108
- data/doc/rdoc/fr_method_index.html +0 -430
- data/doc/rdoc/index.html +0 -26
- data/doc/rdoc/rdoc-style.css +0 -187
- data/ext/apache2/LICENSE-CNRI.TXT +0 -79
- data/ext/common/Utils/BlockingScalar.h +0 -50
- data/ext/common/Utils/FileHandleGuard.h +0 -81
@@ -0,0 +1,488 @@
|
|
1
|
+
#ifndef _PASSENGER_INI_FILE_H_
|
2
|
+
#define _PASSENGER_INI_FILE_H_
|
3
|
+
|
4
|
+
#include <utility>
|
5
|
+
#include <string>
|
6
|
+
#include <map>
|
7
|
+
#include <fstream>
|
8
|
+
#include <iostream>
|
9
|
+
#include <cstdio>
|
10
|
+
#include <cstring>
|
11
|
+
#include <cassert>
|
12
|
+
#include <cctype>
|
13
|
+
#include <boost/shared_ptr.hpp>
|
14
|
+
#include <boost/make_shared.hpp>
|
15
|
+
|
16
|
+
namespace Passenger {
|
17
|
+
|
18
|
+
using namespace std;
|
19
|
+
using namespace boost;
|
20
|
+
|
21
|
+
|
22
|
+
class IniFileSection {
|
23
|
+
protected:
|
24
|
+
typedef map<string, string> ValueMap;
|
25
|
+
string sectionName;
|
26
|
+
ValueMap values;
|
27
|
+
|
28
|
+
public:
|
29
|
+
IniFileSection(const string §ionName) {
|
30
|
+
this->sectionName = sectionName;
|
31
|
+
}
|
32
|
+
|
33
|
+
bool hasKey(const string &keyName) const {
|
34
|
+
return values.find(keyName) != values.end();
|
35
|
+
}
|
36
|
+
|
37
|
+
string get(const string &keyName) const {
|
38
|
+
ValueMap::const_iterator it = values.find(keyName);
|
39
|
+
if (it != values.end()) {
|
40
|
+
return it->second;
|
41
|
+
} else {
|
42
|
+
return string();
|
43
|
+
}
|
44
|
+
}
|
45
|
+
|
46
|
+
string operator[](const string &keyName) const {
|
47
|
+
return get(keyName);
|
48
|
+
}
|
49
|
+
|
50
|
+
void set(const string &keyName, const string &value) {
|
51
|
+
values[keyName] = value;
|
52
|
+
}
|
53
|
+
|
54
|
+
string getSectionName() const {
|
55
|
+
return sectionName;
|
56
|
+
}
|
57
|
+
|
58
|
+
void inspect() const {
|
59
|
+
ValueMap::const_iterator it = values.begin();
|
60
|
+
while (it != values.end()) {
|
61
|
+
cout << it->first << " = " << it->second << endl;
|
62
|
+
it++;
|
63
|
+
}
|
64
|
+
}
|
65
|
+
};
|
66
|
+
|
67
|
+
class IniFileLexer {
|
68
|
+
public:
|
69
|
+
class Token {
|
70
|
+
public:
|
71
|
+
enum Kind {
|
72
|
+
UNKNOWN = 0,
|
73
|
+
NEWLINE,
|
74
|
+
SECTION_NAME,
|
75
|
+
IDENTIFIER,
|
76
|
+
ASSIGNMENT,
|
77
|
+
TEXT,
|
78
|
+
END_OF_FILE
|
79
|
+
};
|
80
|
+
|
81
|
+
const Kind kind;
|
82
|
+
const string value;
|
83
|
+
const int line;
|
84
|
+
const int column;
|
85
|
+
|
86
|
+
// String representations of the Kind enum.
|
87
|
+
const static char *identityByKind(Kind kind) {
|
88
|
+
const static char* KIND_IDENTITY_TABLE[] = {
|
89
|
+
"<T_UNKNOWN>",
|
90
|
+
"<T_NEWLINE>",
|
91
|
+
"<T_SECTION_NAME>",
|
92
|
+
"<T_IDENTIFIER>",
|
93
|
+
"<T_ASSIGNMENT>",
|
94
|
+
"<T_TEXT>",
|
95
|
+
"<T_EOF>"
|
96
|
+
};
|
97
|
+
|
98
|
+
return KIND_IDENTITY_TABLE[kind];
|
99
|
+
}
|
100
|
+
|
101
|
+
Token(const Kind kind, const string &value, const int line, const int column)
|
102
|
+
: kind(kind), value(value), line(line), column(column) {
|
103
|
+
|
104
|
+
}
|
105
|
+
|
106
|
+
class ExpectanceException : public std::exception {
|
107
|
+
private:
|
108
|
+
char message[255];
|
109
|
+
|
110
|
+
public:
|
111
|
+
ExpectanceException(char expected, char got, int line, int column) {
|
112
|
+
int messageSize = sizeof(message);
|
113
|
+
memset(message, 0, messageSize);
|
114
|
+
snprintf(message, messageSize,
|
115
|
+
"On line %i, column %i: Expected '%c', got '%c' instead.",
|
116
|
+
line, column, expected, got);
|
117
|
+
}
|
118
|
+
|
119
|
+
ExpectanceException(Token::Kind expected, Token got) {
|
120
|
+
const char *expectedKindString = Token::identityByKind(expected);
|
121
|
+
int messageSize = sizeof(message);
|
122
|
+
memset(message, 0, messageSize);
|
123
|
+
snprintf(message, messageSize,
|
124
|
+
"On line %i, column %i: Expected '%s', got '%s' instead.",
|
125
|
+
got.line, got.column, expectedKindString, got.value.c_str());
|
126
|
+
}
|
127
|
+
|
128
|
+
ExpectanceException(char expected, Token::Kind got, int line, int column) {
|
129
|
+
const char *gotKindString = Token::identityByKind(got);
|
130
|
+
int messageSize = sizeof(message);
|
131
|
+
memset(message, 0, messageSize);
|
132
|
+
snprintf(message, messageSize,
|
133
|
+
"On line %i, column %i: Expected '%c', got '%s' instead.",
|
134
|
+
line, column, expected, gotKindString);
|
135
|
+
}
|
136
|
+
|
137
|
+
virtual const char* what() const throw() {
|
138
|
+
return message;
|
139
|
+
}
|
140
|
+
};
|
141
|
+
};
|
142
|
+
|
143
|
+
typedef shared_ptr<IniFileLexer::Token> TokenPtr;
|
144
|
+
|
145
|
+
|
146
|
+
|
147
|
+
protected:
|
148
|
+
ifstream iniFileStream;
|
149
|
+
|
150
|
+
char lastAcceptedChar;
|
151
|
+
char upcomingChar;
|
152
|
+
bool upcomingTokenPtrIsStale;
|
153
|
+
|
154
|
+
int currentLine;
|
155
|
+
int currentColumn;
|
156
|
+
|
157
|
+
TokenPtr upcomingTokenPtr;
|
158
|
+
|
159
|
+
void expect(char ch) {
|
160
|
+
char upcomingChar = (char)iniFileStream.peek();
|
161
|
+
|
162
|
+
if (ch != upcomingChar) {
|
163
|
+
switch(upcomingChar) {
|
164
|
+
case EOF:
|
165
|
+
throw Token::ExpectanceException(ch, Token::END_OF_FILE,
|
166
|
+
currentLine, currentColumn + 1);
|
167
|
+
case '\n':
|
168
|
+
throw Token::ExpectanceException(ch, upcomingChar,
|
169
|
+
currentLine + 1, 0);
|
170
|
+
default:
|
171
|
+
throw Token::ExpectanceException(ch, upcomingChar,
|
172
|
+
currentLine, currentColumn + 1);
|
173
|
+
}
|
174
|
+
}
|
175
|
+
}
|
176
|
+
|
177
|
+
void accept() {
|
178
|
+
if (upcomingChar == EOF) return;
|
179
|
+
|
180
|
+
lastAcceptedChar = (char)iniFileStream.get();
|
181
|
+
upcomingChar = (char)iniFileStream.peek();
|
182
|
+
currentColumn++;
|
183
|
+
|
184
|
+
if (lastAcceptedChar == '\n') {
|
185
|
+
currentLine++;
|
186
|
+
currentColumn = 1;
|
187
|
+
}
|
188
|
+
}
|
189
|
+
|
190
|
+
void ignore() {
|
191
|
+
if (upcomingChar == EOF) return;
|
192
|
+
|
193
|
+
upcomingChar = (char)iniFileStream.peek();
|
194
|
+
currentColumn++;
|
195
|
+
|
196
|
+
if ((char)iniFileStream.get() == '\n') {
|
197
|
+
currentLine++;
|
198
|
+
currentColumn = 1;
|
199
|
+
}
|
200
|
+
}
|
201
|
+
|
202
|
+
void expectAndAccept(char ch) {
|
203
|
+
expect(ch);
|
204
|
+
accept();
|
205
|
+
}
|
206
|
+
|
207
|
+
void acceptWhileNewLine() {
|
208
|
+
while (iniFileStream.good() && upcomingChar == '\n') {
|
209
|
+
accept();
|
210
|
+
}
|
211
|
+
}
|
212
|
+
|
213
|
+
void ignoreWhileNotNewLine() {
|
214
|
+
while (iniFileStream.good() && upcomingChar != '\n') {
|
215
|
+
ignore();
|
216
|
+
}
|
217
|
+
}
|
218
|
+
|
219
|
+
Token tokenizeIdentifier() {
|
220
|
+
int line = currentLine;
|
221
|
+
int column = currentColumn;
|
222
|
+
string result;
|
223
|
+
|
224
|
+
while (isalnum(upcomingChar) || upcomingChar == '_' || upcomingChar == '-') {
|
225
|
+
result.append(1, upcomingChar);
|
226
|
+
accept();
|
227
|
+
}
|
228
|
+
|
229
|
+
return Token(Token::IDENTIFIER, result, line, column);
|
230
|
+
}
|
231
|
+
|
232
|
+
Token tokenizeSection() {
|
233
|
+
expectAndAccept('[');
|
234
|
+
Token sectionName = tokenizeSectionName();
|
235
|
+
expectAndAccept(']');
|
236
|
+
return sectionName;
|
237
|
+
}
|
238
|
+
|
239
|
+
Token tokenizeSectionName() {
|
240
|
+
int line = currentLine;
|
241
|
+
int column = currentColumn;
|
242
|
+
string result;
|
243
|
+
|
244
|
+
//while (upcomingChar != ']' && upcomingChar != '[' && upcomingChar != '\n' && upcomingChar != EOF) {
|
245
|
+
while (isalnum(upcomingChar) || upcomingChar == '_' || upcomingChar == '-') {
|
246
|
+
result.append(1, upcomingChar);
|
247
|
+
accept();
|
248
|
+
}
|
249
|
+
|
250
|
+
return Token(Token::SECTION_NAME, result, line, column);
|
251
|
+
}
|
252
|
+
|
253
|
+
Token tokenizeAssignment() {
|
254
|
+
expectAndAccept('=');
|
255
|
+
return Token(Token::ASSIGNMENT, "=", currentLine, currentColumn);
|
256
|
+
}
|
257
|
+
|
258
|
+
Token tokenizeText() {
|
259
|
+
int line = currentLine;
|
260
|
+
int column = currentColumn;
|
261
|
+
string result;
|
262
|
+
|
263
|
+
while (upcomingChar != '\n' && upcomingChar != EOF) {
|
264
|
+
result.append(1, upcomingChar);
|
265
|
+
accept();
|
266
|
+
}
|
267
|
+
|
268
|
+
return Token(Token::TEXT, result, line, column);
|
269
|
+
}
|
270
|
+
|
271
|
+
Token tokenizeKey() {
|
272
|
+
return tokenizeIdentifier();
|
273
|
+
}
|
274
|
+
|
275
|
+
Token tokenizeValue() {
|
276
|
+
return tokenizeText();
|
277
|
+
}
|
278
|
+
|
279
|
+
Token tokenizeUnknown() {
|
280
|
+
int line = currentLine;
|
281
|
+
int column = currentColumn;
|
282
|
+
string result;
|
283
|
+
|
284
|
+
while (upcomingChar != EOF) {
|
285
|
+
result.append(1, upcomingChar);
|
286
|
+
accept();
|
287
|
+
}
|
288
|
+
|
289
|
+
return Token(Token::UNKNOWN, result, line, column);
|
290
|
+
}
|
291
|
+
|
292
|
+
public:
|
293
|
+
IniFileLexer(const string &fileName) {
|
294
|
+
currentLine = 1;
|
295
|
+
currentColumn = 1;
|
296
|
+
upcomingTokenPtrIsStale = true;
|
297
|
+
iniFileStream.open(fileName.c_str());
|
298
|
+
}
|
299
|
+
|
300
|
+
~IniFileLexer() {
|
301
|
+
iniFileStream.close();
|
302
|
+
}
|
303
|
+
|
304
|
+
int getCurrentLine() {
|
305
|
+
return currentLine;
|
306
|
+
}
|
307
|
+
|
308
|
+
int getCurrentColumn() {
|
309
|
+
return currentColumn;
|
310
|
+
}
|
311
|
+
|
312
|
+
TokenPtr peekToken() {
|
313
|
+
if (upcomingTokenPtrIsStale) {
|
314
|
+
Token upcomingToken = getToken();
|
315
|
+
upcomingTokenPtr = make_shared<Token>(upcomingToken);
|
316
|
+
upcomingTokenPtrIsStale = false;
|
317
|
+
}
|
318
|
+
|
319
|
+
return upcomingTokenPtr;
|
320
|
+
}
|
321
|
+
|
322
|
+
Token getToken() {
|
323
|
+
if (!upcomingTokenPtrIsStale) {
|
324
|
+
upcomingTokenPtrIsStale = true;
|
325
|
+
return *upcomingTokenPtr;
|
326
|
+
}
|
327
|
+
|
328
|
+
while (iniFileStream.good()) {
|
329
|
+
upcomingChar = (char)iniFileStream.peek();
|
330
|
+
switch(upcomingChar) {
|
331
|
+
case '[':
|
332
|
+
return tokenizeSection();
|
333
|
+
case '\n':
|
334
|
+
if (lastAcceptedChar != '\n') {
|
335
|
+
accept();
|
336
|
+
return Token(Token::NEWLINE, "\n", currentLine, currentColumn);
|
337
|
+
} else {
|
338
|
+
ignore();
|
339
|
+
break;
|
340
|
+
}
|
341
|
+
case ';':
|
342
|
+
// Comment encountered: accept all characters until newline (exclusive).
|
343
|
+
ignoreWhileNotNewLine();
|
344
|
+
break;
|
345
|
+
case '=':
|
346
|
+
return tokenizeAssignment();
|
347
|
+
case EOF:
|
348
|
+
return Token(Token::END_OF_FILE, "<END_OF_FILE>", currentLine, currentColumn);
|
349
|
+
default:
|
350
|
+
if (isblank(upcomingChar)) {
|
351
|
+
ignore();
|
352
|
+
} else {
|
353
|
+
switch(lastAcceptedChar) {
|
354
|
+
case '\n':
|
355
|
+
return tokenizeKey();
|
356
|
+
case '=':
|
357
|
+
return tokenizeValue();
|
358
|
+
default:
|
359
|
+
return tokenizeUnknown();
|
360
|
+
}
|
361
|
+
}
|
362
|
+
}
|
363
|
+
}
|
364
|
+
|
365
|
+
return Token(Token::END_OF_FILE, "<END_OF_FILE>", currentLine, currentColumn);
|
366
|
+
}
|
367
|
+
};
|
368
|
+
|
369
|
+
typedef shared_ptr<IniFileSection> IniFileSectionPtr;
|
370
|
+
|
371
|
+
|
372
|
+
class IniFile {
|
373
|
+
protected:
|
374
|
+
typedef map<string, IniFileSectionPtr> SectionMap;
|
375
|
+
string name;
|
376
|
+
SectionMap sections;
|
377
|
+
|
378
|
+
class IniFileParser {
|
379
|
+
typedef IniFileLexer::Token Token;
|
380
|
+
|
381
|
+
protected:
|
382
|
+
IniFileLexer lexer;
|
383
|
+
IniFile *iniFile;
|
384
|
+
|
385
|
+
// The Start Symbol.
|
386
|
+
void parseSections() {
|
387
|
+
while ((lexer.peekToken())->kind == Token::SECTION_NAME) {
|
388
|
+
parseSection();
|
389
|
+
}
|
390
|
+
}
|
391
|
+
|
392
|
+
void parseSection() {
|
393
|
+
Token token = acceptAndReturnif (Token::SECTION_NAME);
|
394
|
+
acceptIfEOL();
|
395
|
+
|
396
|
+
string sectionName = token.value;
|
397
|
+
IniFileSection *section = new IniFileSection(sectionName);
|
398
|
+
iniFile->addSection(section);
|
399
|
+
|
400
|
+
parseSectionBody(section);
|
401
|
+
}
|
402
|
+
|
403
|
+
void parseSectionBody(IniFileSection *currentSection) {
|
404
|
+
while ((lexer.peekToken())->kind == Token::IDENTIFIER) {
|
405
|
+
parseKeyValue(currentSection);
|
406
|
+
}
|
407
|
+
}
|
408
|
+
|
409
|
+
void parseKeyValue(IniFileSection *currentSection) {
|
410
|
+
Token identifierToken = acceptAndReturnif (Token::IDENTIFIER);
|
411
|
+
acceptif (Token::ASSIGNMENT);
|
412
|
+
Token valueToken = acceptAndReturnif (Token::TEXT);
|
413
|
+
acceptIfEOL();
|
414
|
+
currentSection->set(identifierToken.value, valueToken.value);
|
415
|
+
}
|
416
|
+
|
417
|
+
void acceptif (Token::Kind expectedKind) {
|
418
|
+
Token token = lexer.getToken();
|
419
|
+
|
420
|
+
if (token.kind != expectedKind) {
|
421
|
+
throw Token::ExpectanceException(expectedKind, token);
|
422
|
+
}
|
423
|
+
}
|
424
|
+
|
425
|
+
void acceptIfEOL() {
|
426
|
+
Token token = lexer.getToken();
|
427
|
+
|
428
|
+
if (token.kind != Token::NEWLINE && token.kind != Token::END_OF_FILE) {
|
429
|
+
throw Token::ExpectanceException(Token::NEWLINE, token);
|
430
|
+
}
|
431
|
+
}
|
432
|
+
|
433
|
+
Token acceptAndReturnif (Token::Kind expectedKind) {
|
434
|
+
Token token = lexer.getToken();
|
435
|
+
|
436
|
+
if (token.kind != expectedKind) {
|
437
|
+
throw Token::ExpectanceException(expectedKind, token);
|
438
|
+
}
|
439
|
+
|
440
|
+
return token;
|
441
|
+
}
|
442
|
+
|
443
|
+
public:
|
444
|
+
IniFileParser(IniFile *iniFile) : lexer(iniFile->getName()), iniFile(iniFile) {
|
445
|
+
parseSections();
|
446
|
+
}
|
447
|
+
};
|
448
|
+
|
449
|
+
public:
|
450
|
+
IniFile(const string &iniFileName) : name(iniFileName) {
|
451
|
+
IniFileParser parser(this);
|
452
|
+
}
|
453
|
+
|
454
|
+
void addSection(IniFileSection *section) {
|
455
|
+
sections.insert(make_pair(section->getSectionName(), IniFileSectionPtr(section)));
|
456
|
+
}
|
457
|
+
|
458
|
+
IniFileSectionPtr section(const string §ionName) {
|
459
|
+
SectionMap::iterator it = sections.find(sectionName);
|
460
|
+
if (it != sections.end()) {
|
461
|
+
return it->second;
|
462
|
+
} else {
|
463
|
+
return IniFileSectionPtr();
|
464
|
+
}
|
465
|
+
}
|
466
|
+
|
467
|
+
bool hasSection(const string §ionName) const {
|
468
|
+
return sections.find(sectionName) != sections.end();
|
469
|
+
}
|
470
|
+
|
471
|
+
string getName() const {
|
472
|
+
return name;
|
473
|
+
}
|
474
|
+
|
475
|
+
void inspect() const {
|
476
|
+
SectionMap::const_iterator it = sections.begin();
|
477
|
+
while (it != sections.end()) {
|
478
|
+
cout << "[" << (it->first) << "]" << endl;
|
479
|
+
it->second->inspect();
|
480
|
+
|
481
|
+
it++;
|
482
|
+
}
|
483
|
+
}
|
484
|
+
};
|
485
|
+
|
486
|
+
} // namespace Passenger
|
487
|
+
|
488
|
+
#endif /* _PASSENGER_INI_FILE_H_ */
|