passenger 5.0.8 → 5.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDM2NTNjMzUzYmRhZmI2YzFmNTkyNTQ4OTQ0OWM3YjBhZTljYTVhYg==
+    ZTFhY2FmOWRiZWQ2ZjZkZmZjMTMzMjY1YTdmMjIyMTdjMjY5Njg5MA==
   data.tar.gz: !binary |-
-    ZjQ0NTUwNjQ1ZDNlZThlNzEwODUzOTJkOTM3N2QwNjQ5YTVlNjBhZQ==
+    NTU2MGZmMWFhZmE1ZWI1MDQ3MWU5NjBjMmE1MGEyNjNkMTBjYzllYQ==
 SHA512:
   metadata.gz: !binary |-
-    NzQwMjVkYmUyMDAyMTllYzYwNmRkNGJmZDE2ZmM0OGY1ZDVjMmE2Mjk2YTRh
-    NDNkODliZGM4NjQwNWY4OTYwNWFmNTVlMzczNWZkN2I3MzZmYjM1ODNkZmVh
-    ZDJlNDQzY2M0ODY1Mjk2Y2U5ZTZhNmU3MzI1ZWNiYTczZmM5OWE=
+    Mjg3NTEyMzgzYTU4Yjk3OGExMGYxZDkwZjlhODc0OGIyMjUxNDI1N2JiY2I5
+    MWE2ODM1OTRiMGQwZWU2MGE2MDg1MzVkM2RmOTUwNjUwOGNmYTAxNTZiODI0
+    M2FiM2RkNWUyYjRiZmU3MGYwODE1YjllNzlmOGU1YWNhNDFkODM=
   data.tar.gz: !binary |-
-    NGQ0OGNmYTAwMDI4MDg5YTQ3MzhhZTlkOGMwNmUyMzE4Y2UxNzFmMTY3NWQ4
-    NjExNGI4MzhhNjYyMDEzZjUwNmFhZTRmYjY5NmZmYWRjYzI0NTAzZWZhM2E1
-    NjliZTBiNmNkMWMwYmRlMzA4M2VkOTM0ZTNmNGVkZDk2MjFkOTE=
+    YWFmZjI1MzI3ZmRiZjgxMTZjYjFkZGE3NGUyYWZkYThiNmI4YjYyNTY5NWJl
+    NDYxMDRlNzU1NGQyNWZkN2JmNjVmNTc3ODBkNWMxOTE3YmJiYjNlNjA4ZTE1
+    Yzc0ZGJiOTQ0MzQ4ZTZiZTY4Yjg4YmU5MzYwYjIwOTQ3YTIwOWQ=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVXENEAAoJECrHRaUKISqM1yIH/3iiP55teXIQdypzsniSos6Q
-lDKqr0KDOAK1HRthLmc1xyTYPqzrHNqdJelH0Hj2SEw70aM5SSJ1miwTZPuwEThT
-kzwk4+rSAoeUumxr5kqW5BHrcGj5KD5lVXDpYZbwP+Ggz/UJpC0mZ0g4AxbB9//R
-azlnpXIjOcek1GmxvsTOsesFYX9DCKfHpC50Droc5biUtUm7x+GHzTwALazNyUkn
-chlYoAzrORXkt9N2m5l/D3qOtYKZ9MMc4ZWFGrziGgdrwiRg8lon/V4xjcKdF2JB
-tppn5PEczG5co6cJ69rrKFr88nH6xqnvipxjqiGRz5jou4OTBcy46F3YKYZi/CI=
-=A3tu
+iQEcBAABAgAGBQJVb0YJAAoJECrHRaUKISqMfcIIAIii/TpyNGySvg08YS36RVU5
+wJi6g3Y8UZ04Kjd9Ccdn8c1JXJbOR3JYY1Dl+8MP8ZIqBuIx0MnVXcj4Vn1RxFjj
+GSIBKpRtpiIpajeqsULfsHOOyc0sZqZJzISh6WFgYhAZC0x7gEJoB217PJd2YK2h
+PxegmOj2+2EGB86T9LhG9u8QIdoQgvydnnE4mNfnNBAKDMFrG9f86HqetlBy2PK5
+EqmV1nysqM4w8F/tLhiwB34/t4zUFVLsGfw1Ek+hHCyKmAMJRsBchrWF40ZJdlB0
+O7Tv52czrajhazEYsNajvj9HmN2eQL1Wv3H7Tm0pChB/TRweahmVAXYG40PBsR4=
+=QFWp
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJVXENEAAoJECrHRaUKISqMJu8H/j+UFpo8bgsMoBBAQmb9VFG8
-A6l0wsFtxEnd1pFNkI4+KFT4olD/rpksJAUUAt2s3yXhfreTP1lkjO/eCSX2PBBp
-DQc03J7XM05SHsoJ1Vo3HqWB0gIdZQ79xn0R0DAmlZQ2EubvqtskNUsb4Eu+0qIk
-/sjt8yKGt2Q+ZSxfxQGWaA85ZCIIfXQOR7ZZG0Da/v917WZ5vWEO64yOT31eAR7p
-KIUzyp8o/Cit5Z1+f7iX0IhhlUZJhcVgqXTm1dNuNyW8MOlRQU+N7nbT9Rk7Jhy5
-ST6vX+Ay0nqi65wU5IkXmLwJe1n+bJBXnocLigfb6tYjGfLElYtYlCbyl61PCSo=
-=gIJk
+iQEcBAABAgAGBQJVb0YJAAoJECrHRaUKISqMPRsIAIdmYwKUqKv0J9nS3gFUBBGa
+BPOS+uxmWtItdk3QfbxSlIZlCKehSB/tnn/L64fspxIx+cPUDh+h4A2/dKlSRl8z
+fhn1gOOBdaidK+pvMiqjHja3ssXwfD2S2zANWrBFU8zJgjx0/DvE/lqsb1JkOQRT
+Tukdj/vitrhySTaKvbOjE0lXljuAD+AFMI92yypBsiTXdb3Dg2VKd0NhcedI0+2m
+LSvCXKgP+/X6iqSRuIoLfWKzSdnoGeZqNDYwc8nm9TxbWAlpQ1DVS6vQgCsAztA2
+dDeJxWdS8V4pirjoddT/TpvEqrPRSjiS3uPRXwH4u2i/6uCl98xZ5t2v9q7+svQ=
+=1sKu
 -----END PGP SIGNATURE-----

