passenger 5.0.0.beta3 → 5.0.0.rc1

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.

Files changed (218) hide show
  1. checksums.yaml +8 -8
  2. checksums.yaml.gz.asc +7 -7
  3. data.tar.gz.asc +7 -7
  4. data/.editorconfig +11 -5
  5. data/CHANGELOG +38 -0
  6. data/CONTRIBUTING.md +1 -4
  7. data/Gemfile +0 -1
  8. data/Gemfile.lock +0 -2
  9. data/Rakefile +33 -33
  10. data/bin/passenger +1 -1
  11. data/bin/passenger-config +1 -1
  12. data/bin/passenger-install-apache2-module +800 -800
  13. data/bin/passenger-install-nginx-module +592 -592
  14. data/bin/passenger-memory-stats +127 -127
  15. data/bin/passenger-status +216 -216
  16. data/build/agents.rb +127 -127
  17. data/build/apache2.rb +87 -87
  18. data/build/basics.rb +60 -60
  19. data/build/common_library.rb +165 -165
  20. data/build/cplusplus_support.rb +51 -51
  21. data/build/cxx_tests.rb +268 -268
  22. data/build/debian.rb +143 -143
  23. data/build/documentation.rb +58 -58
  24. data/build/integration_tests.rb +81 -81
  25. data/build/misc.rb +132 -132
  26. data/build/nginx.rb +20 -20
  27. data/build/node_tests.rb +7 -7
  28. data/build/oxt_tests.rb +14 -14
  29. data/build/packaging.rb +570 -570
  30. data/build/preprocessor.rb +260 -260
  31. data/build/rake_extensions.rb +71 -71
  32. data/build/ruby_extension.rb +29 -29
  33. data/build/ruby_tests.rb +6 -6
  34. data/build/test_basics.rb +37 -37
  35. data/debian.template/control.template +3 -5
  36. data/dev/copy_boost_headers +134 -134
  37. data/dev/install_scripts_bootstrap_code.rb +25 -25
  38. data/dev/list_tests +20 -20
  39. data/dev/ruby_server.rb +223 -223
  40. data/dev/runner +18 -18
  41. data/doc/ServerOptimizationGuide.txt.md +55 -2
  42. data/doc/Users guide Nginx.txt +0 -26
  43. data/doc/Users guide Standalone.txt +5 -1
  44. data/doc/users_guide_snippets/tips.txt +9 -0
  45. data/ext/common/ApplicationPool2/Group.h +23 -11
  46. data/ext/common/ApplicationPool2/Implementation.cpp +32 -7
  47. data/ext/common/ApplicationPool2/Pool.h +22 -17
  48. data/ext/common/ApplicationPool2/SmartSpawner.h +4 -1
  49. data/ext/common/ApplicationPool2/Spawner.h +1 -1
  50. data/ext/common/Constants.h +1 -1
  51. data/ext/common/agents/Base.cpp +35 -20
  52. data/ext/common/agents/HelperAgent/Main.cpp +8 -1
  53. data/ext/common/agents/HelperAgent/OptionParser.h +18 -4
  54. data/ext/common/agents/HelperAgent/RequestHandler.h +2 -83
  55. data/ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp +54 -1
  56. data/ext/common/agents/HelperAgent/RequestHandler/InitRequest.cpp +7 -4
  57. data/ext/common/agents/Main.cpp +1 -1
  58. data/ext/common/agents/Watchdog/Main.cpp +54 -19
  59. data/ext/nginx/Configuration.c +7 -0
  60. data/ext/nginx/ContentHandler.c +9 -1
  61. data/helper-scripts/backtrace-sanitizer.rb +106 -87
  62. data/helper-scripts/crash-watch.rb +32 -0
  63. data/helper-scripts/download_binaries/extconf.rb +38 -38
  64. data/helper-scripts/meteor-loader.rb +107 -107
  65. data/helper-scripts/prespawn +101 -101
  66. data/helper-scripts/rack-loader.rb +96 -96
  67. data/helper-scripts/rack-preloader.rb +137 -137
  68. data/lib/phusion_passenger.rb +292 -292
  69. data/lib/phusion_passenger/abstract_installer.rb +438 -438
  70. data/lib/phusion_passenger/active_support3_extensions/init.rb +168 -170
  71. data/lib/phusion_passenger/admin_tools.rb +20 -20
  72. data/lib/phusion_passenger/admin_tools/instance.rb +178 -178
  73. data/lib/phusion_passenger/admin_tools/instance_registry.rb +61 -61
  74. data/lib/phusion_passenger/admin_tools/memory_stats.rb +267 -267
  75. data/lib/phusion_passenger/apache2/config_options.rb +182 -182
  76. data/lib/phusion_passenger/common_library.rb +479 -485
  77. data/lib/phusion_passenger/config/about_command.rb +161 -161
  78. data/lib/phusion_passenger/config/admin_command_command.rb +129 -129
  79. data/lib/phusion_passenger/config/agent_compiler.rb +121 -121
  80. data/lib/phusion_passenger/config/build_native_support_command.rb +43 -43
  81. data/lib/phusion_passenger/config/command.rb +25 -25
  82. data/lib/phusion_passenger/config/compile_agent_command.rb +62 -62
  83. data/lib/phusion_passenger/config/compile_nginx_engine_command.rb +88 -73
  84. data/lib/phusion_passenger/config/detach_process_command.rb +72 -72
  85. data/lib/phusion_passenger/config/download_agent_command.rb +246 -227
  86. data/lib/phusion_passenger/config/download_nginx_engine_command.rb +245 -224
  87. data/lib/phusion_passenger/config/install_agent_command.rb +144 -132
  88. data/lib/phusion_passenger/config/install_standalone_runtime_command.rb +205 -185
  89. data/lib/phusion_passenger/config/installation_utils.rb +204 -204
  90. data/lib/phusion_passenger/config/list_instances_command.rb +64 -64
  91. data/lib/phusion_passenger/config/main.rb +152 -152
  92. data/lib/phusion_passenger/config/nginx_engine_compiler.rb +319 -300
  93. data/lib/phusion_passenger/config/reopen_logs_command.rb +67 -67
  94. data/lib/phusion_passenger/config/restart_app_command.rb +155 -155
  95. data/lib/phusion_passenger/config/system_metrics_command.rb +13 -13
  96. data/lib/phusion_passenger/config/utils.rb +95 -95
  97. data/lib/phusion_passenger/config/validate_install_command.rb +198 -198
  98. data/lib/phusion_passenger/console_text_template.rb +25 -25
  99. data/lib/phusion_passenger/constants.rb +90 -90
  100. data/lib/phusion_passenger/debug_logging.rb +106 -106
  101. data/lib/phusion_passenger/loader_shared_helpers.rb +447 -432
  102. data/lib/phusion_passenger/message_channel.rb +312 -312
  103. data/lib/phusion_passenger/message_client.rb +176 -176
  104. data/lib/phusion_passenger/native_support.rb +369 -369
  105. data/lib/phusion_passenger/nginx/config_options.rb +297 -297
  106. data/lib/phusion_passenger/packaging.rb +131 -131
  107. data/lib/phusion_passenger/platform_info.rb +360 -360
  108. data/lib/phusion_passenger/platform_info/apache.rb +767 -767
  109. data/lib/phusion_passenger/platform_info/apache_detector.rb +199 -199
  110. data/lib/phusion_passenger/platform_info/binary_compatibility.rb +107 -107
  111. data/lib/phusion_passenger/platform_info/compiler.rb +570 -570
  112. data/lib/phusion_passenger/platform_info/curl.rb +32 -32
  113. data/lib/phusion_passenger/platform_info/cxx_portability.rb +188 -188
  114. data/lib/phusion_passenger/platform_info/depcheck.rb +372 -372
  115. data/lib/phusion_passenger/platform_info/depcheck_specs/apache2.rb +109 -109
  116. data/lib/phusion_passenger/platform_info/depcheck_specs/compiler_toolchain.rb +4 -4
  117. data/lib/phusion_passenger/platform_info/depcheck_specs/gems.rb +10 -34
  118. data/lib/phusion_passenger/platform_info/depcheck_specs/libs.rb +101 -101
  119. data/lib/phusion_passenger/platform_info/depcheck_specs/ruby.rb +5 -5
  120. data/lib/phusion_passenger/platform_info/depcheck_specs/utilities.rb +13 -13
  121. data/lib/phusion_passenger/platform_info/linux.rb +55 -55
  122. data/lib/phusion_passenger/platform_info/operating_system.rb +149 -149
  123. data/lib/phusion_passenger/platform_info/ruby.rb +468 -448
  124. data/lib/phusion_passenger/platform_info/zlib.rb +9 -9
  125. data/lib/phusion_passenger/plugin.rb +66 -66
  126. data/lib/phusion_passenger/preloader_shared_helpers.rb +126 -126
  127. data/lib/phusion_passenger/public_api.rb +191 -191
  128. data/lib/phusion_passenger/rack/out_of_band_gc.rb +93 -94
  129. data/lib/phusion_passenger/rack/thread_handler_extension.rb +231 -227
  130. data/lib/phusion_passenger/request_handler.rb +567 -577
  131. data/lib/phusion_passenger/request_handler/thread_handler.rb +379 -381
  132. data/lib/phusion_passenger/ruby_core_enhancements.rb +86 -86
  133. data/lib/phusion_passenger/ruby_core_io_enhancements.rb +74 -74
  134. data/lib/phusion_passenger/simple_benchmarking.rb +25 -25
  135. data/lib/phusion_passenger/standalone/app_finder.rb +153 -150
  136. data/lib/phusion_passenger/standalone/command.rb +44 -40
  137. data/lib/phusion_passenger/standalone/config_utils.rb +53 -53
  138. data/lib/phusion_passenger/standalone/control_utils.rb +38 -59
  139. data/lib/phusion_passenger/standalone/main.rb +73 -73
  140. data/lib/phusion_passenger/standalone/start_command.rb +697 -685
  141. data/lib/phusion_passenger/standalone/start_command/builtin_engine.rb +193 -155
  142. data/lib/phusion_passenger/standalone/start_command/nginx_engine.rb +162 -133
  143. data/lib/phusion_passenger/standalone/status_command.rb +64 -64
  144. data/lib/phusion_passenger/standalone/stop_command.rb +72 -72
  145. data/lib/phusion_passenger/standalone/version_command.rb +9 -9
  146. data/lib/phusion_passenger/union_station/connection.rb +32 -32
  147. data/lib/phusion_passenger/union_station/core.rb +251 -251
  148. data/lib/phusion_passenger/union_station/transaction.rb +126 -126
  149. data/lib/phusion_passenger/utils.rb +199 -167
  150. data/lib/phusion_passenger/utils/ansi_colors.rb +128 -128
  151. data/lib/phusion_passenger/utils/download.rb +196 -196
  152. data/lib/phusion_passenger/utils/file_system_watcher.rb +158 -158
  153. data/lib/phusion_passenger/utils/hosts_file_parser.rb +101 -101
  154. data/lib/phusion_passenger/utils/lock.rb +31 -31
  155. data/lib/phusion_passenger/utils/native_support_utils.rb +31 -31
  156. data/lib/phusion_passenger/utils/progress_bar.rb +26 -26
  157. data/lib/phusion_passenger/utils/shellwords.rb +20 -20
  158. data/lib/phusion_passenger/utils/terminal_choice_menu.rb +206 -206
  159. data/lib/phusion_passenger/utils/unseekable_socket.rb +272 -272
  160. data/lib/phusion_passenger/vendor/crash_watch/app.rb +129 -0
  161. data/lib/phusion_passenger/vendor/crash_watch/gdb_controller.rb +341 -0
  162. data/lib/phusion_passenger/vendor/crash_watch/version.rb +24 -0
  163. data/lib/phusion_passenger/vendor/daemon_controller.rb +877 -0
  164. data/lib/phusion_passenger/vendor/daemon_controller/lock_file.rb +127 -0
  165. data/lib/phusion_passenger/vendor/daemon_controller/spawn.rb +26 -0
  166. data/lib/phusion_passenger/vendor/daemon_controller/version.rb +29 -0
  167. data/packaging/rpm/passenger_spec/passenger.spec.template +0 -1
  168. data/passenger.gemspec +0 -1
  169. data/resources/templates/config/nginx_engine_compiler/possible_solutions_for_download_and_extraction_problems.txt.erb +27 -0
  170. data/resources/templates/standalone/config.erb +19 -15
  171. data/test/integration_tests/apache2_tests.rb +566 -566
  172. data/test/integration_tests/downloaded_binaries_tests.rb +126 -125
  173. data/test/integration_tests/native_packaging_spec.rb +296 -296
  174. data/test/integration_tests/nginx_tests.rb +393 -393
  175. data/test/integration_tests/shared/example_webapp_tests.rb +282 -280
  176. data/test/integration_tests/source_packaging_test.rb +138 -138
  177. data/test/integration_tests/spec_helper.rb +5 -5
  178. data/test/integration_tests/standalone_tests.rb +367 -367
  179. data/test/ruby/debug_logging_spec.rb +133 -133
  180. data/test/ruby/message_channel_spec.rb +186 -186
  181. data/test/ruby/rack/loader_spec.rb +28 -28
  182. data/test/ruby/rack/preloader_spec.rb +34 -34
  183. data/test/ruby/rails3.0/loader_spec.rb +12 -12
  184. data/test/ruby/rails3.0/preloader_spec.rb +18 -18
  185. data/test/ruby/rails3.1/loader_spec.rb +12 -12
  186. data/test/ruby/rails3.1/preloader_spec.rb +18 -18
  187. data/test/ruby/rails3.2/loader_spec.rb +12 -12
  188. data/test/ruby/rails3.2/preloader_spec.rb +18 -18
  189. data/test/ruby/rails4.0/loader_spec.rb +12 -12
  190. data/test/ruby/rails4.0/preloader_spec.rb +18 -18
  191. data/test/ruby/rails4.1/loader_spec.rb +12 -12
  192. data/test/ruby/rails4.1/preloader_spec.rb +18 -18
  193. data/test/ruby/request_handler_spec.rb +730 -730
  194. data/test/ruby/shared/loader_sharedspec.rb +224 -224
  195. data/test/ruby/shared/rails/union_station_extensions_sharedspec.rb +327 -327
  196. data/test/ruby/shared/ruby_loader_sharedspec.rb +47 -47
  197. data/test/ruby/spec_helper.rb +65 -65
  198. data/test/ruby/standalone/runtime_installer_spec.rb +384 -384
  199. data/test/ruby/union_station_spec.rb +276 -276
  200. data/test/ruby/utils/file_system_watcher_spec.rb +220 -220
  201. data/test/ruby/utils/hosts_file_parser.rb +248 -248
  202. data/test/ruby/utils/tee_input_spec.rb +215 -215
  203. data/test/ruby/utils/unseekable_socket_spec.rb +57 -57
  204. data/test/ruby/utils_spec.rb +21 -21
  205. data/test/stub/rack/config.ru +87 -87
  206. data/test/stub/rack/library.rb +8 -8
  207. data/test/stub/rack/start.rb +30 -30
  208. data/test/support/apache2_controller.rb +191 -191
  209. data/test/support/nginx_controller.rb +90 -99
  210. data/test/support/placebo-preloader.rb +57 -57
  211. data/test/support/test_helper.rb +435 -435
  212. metadata +11 -21
  213. metadata.gz.asc +7 -7
  214. data/lib/phusion_passenger/standalone/command2.rb +0 -292
  215. data/lib/phusion_passenger/standalone/start2_command.rb +0 -799
  216. data/resources/templates/standalone/download_tool_missing.txt.erb +0 -18
  217. data/resources/templates/standalone/possible_solutions_for_download_and_extraction_problems.txt.erb +0 -17
  218. data/resources/templates/standalone/run_installer_as_root.txt.erb +0 -8
