passenger 5.1.10 → 5.1.11

data/build/common_library.rb

@@ -36,8 +36,6 @@ PhusionPassenger.require_passenger_lib 'common_library'
 # Defines tasks for compiling a static library containing Boost and OXT.
 def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
   output_file = "#{output_dir}.a"
-  flags = "-Isrc/cxx_supportlib -Isrc/cxx_supportlib/vendor-copy -Isrc/cxx_supportlib/vendor-modified " +
-    "#{extra_compiler_flags} #{EXTRA_CXXFLAGS}"
 
   if OPTIMIZE
     optimize = "-O2"
@@ -57,8 +55,10 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
     define_cxx_object_compilation_task(
       object_file,
       source_file,
-      :include_paths => CXX_SUPPORTLIB_INCLUDE_PATHS,
-      :flags => [optimize, extra_compiler_flags]
+      lambda { {
+        :include_paths => CXX_SUPPORTLIB_INCLUDE_PATHS,
+        :flags => [optimize, maybe_eval_lambda(extra_compiler_flags)]
+      } }
     )
   end
 
@@ -73,8 +73,10 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
     define_cxx_object_compilation_task(
       object_file,
       source_file,
-      :include_paths => CXX_SUPPORTLIB_INCLUDE_PATHS,
-      :flags => [optimize, extra_compiler_flags]
+      lambda { {
+        :include_paths => CXX_SUPPORTLIB_INCLUDE_PATHS,
+        :flags => [optimize, maybe_eval_lambda(extra_compiler_flags)]
+      } }
     )
   end
 
@@ -102,9 +104,23 @@ end
 
 if USE_VENDORED_LIBEV
   LIBEV_SOURCE_DIR = File.expand_path("../src/cxx_supportlib/vendor-modified/libev", File.dirname(__FILE__)) + "/"
-  LIBEV_CFLAGS = "-Isrc/cxx_supportlib/vendor-modified/libev"
   LIBEV_TARGET = LIBEV_OUTPUT_DIR + ".libs/libev.a"
 
+  let(:libev_cflags) do
+    result = '-Isrc/cxx_supportlib/vendor-modified/libev'
+    # Apple Clang 4.2 complains about ambiguous member templates in ev++.h.
+    result << ' -Wno-ambiguous-member-template' if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
+    result
+  end
+
+  let(:libev_libs) do
+    la_contents = File.open(LIBEV_OUTPUT_DIR + ".libs/libev.la", "r") do |f|
+      f.read
+    end
+    la_contents =~ /dependency_libs='(.+)'/
+    "#{LIBEV_OUTPUT_DIR}.libs/libev.a #{$1}".strip
+  end
+
   task :libev => LIBEV_TARGET
 
   dependencies = [
@@ -113,20 +129,20 @@ if USE_VENDORED_LIBEV
     "src/cxx_supportlib/vendor-modified/libev/Makefile.am"
   ]
   file LIBEV_OUTPUT_DIR + "Makefile" => dependencies do
-    cc = CC
-    cxx = CXX
+    cc_command = cc
+    cxx_command = cxx
     if OPTIMIZE && LTO
-      cc = "#{cc} -flto"
-      cxx = "#{cxx} -flto"
+      cc_command = "#{cc_command} -flto"
+      cxx_command = "#{cxx_command} -flto"
     end
     # Disable all warnings: http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#COMPILER_WARNINGS
-    cflags = "#{EXTRA_CFLAGS} -w"
+    cflags = "#{extra_cflags} -w"
     sh "mkdir -p #{LIBEV_OUTPUT_DIR}" if !File.directory?(LIBEV_OUTPUT_DIR)
     sh "cd #{LIBEV_OUTPUT_DIR} && sh #{LIBEV_SOURCE_DIR}configure " +
       "--disable-shared --enable-static " +
       # libev's configure script may select a different default compiler than we
       # do, so we force our compiler choice.
-      "CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}' orig_CFLAGS=1"
+      "CC='#{cc_command}' CXX='#{cxx_command}' CFLAGS='#{cflags}' orig_CFLAGS=1"
   end
 
   libev_sources = Dir["src/cxx_supportlib/vendor-modified/libev/{*.c,*.h}"]