data/.editorconfig

@@ -96,6 +96,26 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = false
 
+[ext/libuv/src/*.c]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false
+
+[ext/libuv/src/*.h]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false
+
+[ext/libuv/src/unix/*.c]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false
+
+[ext/libuv/src/unix/*.h]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = false
+
 [resources/templates/standalone/config.erb]
 indent_style = space
 indent_size = 4

data/CHANGELOG

@@ -1,3 +1,24 @@
+Release 5.0.9
+-------------
+
+ * The casing of original headers as generated by the application are now preserved, instead of being downcased. This fixes compatibility issues with broken HTTP clients. Closes GH-1436.
+ * Internal refactoring: we've replaced libeio with libuv. This makes some of our code simpler. Closes GH-1428.
+ * When the passenger-status tool tries to cleanup a stale instance directory, it will no longer abort with an error when it fails to do that. It will now merely print a warning. Fixes [StackOverflow question 30354732](http://stackoverflow.com/questions/30354732/cap-aborted-capistrano-aborts-rails-deploy-while-attempting-to-chown-tmp-p/30357100#30357100).
+ * Fixes compilation problems on Solaris.
+ * The Ruby handler has been made more robust. Previously, it was possible for applications to corrupt connections by returning incorrect Rack responses. This may cause connections to get stuck. The Rack handler has been hardened to ensure that connections will never get corrupted or stuck. Closes GH-1512.
+ * The Ruby handler now closes the Rack response body even when the socket connection is hijacked by the application. The Rack specification is unclear about what to do in this case, and different Ruby app servers do different things. We have found that by closing the body object anyway, we maximize compatibility with existing Rack middlewares and apps, such as Rack::Lock. Background information about this issue can be found at https://github.com/ngauthier/tubesock/issues/10#issuecomment-72539461.
+ * Fixes a crash that could occur if some HTTP request headers are present, but have the empty value. Closes GH-1524.
+ * Fixes a permission problem that prevents the web server from communicating with Passenger when user switching is off. Closes GH-1520.
+ * Fixes a few small one-time memory leaks in the Passenger agent. This wraps up the workitems discovered in valgrind runs on earlier versions.
+ * Fixes use of uninitialized metrics. This could happen for a brief moment after spawning.
+ * [Apache] If you pass the `--apxs2-path` parameter to `passenger-install-apache2-module`, and the apxs2 path that you specified is not in PATH, then the installer would think that Apache installation is broken. This has been fixed.
+ * [Apache] A `Connection: close` header that was used for internal communication between Passenger processes was being leaked to the client, which breaks HTTP keep-alive connections. This has been fixed. Closes GH-1516.
+ * [Nginx] The preferred Nginx version is now 1.8.0. It was previously 1.6.3.
+ * [Nginx] Passenger now passes to the application the raw URI as sent by the client, as long as Nginx didn't modify the URI (e.g. as part of rewrite rules). This means that escaped slashes (%2F) in the URI now work correctly and out-of-the-box as long as there are no applicable rewrite rules.
+ * [Nginx] Fixes that crash that would occur if Nginx is configured to log to syslog. And to prevent log messages from disappearing into a black hole, Passenger will now ask you to set `passenger_log_file` if Nginx is configured to log to syslog. Closes GH-1514.
+ * [Standalone] Prevents an existing instance from being shut down if starting a new instance fails.
+
+
 Release 5.0.8
 -------------
 

data/bin/passenger-install-apache2-module

@@ -39,7 +39,8 @@ PhusionPassenger.locate_directories
 # the 'sbin' folders to $PATH just in case. On some systems
 # 'sbin' isn't in $PATH unless the user is logged in as root from
 # the start (i.e. not via 'su' or 'sudo').
-ENV["PATH"] += ":/usr/sbin:/sbin:/usr/local/sbin"
+EXTRA_INSTALLER_PATHS = ":/usr/sbin:/sbin:/usr/local/sbin"
+ENV["PATH"] += EXTRA_INSTALLER_PATHS
 
 require 'optparse'
 require 'stringio'
@@ -231,6 +232,7 @@ private
         if Process.uid == 0
           render_template 'apache2/apache_install_broken',
             :apxs2 => PlatformInfo.apxs2,
+            :extra_paths => EXTRA_INSTALLER_PATHS,
             :sudo_s_e => PhusionPassenger::PlatformInfo.ruby_sudo_shell_command("-E"),
             :ruby => PhusionPassenger::PlatformInfo.ruby_command,
             :passenger_config => "#{PhusionPassenger.bin_dir}/passenger-config"

data/build/agents.rb

@@ -123,7 +123,9 @@ AGENT_OBJECTS.each_pair do |agent_object, agent_dependencies|
       "-o #{full_agent_object} " <<
       "#{EXTRA_PRE_CXXFLAGS} " <<
       "-Iext -Iext/common " <<
-      "#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
+      "#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBUV_CFLAGS} " <<
+      "#{PlatformInfo.curl_flags} " <<
+      "#{PlatformInfo.zlib_flags} " <<
       "#{EXTRA_CXXFLAGS}")
   end
 end
@@ -138,7 +140,7 @@ dependencies = agent_objects + [
   LIBBOOST_OXT,
   agent_libs.link_objects,
   LIBEV_TARGET,
-  LIBEIO_TARGET
+  LIBUV_TARGET
 ].flatten.compact
 file AGENT_OUTPUT_DIR + AGENT_EXE => dependencies do
   agent_objects_as_string = agent_objects.join(" ")
@@ -147,7 +149,7 @@ file AGENT_OUTPUT_DIR + AGENT_EXE => dependencies do
     "-o #{AGENT_OUTPUT_DIR}#{AGENT_EXE}.o " <<
     "#{EXTRA_PRE_CXXFLAGS} " <<
     "-Iext -Iext/common " <<
-    "#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
+    "#{AGENT_CFLAGS} #{LIBEV_CFLAGS} #{LIBUV_CFLAGS} " <<
     "#{PlatformInfo.curl_flags} " <<
     "#{PlatformInfo.zlib_flags} " <<
     "#{EXTRA_CXXFLAGS}")
@@ -157,8 +159,8 @@ file AGENT_OUTPUT_DIR + AGENT_EXE => dependencies do
     "#{agent_objects_as_string} " <<
     "#{LIBBOOST_OXT_LINKARG} " <<
     "#{EXTRA_PRE_CXX_LDFLAGS} " <<
-    "#{LIBEV_LIBS} " <<
-    "#{LIBEIO_LIBS} " <<
+    "#{libev_libs} " <<
+    "#{libuv_libs} " <<
     "#{PlatformInfo.curl_libs} " <<
     "#{PlatformInfo.zlib_libs} " <<
     "#{PlatformInfo.portability_cxx_ldflags} " <<

data/build/basics.rb

@@ -202,7 +202,7 @@ AGENT_OUTPUT_DIR          = string_option('AGENT_OUTPUT_DIR', OUTPUT_DIR + "supp
 COMMON_OUTPUT_DIR         = string_option('COMMON_OUTPUT_DIR', OUTPUT_DIR + "common") + "/"
 APACHE2_OUTPUT_DIR        = string_option('APACHE2_OUTPUT_DIR', OUTPUT_DIR + "apache2") + "/"
 LIBEV_OUTPUT_DIR          = string_option('LIBEV_OUTPUT_DIR', OUTPUT_DIR + "libev") + "/"
-LIBEIO_OUTPUT_DIR         = string_option('LIBEIO_OUTPUT_DIR', OUTPUT_DIR + "libeio") + "/"
+LIBUV_OUTPUT_DIR          = string_option('LIBUV_OUTPUT_DIR', OUTPUT_DIR + "libuv") + "/"
 ruby_extension_archdir    = PlatformInfo.ruby_extension_binary_compatibility_id
 RUBY_EXTENSION_OUTPUT_DIR = string_option('RUBY_EXTENSION_OUTPUT_DIR',
   OUTPUT_DIR + "ruby/" + ruby_extension_archdir) + "/"
@@ -211,5 +211,5 @@ PKG_DIR                   = string_option('PKG_DIR', "pkg")
 
 # Whether to use the vendored libev or the system one.
 USE_VENDORED_LIBEV = boolean_option("USE_VENDORED_LIBEV", true)
-# Whether to use the vendored libeio or the system one.
-USE_VENDORED_LIBEIO = boolean_option("USE_VENDORED_LIBEIO", true)
+# Whether to use the vendored libuv or the system one.
+USE_VENDORED_LIBUV  = boolean_option("USE_VENDORED_LIBUV", true)

data/build/common_library.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2015 Phusion
 #
@@ -98,8 +99,7 @@ end
 if USE_VENDORED_LIBEV
   LIBEV_SOURCE_DIR = File.expand_path("../ext/libev", File.dirname(__FILE__)) + "/"
   LIBEV_CFLAGS = "-Iext/libev"
-  LIBEV_LIBS = LIBEV_OUTPUT_DIR + ".libs/libev.a"
-  LIBEV_TARGET = LIBEV_LIBS
+  LIBEV_TARGET = LIBEV_OUTPUT_DIR + ".libs/libev.a"
 
   task :libev => LIBEV_TARGET
 
@@ -140,33 +140,42 @@ 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_LIBS   = string_option('LIBEV_LIBS', '-lev')
   LIBEV_TARGET = nil
   task :libev  # do nothing
+
+  def libev_libs
+    string_option('LIBEV_LIBS', '-lev')
+  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?
 
 
-########## libeio ##########
+########## libuv ##########
 
-if USE_VENDORED_LIBEIO
-  LIBEIO_SOURCE_DIR = File.expand_path("../ext/libeio", File.dirname(__FILE__)) + "/"
-  LIBEIO_CFLAGS = "-Iext/libeio"
-  LIBEIO_LIBS = LIBEIO_OUTPUT_DIR + ".libs/libeio.a"
-  LIBEIO_TARGET = LIBEIO_LIBS
+if USE_VENDORED_LIBUV
+  LIBUV_SOURCE_DIR = File.expand_path("../ext/libuv", File.dirname(__FILE__)) + "/"
+  LIBUV_CFLAGS = "-Iext/libuv/include"
+  LIBUV_TARGET = LIBUV_OUTPUT_DIR + ".libs/libuv.a"
 
-  task :libeio => LIBEIO_TARGET
+  task :libuv => LIBUV_TARGET
 
   dependencies = [
-    "ext/libeio/configure",
-    "ext/libeio/config.h.in",
-    "ext/libeio/Makefile.am"
+    "ext/libuv/configure",
+    "ext/libuv/Makefile.am"
   ]
-  file LIBEIO_OUTPUT_DIR + "Makefile" => dependencies do
+  file LIBUV_OUTPUT_DIR + "Makefile" => dependencies do
     cc = CC
     cxx = CXX
     if OPTIMIZE && LTO
@@ -176,34 +185,47 @@ if USE_VENDORED_LIBEIO
     # 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"
-    sh "mkdir -p #{LIBEIO_OUTPUT_DIR}" if !File.directory?(LIBEIO_OUTPUT_DIR)
-    sh "cd #{LIBEIO_OUTPUT_DIR} && sh #{LIBEIO_SOURCE_DIR}configure " +
+    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)"
+    sh "cd #{LIBUV_OUTPUT_DIR} && sh #{LIBUV_SOURCE_DIR}configure " +
       "--disable-shared --enable-static " +
-      # libeio's configure script may select a different default compiler than we
+      # 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}' CXX='#{cxx}' CFLAGS='#{cflags}' AM_V_CC= AM_V_CCLD="
   end
 
-  libeio_sources = Dir["ext/libeio/{*.c,*.h}"]
-  file LIBEIO_OUTPUT_DIR + ".libs/libeio.a" => [LIBEIO_OUTPUT_DIR + "Makefile"] + libeio_sources do
-    sh "rm -f #{LIBEIO_OUTPUT_DIR}/libeio.la"
-    sh "cd #{LIBEIO_OUTPUT_DIR} && make libeio.la"
+  libuv_sources = Dir["ext/libuv/**/{*.c,*.h}"]
+  file LIBUV_OUTPUT_DIR + ".libs/libuv.a" => [LIBUV_OUTPUT_DIR + "Makefile"] + libuv_sources do
+    sh "rm -f #{LIBUV_OUTPUT_DIR}/libuv.la"
+    sh "cd #{LIBUV_OUTPUT_DIR} && make -j2 libuv.la"
   end
 
-  task 'libeio:clean' do
+  task 'libuv:clean' do
     patterns = %w(Makefile config.h config.log config.status libtool
-      stamp-h1 *.o *.lo *.la .libs .deps)
+      stamp-h1 src test *.o *.lo *.la *.pc .libs .deps)
     patterns.each do |pattern|