data/build/agents.rb CHANGED
@@ -22,144 +22,144 @@
22
22
  # THE SOFTWARE.
23
23
 
24
24
  AGENT_OBJECTS = {
25
- 'WatchdogMain.o' => [
26
- 'ext/common/agents/Watchdog/Main.cpp',
27
- 'ext/common/agents/Watchdog/Main.cpp',
28
- 'ext/common/agents/Watchdog/AgentWatcher.cpp',
29
- 'ext/common/agents/Watchdog/HelperAgentWatcher.cpp',
30
- 'ext/common/agents/Watchdog/LoggingAgentWatcher.cpp',
31
- 'ext/common/agents/Watchdog/InstanceDirToucher.cpp',
32
- 'ext/common/agents/Watchdog/AdminServer.h',
33
- 'ext/common/agents/HelperAgent/OptionParser.h',
34
- 'ext/common/agents/LoggingAgent/OptionParser.h',
35
- 'ext/common/ServerKit/Server.h',
36
- 'ext/common/ServerKit/HttpServer.h',
37
- 'ext/common/ServerKit/HttpHeaderParser.h',
38
- 'ext/common/ServerKit/FileBufferedChannel.h',
39
- 'ext/common/Constants.h',
40
- 'ext/common/InstanceDirectory.h',
41
- 'ext/common/ResourceLocator.h',
42
- 'ext/common/Utils/VariantMap.h'
43
- ],
44
- 'ServerMain.o' => [
45
- 'ext/common/agents/HelperAgent/Main.cpp',
46
- 'ext/common/agents/HelperAgent/OptionParser.h',
47
- 'ext/common/agents/HelperAgent/AdminServer.h',
48
- 'ext/common/agents/HelperAgent/ResponseCache.h',
49
- 'ext/common/agents/HelperAgent/RequestHandler.h',
50
- 'ext/common/agents/HelperAgent/RequestHandler/Client.h',
51
- 'ext/common/agents/HelperAgent/RequestHandler/AppResponse.h',
52
- 'ext/common/agents/HelperAgent/RequestHandler/TurboCaching.h',
53
- 'ext/common/agents/HelperAgent/RequestHandler/Utils.cpp',
54
- 'ext/common/agents/HelperAgent/RequestHandler/Hooks.cpp',
55
- 'ext/common/agents/HelperAgent/RequestHandler/InitRequest.cpp',
56
- 'ext/common/agents/HelperAgent/RequestHandler/BufferBody.cpp',
57
- 'ext/common/agents/HelperAgent/RequestHandler/CheckoutSession.cpp',
58
- 'ext/common/agents/HelperAgent/RequestHandler/SendRequest.cpp',
59
- 'ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp',
60
- 'ext/common/ServerKit/Server.h',
61
- 'ext/common/ServerKit/HttpServer.h',
62
- 'ext/common/ServerKit/HttpHeaderParser.h',
63
- 'ext/common/ServerKit/AcceptLoadBalancer.h',
64
- 'ext/common/ServerKit/FileBufferedChannel.h',
65
- 'ext/common/ApplicationPool2/Pool.h',
66
- 'ext/common/ApplicationPool2/Group.h',
67
- 'ext/common/ApplicationPool2/Spawner.h',
68
- 'ext/common/Constants.h',
69
- 'ext/common/StaticString.h',
70
- 'ext/common/Account.h',
71
- 'ext/common/AccountsDatabase.h',
72
- 'ext/common/MessageServer.h',
73
- 'ext/common/FileDescriptor.h',
74
- 'ext/common/Logging.h',
75
- 'ext/common/ResourceLocator.h',
76
- 'ext/common/Utils/ProcessMetricsCollector.h',
77
- 'ext/common/Utils/SystemMetricsCollector.h',
78
- 'ext/common/Utils/VariantMap.h'
79
- ],
80
- 'LoggingMain.o' => [
81
- 'ext/common/agents/LoggingAgent/Main.cpp',
82
- 'ext/common/agents/LoggingAgent/OptionParser.h',
83
- 'ext/common/agents/LoggingAgent/AdminServer.h',
84
- 'ext/common/agents/LoggingAgent/LoggingServer.h',
85
- 'ext/common/agents/LoggingAgent/RemoteSender.h',
86
- 'ext/common/agents/LoggingAgent/DataStoreId.h',
87
- 'ext/common/agents/LoggingAgent/FilterSupport.h',
88
- 'ext/common/ServerKit/Server.h',
89
- 'ext/common/ServerKit/HttpServer.h',
90
- 'ext/common/ServerKit/HttpHeaderParser.h',
91
- 'ext/common/ServerKit/FileBufferedChannel.h',
92
- 'ext/common/Constants.h',
93
- 'ext/common/Logging.h',
94
- 'ext/common/EventedServer.h',
95
- 'ext/common/EventedClient.h',
96
- 'ext/common/Utils/VariantMap.h',
97
- 'ext/common/Utils/BlockingQueue.h'
98
- ],
99
- 'SystemMetricsTool.o' => [
100
- 'ext/common/agents/HelperAgent/SystemMetricsTool.cpp',
101
- 'ext/common/Utils/SystemMetricsCollector.h'
102
- ],
103
- 'TempDirToucher.o' => [
104
- 'ext/common/agents/TempDirToucher/Main.cpp'
105
- ],
106
- 'SpawnPreparer.o' => [
107
- 'ext/common/agents/SpawnPreparer/Main.cpp'
108
- ]
25
+ 'WatchdogMain.o' => [
26
+ 'ext/common/agents/Watchdog/Main.cpp',
27
+ 'ext/common/agents/Watchdog/Main.cpp',
28
+ 'ext/common/agents/Watchdog/AgentWatcher.cpp',
29
+ 'ext/common/agents/Watchdog/HelperAgentWatcher.cpp',
30
+ 'ext/common/agents/Watchdog/LoggingAgentWatcher.cpp',
31
+ 'ext/common/agents/Watchdog/InstanceDirToucher.cpp',
32
+ 'ext/common/agents/Watchdog/AdminServer.h',
33
+ 'ext/common/agents/HelperAgent/OptionParser.h',
34
+ 'ext/common/agents/LoggingAgent/OptionParser.h',
35
+ 'ext/common/ServerKit/Server.h',
36
+ 'ext/common/ServerKit/HttpServer.h',
37
+ 'ext/common/ServerKit/HttpHeaderParser.h',
38
+ 'ext/common/ServerKit/FileBufferedChannel.h',
39
+ 'ext/common/Constants.h',
40
+ 'ext/common/InstanceDirectory.h',
41
+ 'ext/common/ResourceLocator.h',
42
+ 'ext/common/Utils/VariantMap.h'
43
+ ],
44
+ 'ServerMain.o' => [
45
+ 'ext/common/agents/HelperAgent/Main.cpp',
46
+ 'ext/common/agents/HelperAgent/OptionParser.h',
47
+ 'ext/common/agents/HelperAgent/AdminServer.h',
48
+ 'ext/common/agents/HelperAgent/ResponseCache.h',
49
+ 'ext/common/agents/HelperAgent/RequestHandler.h',
50
+ 'ext/common/agents/HelperAgent/RequestHandler/Client.h',
51
+ 'ext/common/agents/HelperAgent/RequestHandler/AppResponse.h',
52
+ 'ext/common/agents/HelperAgent/RequestHandler/TurboCaching.h',
53
+ 'ext/common/agents/HelperAgent/RequestHandler/Utils.cpp',
54
+ 'ext/common/agents/HelperAgent/RequestHandler/Hooks.cpp',
55
+ 'ext/common/agents/HelperAgent/RequestHandler/InitRequest.cpp',
56
+ 'ext/common/agents/HelperAgent/RequestHandler/BufferBody.cpp',
57
+ 'ext/common/agents/HelperAgent/RequestHandler/CheckoutSession.cpp',
58
+ 'ext/common/agents/HelperAgent/RequestHandler/SendRequest.cpp',
59
+ 'ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp',
60
+ 'ext/common/ServerKit/Server.h',
61
+ 'ext/common/ServerKit/HttpServer.h',
62
+ 'ext/common/ServerKit/HttpHeaderParser.h',
63
+ 'ext/common/ServerKit/AcceptLoadBalancer.h',
64
+ 'ext/common/ServerKit/FileBufferedChannel.h',
65
+ 'ext/common/ApplicationPool2/Pool.h',
66
+ 'ext/common/ApplicationPool2/Group.h',
67
+ 'ext/common/ApplicationPool2/Spawner.h',
68
+ 'ext/common/Constants.h',
69
+ 'ext/common/StaticString.h',
70
+ 'ext/common/Account.h',
71
+ 'ext/common/AccountsDatabase.h',
72
+ 'ext/common/MessageServer.h',
73
+ 'ext/common/FileDescriptor.h',
74
+ 'ext/common/Logging.h',
75
+ 'ext/common/ResourceLocator.h',
76
+ 'ext/common/Utils/ProcessMetricsCollector.h',
77
+ 'ext/common/Utils/SystemMetricsCollector.h',
78
+ 'ext/common/Utils/VariantMap.h'
79
+ ],
80
+ 'LoggingMain.o' => [
81
+ 'ext/common/agents/LoggingAgent/Main.cpp',
82
+ 'ext/common/agents/LoggingAgent/OptionParser.h',
83
+ 'ext/common/agents/LoggingAgent/AdminServer.h',
84
+ 'ext/common/agents/LoggingAgent/LoggingServer.h',
85
+ 'ext/common/agents/LoggingAgent/RemoteSender.h',
86
+ 'ext/common/agents/LoggingAgent/DataStoreId.h',
87
+ 'ext/common/agents/LoggingAgent/FilterSupport.h',
88
+ 'ext/common/ServerKit/Server.h',
89
+ 'ext/common/ServerKit/HttpServer.h',
90
+ 'ext/common/ServerKit/HttpHeaderParser.h',
91
+ 'ext/common/ServerKit/FileBufferedChannel.h',
92
+ 'ext/common/Constants.h',
93
+ 'ext/common/Logging.h',
94
+ 'ext/common/EventedServer.h',
95
+ 'ext/common/EventedClient.h',
96
+ 'ext/common/Utils/VariantMap.h',
97
+ 'ext/common/Utils/BlockingQueue.h'
98
+ ],
99
+ 'SystemMetricsTool.o' => [
100
+ 'ext/common/agents/HelperAgent/SystemMetricsTool.cpp',
101
+ 'ext/common/Utils/SystemMetricsCollector.h'
102
+ ],
103
+ 'TempDirToucher.o' => [
104
+ 'ext/common/agents/TempDirToucher/Main.cpp'
105
+ ],
106
+ 'SpawnPreparer.o' => [
107
+ 'ext/common/agents/SpawnPreparer/Main.cpp'
108
+ ]
109
109
  }