@@ -144,35 +160,38 @@ if USE_VENDORED_LIBEV
   end
 
   task :clean => 'libev:clean'
-
-  def libev_libs
-    la_contents = File.open(LIBEV_OUTPUT_DIR + ".libs/libev.la", "r") do |f|
-      f.read
-    end
-    la_contents =~ /dependency_libs='(.+)'/
-    "#{LIBEV_OUTPUT_DIR}.libs/libev.a #{$1}".strip
-  end
 else
-  LIBEV_CFLAGS = string_option('LIBEV_CFLAGS', '-I/usr/include/libev')
   LIBEV_TARGET = nil
-  task :libev  # do nothing
 
-  def libev_libs
-    string_option('LIBEV_LIBS', '-lev')
+  let(:libev_cflags) do
+    result = string_option('LIBEV_CFLAGS', '-I/usr/include/libev')
+    # Apple Clang 4.2 complains about ambiguous member templates in ev++.h.
+    result << ' -Wno-ambiguous-member-template' if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
+    result
   end
-end
 
-# Apple Clang 4.2 complains about ambiguous member templates in ev++.h.
-LIBEV_CFLAGS << " -Wno-ambiguous-member-template" if PlatformInfo.compiler_supports_wno_ambiguous_member_template?
+  let(:libev_libs) { string_option('LIBEV_LIBS', '-lev') }
+
+  task :libev  # do nothing
+end
 
 
 ########## libuv ##########
 
 if USE_VENDORED_LIBUV
   LIBUV_SOURCE_DIR = File.expand_path("../src/cxx_supportlib/vendor-copy/libuv", File.dirname(__FILE__)) + "/"
-  LIBUV_CFLAGS = "-Isrc/cxx_supportlib/vendor-copy/libuv/include"
   LIBUV_TARGET = LIBUV_OUTPUT_DIR + ".libs/libuv.a"
 
+  let(:libuv_cflags) { '-Isrc/cxx_supportlib/vendor-copy/libuv/include' }
+
+  let(:libuv_libs) do
+    la_contents = File.open(LIBUV_OUTPUT_DIR + ".libs/libuv.la", "r") do |f|
+      f.read
+    end
+    la_contents =~ /dependency_libs='(.+)'/
+    "#{LIBUV_OUTPUT_DIR}.libs/libuv.a #{$1}".strip
+  end
+
   task :libuv => LIBUV_TARGET
 
   dependencies = [
@@ -180,15 +199,15 @@ if USE_VENDORED_LIBUV
     "src/cxx_supportlib/vendor-copy/libuv/Makefile.am"
   ]
   file LIBUV_OUTPUT_DIR + "Makefile" => dependencies do
-    cc = CC
-    cxx = CXX
+    cc_command = cc
+    cxx_command = cxx
     if OPTIMIZE && LTO
-      cc = "#{cc} -flto"
-      cxx = "#{cxx} -flto"
+      cc_command = "#{cc_command} -flto"
+      cxx_command = "#{cxx_command} -flto"
     end
     # Disable all warnings. The author has a clear standpoint on that:
     # http://pod.tst.eu/http://cvs.schmorp.de/libev/ev.pod#COMPILER_WARNINGS
-    cflags = "#{EXTRA_CFLAGS} -w"
+    cflags = "#{extra_cflags} -w"
     sh "mkdir -p #{LIBUV_OUTPUT_DIR}" if !File.directory?(LIBUV_OUTPUT_DIR)
     # Prevent 'make' from regenerating autotools files
     sh "cd #{LIBUV_SOURCE_DIR} && (touch aclocal.m4 configure Makefile.in || true)"
@@ -196,7 +215,7 @@ if USE_VENDORED_LIBUV
       "--disable-shared --enable-static " +
       # libuv's configure script may select a different default compiler than we
       # do, so we force our compiler choice.
-      "CC='#{cc}' CXX='#{cxx}' CFLAGS='#{cflags}'"
+      "CC='#{cc_command}' CXX='#{cxx_command}' CFLAGS='#{cflags}'"
   end
 
   libuv_sources = Dir["src/cxx_supportlib/vendor-copy/libuv/**/{*.c,*.h}"]