-      sh "rm -rf #{LIBEIO_OUTPUT_DIR}#{pattern}"
+      sh "rm -rf #{LIBUV_OUTPUT_DIR}#{pattern}"
     end
   end
 
-  task :clean => 'libeio:clean'
+  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
-  LIBEIO_CFLAGS = string_option('LIBEIO_CFLAGS', '-I/usr/include/libeio')
-  LIBEIO_LIBS   = string_option('LIBEIO_LIBS', '-leio')
-  LIBEIO_TARGET = nil
-  task :libeio  # do nothing
+  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
 end
 
 

data/build/cxx_tests.rb

@@ -25,19 +25,26 @@
 
 TEST_CXX_CFLAGS = "-Iext -Iext/common " <<
   "#{EXTRA_PRE_CXXFLAGS} " <<
-  "#{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} #{PlatformInfo.curl_flags} -Itest/cxx -Itest/support " <<
+  "#{LIBEV_CFLAGS} #{LIBUV_CFLAGS} #{PlatformInfo.curl_flags} -Itest/cxx -Itest/support " <<
   "#{TEST_COMMON_CFLAGS}"
 TEST_CXX_CFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
-TEST_CXX_LDFLAGS = "#{EXTRA_PRE_CXX_LDFLAGS} " <<
-  "#{TEST_COMMON_LIBRARY.link_objects_as_string} " <<
-  "#{TEST_BOOST_OXT_LIBRARY} #{LIBEV_LIBS} #{LIBEIO_LIBS} " <<
-  "#{PlatformInfo.curl_libs} " <<
-  "#{PlatformInfo.zlib_libs} " <<
-  "#{PlatformInfo.portability_cxx_ldflags}"
-TEST_CXX_LDFLAGS << " #{PlatformInfo.dmalloc_ldflags}" if USE_DMALLOC
-TEST_CXX_LDFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
-TEST_CXX_LDFLAGS << " #{EXTRA_CXX_LDFLAGS}"
-TEST_CXX_LDFLAGS.strip!
+
+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.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
+end
+
 TEST_CXX_OBJECTS = {
   'test/cxx/CxxTestMain.o' => %w(
     test/cxx/CxxTestMain.cpp),
@@ -293,14 +300,14 @@ end
 dependencies = [
   TEST_CXX_OBJECTS.keys,
   LIBEV_TARGET,
-  LIBEIO_TARGET,
+  LIBUV_TARGET,
   TEST_BOOST_OXT_LIBRARY,
   TEST_COMMON_LIBRARY.link_objects,
   'ext/common/Constants.h'
 ].flatten.compact
 file 'test/cxx/CxxTestMain' => dependencies.flatten do
   objects = TEST_CXX_OBJECTS.keys.join(' ')
-  create_executable("test/cxx/CxxTestMain", objects, TEST_CXX_LDFLAGS)
+  create_executable("test/cxx/CxxTestMain", objects, test_cxx_ldflags)
 end
 
 deps = [

data/build/misc.rb

@@ -172,7 +172,7 @@ dependencies = [
   COMMON_LIBRARY.link_objects,
   LIBBOOST_OXT,
   LIBEV_TARGET,
-  LIBEIO_TARGET
+  LIBUV_TARGET
 ].flatten.compact
 task :compile_app => dependencies do
   source = ENV['SOURCE'] || ENV['FILE'] || ENV['F']
@@ -191,16 +191,16 @@ task :compile_app => dependencies do
   begin
     compile_cxx(source,
       "-DSTANDALONE -o #{object} " <<
-      "-Iext -Iext/common #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
+      "-Iext -Iext/common #{LIBEV_CFLAGS} #{LIBUV_CFLAGS} " <<
       "#{EXTRA_CXXFLAGS}")
     create_executable(exe, object,
       "-DSTANDALONE " <<
-      "-Iext -Iext/common #{LIBEV_CFLAGS} #{LIBEIO_CFLAGS} " <<
+      "-Iext -Iext/common #{LIBEV_CFLAGS} #{LIBUV_CFLAGS} " <<
       "#{EXTRA_CXXFLAGS} " <<
       "#{COMMON_LIBRARY.link_objects_as_string} " <<
       "#{LIBBOOST_OXT_LINKARG} " <<
-      "#{LIBEV_LIBS} " <<
-      "#{LIBEIO_LIBS} " <<
+      "#{libev_libs} " <<
+      "#{libuv_libs} " <<
       "#{PlatformInfo.portability_cxx_ldflags} " <<
       "#{EXTRA_CXX_LDFLAGS}")
   ensure

data/doc/Design and Architecture.html

@@ -1392,7 +1392,7 @@ The Watchdog reports successful startup back to the Phusion Passenger module tha
 </div>
 <div class="sect3">
 <span class="anchor_helper" id="_i_o_model"></span><h4 data-anchor="_i_o_model">3.1.3. I/O model</h4>
-<div class="paragraph"><p>The RequestHandler uses the <strong>evented I/O model</strong>. This means that the RequestHandler handles many clients (requests) at the same time, using a single thread, inside a single process. This is possible through the use of I/O event multiplexing mechanisms, which are provided by the OS. Examples of such mechanisms include the <span class="monospaced">select()</span>, <span class="monospaced">poll()</span>, <span class="monospaced">epoll()</span> and <span class="monospaced">kqueue()</span> system calls. But those mechanisms are very low-level and OS-specific, so the RequestHandler uses two libraries which abstract away the differences and provide a higher-level API: <a href="http://software.schmorp.de/pkg/libev.html">libev</a> and <a href="http://software.schmorp.de/pkg/libeio.html">libeio</a>.</p></div>
+<div class="paragraph"><p>The RequestHandler uses the <strong>evented I/O model</strong>. This means that the RequestHandler handles many clients (requests) at the same time, using a single thread, inside a single process. This is possible through the use of I/O event multiplexing mechanisms, which are provided by the OS. Examples of such mechanisms include the <span class="monospaced">select()</span>, <span class="monospaced">poll()</span>, <span class="monospaced">epoll()</span> and <span class="monospaced">kqueue()</span> system calls. But those mechanisms are very low-level and OS-specific, so the RequestHandler uses two libraries which abstract away the differences and provide a higher-level API: <a href="http://software.schmorp.de/pkg/libev.html">libev</a> and <a href="https://github.com/libuv/libuv">libuv</a>.</p></div>
 <div class="paragraph"><p>The evented I/O model is also used in Nginx. It is in contrast to the single-threaded multi-process model which handles 1 client per process (used by Apache with the prefork MPM), or the multi-threaded model which handles 1 client per thread (used by Apache with the worker MPM). You can learn more about evented I/O and the different I/O models through these resources:</p></div>
 <div class="ulist"><ul>
 <li>

data/doc/Design and Architecture.txt

@@ -193,7 +193,7 @@ If the ApplicationPool replied with an exception, the RequestHandler sends back
 
 ==== I/O model
 
-The RequestHandler uses the **evented I/O model**. This means that the RequestHandler handles many clients (requests) at the same time, using a single thread, inside a single process. This is possible through the use of I/O event multiplexing mechanisms, which are provided by the OS. Examples of such mechanisms include the `select()`, `poll()`, `epoll()` and `kqueue()` system calls. But those mechanisms are very low-level and OS-specific, so the RequestHandler uses two libraries which abstract away the differences and provide a higher-level API: link:http://software.schmorp.de/pkg/libev.html[libev] and link:http://software.schmorp.de/pkg/libeio.html[libeio].
+The RequestHandler uses the **evented I/O model**. This means that the RequestHandler handles many clients (requests) at the same time, using a single thread, inside a single process. This is possible through the use of I/O event multiplexing mechanisms, which are provided by the OS. Examples of such mechanisms include the `select()`, `poll()`, `epoll()` and `kqueue()` system calls. But those mechanisms are very low-level and OS-specific, so the RequestHandler uses two libraries which abstract away the differences and provide a higher-level API: link:http://software.schmorp.de/pkg/libev.html[libev] and link:https://github.com/libuv/libuv[libuv].
 
 The evented I/O model is also used in Nginx. It is in contrast to the single-threaded multi-process model which handles 1 client per process (used by Apache with the prefork MPM), or the multi-threaded model which handles 1 client per thread (used by Apache with the worker MPM). You can learn more about evented I/O and the different I/O models through these resources:
 

data/doc/Packaging.html

@@ -422,19 +422,19 @@ directory instead of downloaded.</p>
 
 <h1>Vendoring of libraries</h1>
 
-<p>Phusion Passenger vendors libev and libeio in order to make installation easier
+<p>Phusion Passenger vendors libev and libuv in order to make installation easier
 for users on operating systems without proper package management, like OS X.
 If you want Phusion Passenger to compile against the system-provided
-libev and/or libeio instead, then set the following environment variables
+libev and/or libuv instead, then set the following environment variables
 before compiling:</p>
 
 <ul>
 <li><code>export USE_VENDORED_LIBEV=no</code></li>
-<li><code>export USE_VENDORED_LIBEIO=no</code></li>
+<li><code>export USE_VENDORED_LIBUV=no</code></li>
 </ul>
 
 
-<p>Note that we require at least libev 4.11 and libeio 1.0.</p>
+<p>Note that we require at least libev 4.11 and libuv 1.4.2.</p>
 
 <h1>Generating gem and tarball</h1>