110
110
 
111
111
  AGENT_OBJECTS.each_pair do |agent_object, agent_dependencies|
112
- full_agent_object = "#{AGENT_OUTPUT_DIR}#{agent_object}"
113
- full_agent_object_dir = File.dirname(full_agent_object)
114
- file(full_agent_object => agent_dependencies) do
115
- sh "mkdir -p #{full_agent_object_dir}" if !File.directory?(full_agent_object_dir)
116
- compile_cxx(agent_dependencies[0],
117
- "-o #{full_agent_object} " <<
118
- "#{EXTRA_PRE_CXXFLAGS} " <<
119
- "-Iext -Iext/common " <<
120
- "#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
121
- "#{EXTRA_CXXFLAGS}")
122
- end
112
+ full_agent_object = "#{AGENT_OUTPUT_DIR}#{agent_object}"
113
+ full_agent_object_dir = File.dirname(full_agent_object)
114
+ file(full_agent_object => agent_dependencies) do
115
+ sh "mkdir -p #{full_agent_object_dir}" if !File.directory?(full_agent_object_dir)
116
+ compile_cxx(agent_dependencies[0],
117
+ "-o #{full_agent_object} " <<
118
+ "#{EXTRA_PRE_CXXFLAGS} " <<
119
+ "-Iext -Iext/common " <<
120
+ "#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
121
+ "#{EXTRA_CXXFLAGS}")
122
+ end
123
123
  end