@@ -214,22 +233,13 @@ if USE_VENDORED_LIBUV
   end
 
   task :clean => 'libuv:clean'
-
-  def libuv_libs
-    la_contents = File.open(LIBUV_OUTPUT_DIR + ".libs/libuv.la", "r") do |f|
-      f.read
-    end
-    la_contents =~ /dependency_libs='(.+)'/
-    "#{LIBUV_OUTPUT_DIR}.libs/libuv.a #{$1}".strip
-  end
 else
-  LIBUV_CFLAGS = string_option('LIBUV_CFLAGS', '-I/usr/include/libuv')
   LIBUV_TARGET = nil
-  task :libuv  # do nothing
 
-  def libuv_libs
-    string_option('LIBUV_LIBS', '-luv')
-  end
+  let(:libuv_cflags) { string_option('LIBUV_CFLAGS', '-I/usr/include/libuv') }
+  let(:libuv_libs) { string_option('LIBUV_LIBS', '-luv') }
+
+  task :libuv  # do nothing
 end
 
 
@@ -254,10 +264,16 @@ end
 ##############################
 
 
-libboost_oxt_cflags = ""
-libboost_oxt_cflags << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
-libboost_oxt_cflags.strip!
-LIBBOOST_OXT, LIBBOOST_OXT_LINKARG =
-  define_libboost_oxt_task("common", COMMON_OUTPUT_DIR + "libboost_oxt", libboost_oxt_cflags)
+let(:libboost_oxt_cflags) do
+  result = []
+  result << PlatformInfo.adress_sanitizer_flag if USE_ASAN
+  result.join(' ')
+end
+
+LIBBOOST_OXT, LIBBOOST_OXT_LINKARG = define_libboost_oxt_task(
+  'common',
+  "#{COMMON_OUTPUT_DIR}libboost_oxt",
+  method(:libboost_oxt_cflags)
+)
 COMMON_LIBRARY.enable_optimizations!(LTO) if OPTIMIZE
-COMMON_LIBRARY.define_tasks(libboost_oxt_cflags)
+COMMON_LIBRARY.define_tasks(method(:libboost_oxt_cflags))

data/build/cxx_tests.rb