124
124
 
125
125
  agent_libs = COMMON_LIBRARY.
126
- only(:base, :logging_agent, :other).
127
- exclude('AgentsStarter.o')
126
+ only(:base, :logging_agent, :other).
127
+ exclude('AgentsStarter.o')
128
128
  agent_objects = AGENT_OBJECTS.keys.map { |x| "#{AGENT_OUTPUT_DIR}#{x}" }
129
129
  dependencies = agent_objects + [
130
- 'ext/common/Constants.h',
131
- 'ext/common/agents/Main.cpp',
132
- LIBBOOST_OXT,
133
- agent_libs.link_objects,
134
- LIBEV_TARGET,
135
- LIBEIO_TARGET
130
+ 'ext/common/Constants.h',
131
+ 'ext/common/agents/Main.cpp',
132
+ LIBBOOST_OXT,
133
+ agent_libs.link_objects,
134
+ LIBEV_TARGET,
135
+ LIBEIO_TARGET
136
136
  ].flatten.compact
137
137
  file AGENT_OUTPUT_DIR + AGENT_EXE => dependencies do
138
- agent_objects_as_string = agent_objects.join(" ")
139
- sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
140
- compile_cxx("ext/common/agents/Main.cpp",
141
- "-o #{AGENT_OUTPUT_DIR}#{AGENT_EXE}.o " <<
142
- "#{EXTRA_PRE_CXXFLAGS} " <<
143
- "-Iext -Iext/common " <<
144
- "#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
145
- "#{PlatformInfo.curl_flags} " <<
146
- "#{PlatformInfo.zlib_flags} " <<
147
- "#{EXTRA_CXXFLAGS}")
148
- create_executable("#{AGENT_OUTPUT_DIR}#{AGENT_EXE}",
149
- "#{AGENT_OUTPUT_DIR}#{AGENT_EXE}.o",
150
- "#{agent_libs.link_objects_as_string} " <<
151
- "#{agent_objects_as_string} " <<
152
- "#{LIBBOOST_OXT} " <<
153
- "#{EXTRA_PRE_CXX_LDFLAGS} " <<
154
- "#{LIBEV_LIBS} " <<
155
- "#{LIBEIO_LIBS} " <<
156
- "#{PlatformInfo.curl_libs} " <<
157
- "#{PlatformInfo.zlib_libs} " <<
158
- "#{PlatformInfo.portability_cxx_ldflags} " <<
159
- "#{AGENT_LDFLAGS} " <<
160
- "#{EXTRA_CXX_LDFLAGS}")
138
+ agent_objects_as_string = agent_objects.join(" ")
139
+ sh "mkdir -p #{AGENT_OUTPUT_DIR}" if !File.directory?(AGENT_OUTPUT_DIR)
140
+ compile_cxx("ext/common/agents/Main.cpp",
141
+ "-o #{AGENT_OUTPUT_DIR}#{AGENT_EXE}.o " <<
142
+ "#{EXTRA_PRE_CXXFLAGS} " <<
143
+ "-Iext -Iext/common " <<
144
+ "#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
145
+ "#{PlatformInfo.curl_flags} " <<
146
+ "#{PlatformInfo.zlib_flags} " <<
147
+ "#{EXTRA_CXXFLAGS}")
148
+ create_executable("#{AGENT_OUTPUT_DIR}#{AGENT_EXE}",
149
+ "#{AGENT_OUTPUT_DIR}#{AGENT_EXE}.o",
150
+ "#{agent_libs.link_objects_as_string} " <<
151
+ "#{agent_objects_as_string} " <<
152
+ "#{LIBBOOST_OXT} " <<
153
+ "#{EXTRA_PRE_CXX_LDFLAGS} " <<
154
+ "#{LIBEV_LIBS} " <<
155
+ "#{LIBEIO_LIBS} " <<
156
+ "#{PlatformInfo.curl_libs} " <<
157
+ "#{PlatformInfo.zlib_libs} " <<
158
+ "#{PlatformInfo.portability_cxx_ldflags} " <<
159
+ "#{AGENT_LDFLAGS} " <<
160
+ "#{EXTRA_CXX_LDFLAGS}")
161
161
  end
162
162
 
163
163
  task 'common:clean' do
164
- sh "rm -rf #{AGENT_OUTPUT_DIR}"
164
+ sh "rm -rf #{AGENT_OUTPUT_DIR}"
165
165
  end
data/build/apache2.rb CHANGED
@@ -31,66 +31,66 @@
31
31
 
32
32
  APACHE2_MODULE = APACHE2_OUTPUT_DIR + "mod_passenger.so"
33
33
  APACHE2_MODULE_INPUT_FILES = {
34
- APACHE2_OUTPUT_DIR + 'Configuration.o' => %w(
35
- ext/apache2/Configuration.cpp
36
- ext/apache2/Configuration.h
37
- ext/apache2/Configuration.hpp
38
- ext/common/agents/LoggingAgent/FilterSupport.h),
39
- APACHE2_OUTPUT_DIR + 'Bucket.o' => %w(
40
- ext/apache2/Bucket.cpp
41
- ext/apache2/Bucket.h),
42
- APACHE2_OUTPUT_DIR + 'Hooks.o' => %w(
43
- ext/apache2/Hooks.cpp
44
- ext/apache2/Hooks.h
45
- ext/apache2/Configuration.h
46
- ext/apache2/Configuration.hpp
47
- ext/apache2/Bucket.h
48
- ext/apache2/DirectoryMapper.h
49
- ext/common/AgentsStarter.h
50
- ext/common/Exceptions.h
51
- ext/common/Logging.h
52
- ext/common/RandomGenerator.h
53
- ext/common/Utils.h
54
- ext/common/Utils/Timer.h)
34
+ APACHE2_OUTPUT_DIR + 'Configuration.o' => %w(
35
+ ext/apache2/Configuration.cpp
36
+ ext/apache2/Configuration.h
37
+ ext/apache2/Configuration.hpp
38
+ ext/common/agents/LoggingAgent/FilterSupport.h),
39
+ APACHE2_OUTPUT_DIR + 'Bucket.o' => %w(
40
+ ext/apache2/Bucket.cpp
41
+ ext/apache2/Bucket.h),
42
+ APACHE2_OUTPUT_DIR + 'Hooks.o' => %w(
43
+ ext/apache2/Hooks.cpp
44
+ ext/apache2/Hooks.h
45
+ ext/apache2/Configuration.h
46
+ ext/apache2/Configuration.hpp
47
+ ext/apache2/Bucket.h
48
+ ext/apache2/DirectoryMapper.h
49
+ ext/common/AgentsStarter.h
50
+ ext/common/Exceptions.h
51
+ ext/common/Logging.h
52
+ ext/common/RandomGenerator.h
53
+ ext/common/Utils.h
54
+ ext/common/Utils/Timer.h)
55
55
  }