@@ -42,8 +42,6 @@ TEST_CXX_OBJECTS = {
   "#{TEST_OUTPUT_DIR}cxx/Core/SpawningKit/SmartSpawnerTest.o" =>
     "test/cxx/Core/SpawningKit/SmartSpawnerTest.cpp",
 
-  "#{TEST_OUTPUT_DIR}cxx/Core/UnionStationTest.o" =>
-    "test/cxx/Core/UnionStationTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/Core/ResponseCacheTest.o" =>
     "test/cxx/Core/ResponseCacheTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/Core/SecurityUpdateCheckerTest.o" =>
@@ -51,9 +49,6 @@ TEST_CXX_OBJECTS = {
   "#{TEST_OUTPUT_DIR}cxx/Core/ControllerTest.o" =>
     "test/cxx/Core/ControllerTest.cpp",
 
-  "#{TEST_OUTPUT_DIR}cxx/UstRouter/TransactionTest.o" =>
-    "test/cxx/UstRouter/TransactionTest.cpp",
-
   "#{TEST_OUTPUT_DIR}cxx/ServerKit/ChannelTest.o" =>
     "test/cxx/ServerKit/ChannelTest.cpp",
   "#{TEST_OUTPUT_DIR}cxx/ServerKit/FileBufferedChannelTest.o" =>
@@ -125,50 +120,44 @@ TEST_CXX_OBJECTS = {
     "test/cxx/Base64DecodingTest.cpp"
 }
 
-def basic_test_cxx_flags
-  @basic_test_cxx_flags ||= begin
-    flags = [
-      LIBEV_CFLAGS,
-      LIBUV_CFLAGS,
-      PlatformInfo.curl_flags,
-      TEST_COMMON_CFLAGS
-    ]
-    if USE_ASAN
-      flags << PlatformInfo.adress_sanitizer_flag
-    end
-    flags
+let(:basic_test_cxx_flags) do
+  flags = [
+    libev_cflags,
+    libuv_cflags,
+    PlatformInfo.curl_flags,
+    TEST_COMMON_CFLAGS
+  ]
+  if USE_ASAN
+    flags << PlatformInfo.adress_sanitizer_flag
   end
+  flags
 end
 
-def test_cxx_include_paths
-  @test_cxx_include_paths ||= [
-    "test/cxx",
-    "test/support",
-    "src/agent",
+let(:test_cxx_include_paths) do
+  [
+    'test/cxx',
+    'test/support',
+    'src/agent',
     *CXX_SUPPORTLIB_INCLUDE_PATHS
   ]
 end
 
-def test_cxx_flags
-  @test_cxx_flags ||= ["-include test/cxx/TestSupport.h"] +
-    basic_test_cxx_flags
+let(:test_cxx_flags) do
+  ['-include test/cxx/TestSupport.h'] + basic_test_cxx_flags
 end
 
-def test_cxx_ldflags
-  @test_cxx_ldflags ||= begin
-    result = "#{EXTRA_PRE_CXX_LDFLAGS} " <<
-      "#{TEST_COMMON_LIBRARY.link_objects_as_string} " <<
-      "#{TEST_BOOST_OXT_LIBRARY} #{libev_libs} #{libuv_libs} " <<
-      "#{PlatformInfo.curl_libs} " <<
-      "#{PlatformInfo.zlib_libs} " <<
-      "#{PlatformInfo.crypto_libs} " <<
-      "#{PlatformInfo.portability_cxx_ldflags}"
-    result << " #{PlatformInfo.dmalloc_ldflags}" if USE_DMALLOC
-    result << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
-    result << " #{EXTRA_CXX_LDFLAGS}"
-    result.strip!
-    result
-  end
+let(:test_cxx_ldflags) do
+  result = "#{EXTRA_PRE_CXX_LDFLAGS} " <<
+    "#{TEST_COMMON_LIBRARY.link_objects_as_string} " <<
+    "#{TEST_BOOST_OXT_LIBRARY} #{libev_libs} #{libuv_libs} " <<
+    "#{PlatformInfo.curl_libs} " <<
+    "#{PlatformInfo.zlib_libs} " <<
+    "#{PlatformInfo.crypto_libs} " <<
+    "#{PlatformInfo.portability_cxx_ldflags}"
+  result << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
+  result << " #{EXTRA_CXX_LDFLAGS}"
+  result.strip!
+  result
 end
 
 # Define compilation tasks for object files.
@@ -176,9 +165,11 @@ TEST_CXX_OBJECTS.each_pair do |object, source|
   define_cxx_object_compilation_task(
     object,
     source,
-    :include_paths => test_cxx_include_paths,
-    :flags => test_cxx_flags,
-    :deps => 'test/cxx/TestSupport.h.gch'
+    lambda { {
+      :include_paths => test_cxx_include_paths,
+      :flags => test_cxx_flags,
+      :deps => 'test/cxx/TestSupport.h.gch'
+    } }
   )
 end
 

data/build/integration_tests.rb

@@ -44,8 +44,7 @@ task 'test:integration:apache2' => dependencies do
     command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
   end
   if grep = string_option('E')
-    require 'shellwords'
-    command << " -e #{Shellwords.escape(grep)}"
+    command << " -e #{shesc grep}"
   end
   sh "cd test && exec #{command}"
 end
@@ -58,8 +57,7 @@ task 'test:integration:nginx' => dependencies do
     command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
   end
   if grep = string_option('E')
-    require 'shellwords'
-    command << " -e #{Shellwords.escape(grep)}"
+    command << " -e #{shesc grep}"
   end
   repeat = true
   while repeat
@@ -73,8 +71,7 @@ desc "Run Passenger Standalone integration tests"
 task 'test:integration:standalone' => dependencies do
   command = "bundle exec rspec -c -f s --tty integration_tests/standalone_tests.rb"
   if grep = string_option('E')
-    require 'shellwords'
-    command << " -e #{Shellwords.escape(grep)}"
+    command << " -e #{shesc grep}"
   end
   sh "cd test && exec #{command}"
 end
@@ -86,8 +83,7 @@ task 'test:integration:native_packaging' do
     command = "#{PlatformInfo.ruby_sudo_command} -E #{command}"
   end
   if grep = string_option('E')
-    require 'shellwords'
-    command << " -e #{Shellwords.escape(grep)}"
+    command << " -e #{shesc grep}"
   end
   case PlatformInfo.os_name_simple
   when "linux"
@@ -124,7 +120,6 @@ end
 dependencies = integration_test_dependencies(:_apache2)
 desc "Run the 'apache2' integration test infinitely, and abort if/when it fails"
 task 'test:restart' => dependencies do
-  require 'shellwords'
   color_code_start = "\e[33m\e[44m\e[1m"
   color_code_end = "\e[0m"
   i = 1
@@ -132,9 +127,14 @@ task 'test:restart' => dependencies do
     puts "#{color_code_start}Test run #{i} (press Ctrl-C multiple times to abort)#{color_code_end}"
     command = "bundle exec rspec -c -f s --tty integration_tests/apache2_tests.rb"
     if grep = string_option('E')
-      command << " -e #{Shellwords.escape(grep)}"
+      command << " -e #{shesc grep}"
     end
     sh "cd test && exec #{command}"
     i += 1
   end
 end
+
+desc "Run source packaging tests"
+task 'test:source_packaging' do
+  sh 'bundle exec rspec -f s -c test/integration_tests/source_packaging_test.rb'
+end

data/build/misc.rb

@@ -77,7 +77,7 @@ end
 desc "Convert the Changelog items for the latest release to HTML"
 task :changelog_as_html do
   require 'cgi'
-  contents, items = extract_latest_news_contents_and_items
+  _, items = extract_latest_news_contents_and_items
 
   puts "<ul>"
   items.each do |item|
@@ -109,7 +109,7 @@ end
 
 desc "Convert the Changelog items for the latest release to Markdown"
 task :changelog_as_markdown do
-  contents, items = extract_latest_news_contents_and_items
+  contents, _ = extract_latest_news_contents_and_items
 
   # Auto-link to issue tracker.
   contents.gsub!(/(bug #|issue #|GH-)(\d+)/i) do
@@ -176,16 +176,16 @@ task :compile_app => dependencies do
       :include_paths => CXX_SUPPORTLIB_INCLUDE_PATHS,
       :flags => [
         "-DSTANDALONE",
-        LIBEV_CFLAGS,
-        LIBUV_CFLAGS
+        libev_cflags,
+        libuv_cflags
       ]
     )
     create_cxx_executable(exe,
       object,
       :flags => [
         "-DSTANDALONE",
-        LIBEV_CFLAGS,
-        LIBUV_CFLAGS,
+        libev_cflags,
+        libuv_cflags,
         COMMON_LIBRARY.link_objects_as_string,
         LIBBOOST_OXT_LINKARG,
         libev_libs,

data/build/node_tests.rb

@@ -26,11 +26,10 @@
 
 desc "Run unit tests for the Node.js libraries"
 task 'test:node' do
-  require 'shellwords'
   command = "cd test && env NODE_PATH=#{PhusionPassenger.node_libdir} NODE_ENV=test " +
     "../node_modules/.bin/mocha -R spec node/*_spec.js"
   if grep = string_option('G')
-    command << " -g #{Shellwords.escape(grep)}"
+    command << " -g #{shesc grep}"
   end
   sh(command)
 end

data/build/oxt_tests.rb

@@ -38,11 +38,13 @@ TEST_OXT_OBJECTS.each_pair do |object, source|
   define_cxx_object_compilation_task(
     object,
     source,
-    :include_paths => [
-      "test/support",
-      *CXX_SUPPORTLIB_INCLUDE_PATHS
-    ],
-    :flags => TEST_COMMON_CFLAGS
+    lambda { {
+      :include_paths => [
+        "test/support",
+        *CXX_SUPPORTLIB_INCLUDE_PATHS
+      ],
+      :flags => TEST_COMMON_CFLAGS
+    } }
   )
 end