56
56
  APACHE2_MODULE_OBJECTS = APACHE2_MODULE_INPUT_FILES.keys
57
57
  APACHE2_MOD_PASSENGER_O = APACHE2_OUTPUT_DIR + "mod_passenger.o"
58
58
 
59
59
  APACHE2_MODULE_CFLAGS =
60
- "#{EXTRA_PRE_CFLAGS} " <<
61
- "-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
62
- "#{EXTRA_CFLAGS}"
60
+ "#{EXTRA_PRE_CFLAGS} " <<
61
+ "-Iext -Iext/common #{PlatformInfo.apache2_module_cflags} " <<
62
+ "#{EXTRA_CFLAGS}"
63
63
  APACHE2_MODULE_CXXFLAGS =
64
- "#{EXTRA_PRE_CXXFLAGS} " <<
65
- "-Iext -Iext/common #{PlatformInfo.apache2_module_cxxflags} " <<
66
- "#{EXTRA_CXXFLAGS}"
64
+ "#{EXTRA_PRE_CXXFLAGS} " <<
65
+ "-Iext -Iext/common #{PlatformInfo.apache2_module_cxxflags} " <<
66
+ "#{EXTRA_CXXFLAGS}"
67
67
 
68
68
  APACHE2_MODULE_BOOST_OXT_LIBRARY = define_libboost_oxt_task("apache2",
69
- APACHE2_OUTPUT_DIR + "module_libboost_oxt",
70
- PlatformInfo.apache2_module_cflags)
69
+ APACHE2_OUTPUT_DIR + "module_libboost_oxt",
70
+ PlatformInfo.apache2_module_cflags)
71
71
  APACHE2_MODULE_COMMON_LIBRARIES = COMMON_LIBRARY.
72
- only(:base, 'ApplicationPool2/AppTypes.o',
73
- 'Utils/MD5.o', 'Utils/modp_b64.o').
74
- set_namespace("apache2").
75
- set_output_dir(APACHE2_OUTPUT_DIR + "module_libpassenger_common").
76
- define_tasks(PlatformInfo.apache2_module_cflags).
77
- link_objects
72
+ only(:base, 'ApplicationPool2/AppTypes.o',
73
+ 'Utils/MD5.o', 'Utils/modp_b64.o').
74
+ set_namespace("apache2").
75
+ set_output_dir(APACHE2_OUTPUT_DIR + "module_libpassenger_common").
76
+ define_tasks(PlatformInfo.apache2_module_cflags).
77
+ link_objects
78
78
 
79
79
  auto_generated_sources = [
80
- 'ext/apache2/ConfigurationCommands.cpp',
81
- 'ext/apache2/ConfigurationFields.hpp',
82
- 'ext/apache2/CreateDirConfig.cpp',
83
- 'ext/apache2/MergeDirConfig.cpp',
84
- 'ext/apache2/ConfigurationSetters.cpp',
85
- 'ext/apache2/SetHeaders.cpp'
80
+ 'ext/apache2/ConfigurationCommands.cpp',
81
+ 'ext/apache2/ConfigurationFields.hpp',
82
+ 'ext/apache2/CreateDirConfig.cpp',
83
+ 'ext/apache2/MergeDirConfig.cpp',
84
+ 'ext/apache2/ConfigurationSetters.cpp',
85
+ 'ext/apache2/SetHeaders.cpp'
86
86
  ]
87
87
 
88
88
 
89
89
  desc "Build Apache 2 module"
90
90
  task :apache2 => [
91
- APACHE2_MODULE,
92
- AGENT_OUTPUT_DIR + AGENT_EXE,
93
- NATIVE_SUPPORT_TARGET
91
+ APACHE2_MODULE,
92
+ AGENT_OUTPUT_DIR + AGENT_EXE,
93
+ NATIVE_SUPPORT_TARGET
94
94
  ].compact
95
95
 
96
96
  # Workaround for https://github.com/jimweirich/rake/issues/274
@@ -99,67 +99,67 @@ task :_apache2 => :apache2
99
99
 
100
100
  # Define rules for the individual Apache 2 module source files.
101
101
  APACHE2_MODULE_INPUT_FILES.each_pair do |target, sources|
102
- extra_deps = ['ext/common/Constants.h'] + auto_generated_sources
103
- file(target => sources + extra_deps) do
104
- object_basename = File.basename(target)
105
- object_filename = APACHE2_OUTPUT_DIR + object_basename
106
- compile_cxx(sources[0],
107
- "#{APACHE2_MODULE_CXXFLAGS} " <<
108
- "-o #{object_filename}")
109
- end
102
+ extra_deps = ['ext/common/Constants.h'] + auto_generated_sources
103
+ file(target => sources + extra_deps) do
104
+ object_basename = File.basename(target)
105
+ object_filename = APACHE2_OUTPUT_DIR + object_basename
106
+ compile_cxx(sources[0],
107
+ "#{APACHE2_MODULE_CXXFLAGS} " <<
108
+ "-o #{object_filename}")
109
+ end
110
110
  end
111
111
 
112
112
 
113
113
  dependencies = [
114
- auto_generated_sources,
115
- APACHE2_MODULE_COMMON_LIBRARIES,
116
- APACHE2_MODULE_BOOST_OXT_LIBRARY,
117
- APACHE2_MOD_PASSENGER_O,
118
- APACHE2_MODULE_OBJECTS
114
+ auto_generated_sources,
115
+ APACHE2_MODULE_COMMON_LIBRARIES,
116
+ APACHE2_MODULE_BOOST_OXT_LIBRARY,
117
+ APACHE2_MOD_PASSENGER_O,
118
+ APACHE2_MODULE_OBJECTS
119
119
  ].flatten
120
120
  file APACHE2_MODULE => dependencies do
121
- PlatformInfo.apxs2.nil? and raise "Could not find 'apxs' or 'apxs2'."
122
- PlatformInfo.apache2ctl.nil? and raise "Could not find 'apachectl' or 'apache2ctl'."
123
- PlatformInfo.httpd.nil? and raise "Could not find the Apache web server binary."
124
-
125
- sources = (APACHE2_MODULE_OBJECTS + [APACHE2_MOD_PASSENGER_O]).join(' ')
126
- linkflags =
127
- "#{EXTRA_PRE_CXX_LDFLAGS} " <<
128
- "#{APACHE2_MODULE_COMMON_LIBRARIES.join(' ')} " <<
129
- "#{APACHE2_MODULE_BOOST_OXT_LIBRARY} " <<
130
- "#{PlatformInfo.apache2_module_cxx_ldflags} " <<
131
- "#{PlatformInfo.portability_cxx_ldflags} " <<
132
- "#{EXTRA_CXX_LDFLAGS} "
133
-
134
- create_shared_library(APACHE2_MODULE, sources, linkflags)
121
+ PlatformInfo.apxs2.nil? and raise "Could not find 'apxs' or 'apxs2'."
122
+ PlatformInfo.apache2ctl.nil? and raise "Could not find 'apachectl' or 'apache2ctl'."
123
+ PlatformInfo.httpd.nil? and raise "Could not find the Apache web server binary."
124
+
125
+ sources = (APACHE2_MODULE_OBJECTS + [APACHE2_MOD_PASSENGER_O]).join(' ')
126
+ linkflags =
127
+ "#{EXTRA_PRE_CXX_LDFLAGS} " <<
128
+ "#{APACHE2_MODULE_COMMON_LIBRARIES.join(' ')} " <<
129
+ "#{APACHE2_MODULE_BOOST_OXT_LIBRARY} " <<
130
+ "#{PlatformInfo.apache2_module_cxx_ldflags} " <<
131
+ "#{PlatformInfo.portability_cxx_ldflags} " <<
132
+ "#{EXTRA_CXX_LDFLAGS} "
133
+
134
+ create_shared_library(APACHE2_MODULE, sources, linkflags)
135
135
  end
136
136
 
137
137
  file APACHE2_MOD_PASSENGER_O => ['ext/apache2/mod_passenger.c'] do
138
- compile_c('ext/apache2/mod_passenger.c',
139
- "#{APACHE2_MODULE_CFLAGS} " <<
140
- "-o #{APACHE2_MOD_PASSENGER_O}")
138
+ compile_c('ext/apache2/mod_passenger.c',
139
+ "#{APACHE2_MODULE_CFLAGS} " <<
140
+ "-o #{APACHE2_MOD_PASSENGER_O}")
141
141
  end
142
142
 
143
143
  task :clean => 'apache2:clean'
144
144
  desc "Clean all compiled Apache 2 files"
145
145
  task 'apache2:clean' => 'common:clean' do
146
- files = APACHE2_MODULE_OBJECTS.dup
147
- files << APACHE2_MOD_PASSENGER_O
148
- files << APACHE2_MODULE
149
- sh("rm", "-rf", *files)
146
+ files = APACHE2_MODULE_OBJECTS.dup
147
+ files << APACHE2_MOD_PASSENGER_O
148
+ files << APACHE2_MODULE
149
+ sh("rm", "-rf", *files)
150
150
  end
151
151
 
152
152
  def create_apache2_auto_generated_source_task(source)
153
- dependencies = [
154
- "#{source}.erb",
155
- 'lib/phusion_passenger/apache2/config_options.rb'
156
- ]
157
- file(source => dependencies) do
158
- template = TemplateRenderer.new("#{source}.erb")
159
- template.render_to(source)
160
- end
153
+ dependencies = [
154
+ "#{source}.erb",
155
+ 'lib/phusion_passenger/apache2/config_options.rb'
156
+ ]
157
+ file(source => dependencies) do
158
+ template = TemplateRenderer.new("#{source}.erb")
159
+ template.render_to(source)
160
+ end
161
161
  end
162
162
 
163
163
  auto_generated_sources.each do |source|
164
- create_apache2_auto_generated_source_task(source)
164
+ create_apache2_auto_generated_source_task(source)
165
165
  end