passenger 5.0.28 → 5.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c698d1382cfe98fb5a607ef84e68ce0caa75fa1b
-  data.tar.gz: e4b728278e254faec6603ef206719b32ae2db8f0
+  metadata.gz: de34a89bcd92faaf4c870691894fdc98545e933f
+  data.tar.gz: de6ab1650b829f01146d3851f85cc38f347b02f5
 SHA512:
-  metadata.gz: 5ff326aa15065063732a79ded35a994ac1c2e5524787812cb2b9b4d0807facc5be3939c1acafb74ef426c14f04be4428bdd862b412bc6cbd5ddd971cb180cc94
-  data.tar.gz: 08c040c914283ddf509805805f0df6b3daf67960b466a2c2e47e8bdd88495b5d300f3ed64c9180285f3591cabb3082a0f2ba115fba796b8defce4849527f1e9b
+  metadata.gz: fec73a5f401c95111c03dde4e99f2d393d2b340e82ced8e051c11862f8810ca8f9d6b5164701622d6e1e80655f58ac6859297dbff1089f0ae4a7c4a939bcfc35
+  data.tar.gz: 8aa0e543b0ef031f56ef902f67e6ac6b6e032cf057cac7c9562d21b095d70ad8c14194e278ff692acd5e62a3ae0904f65b1f050946ed0993854e14af1cf8d762

data/.editorconfig

@@ -48,6 +48,11 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true
 
+[*.cxxcodebuilder]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
 [config.ru]
 indent_style = space
 indent_size = 2

data/CHANGELOG

@@ -1,3 +1,16 @@
+Release 5.0.29
+--------------
+
+ * Fixes the FreeBSD build breaking due to the `-ldl` flag introduced by the LVE integration patch (5.0.28). Closes GH-1805.
+ * Fixes per-application interpreter override (ruby, node, python) being ignored in mass deployment mode. Closes GH-1818.
+ * Fixes incomplete refactor from 5.0.27 that could, under specific conditions, lead to a Passenger crash. Closes GH-1794.
+ * [Apache] Remove unused code that caused a crash in configurations with thousands of VirtualHost entries. Closes GH-1676.
+ * [Nginx] Fixes use of invalid logfile name (memory already released) in backup log redirection code. Possibly related to GH-1774.
+ * [Nginx] The preferred Nginx version is now 1.10.1 (previously 1.10.0).
+ * [Nginx] The preferred PCRE version is now 8.39 (previously 8.34).
+ * [Standalone] Passenger Standalone now supports /dev/stdout and /dev/stderr as log file path (via `--log-file` or Passengerfile.json). This is especially useful in Docker containers. In previous versions logging to those paths did not work, resulting in nothing getting logged at all.
+
+
 Release 5.0.28
 --------------
 

data/build/apache2.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -128,11 +128,11 @@ end
 
 def create_apache2_auto_generated_source_task(source)
   dependencies = [
-    "#{source}.erb",
+    "#{source}.cxxcodebuilder",
     'src/ruby_supportlib/phusion_passenger/apache2/config_options.rb'
   ]
   file(source => dependencies) do
-    template = TemplateRenderer.new("#{source}.erb")
+    template = CxxCodeTemplateRenderer.new("#{source}.cxxcodebuilder")
     template.render_to(source)
   end
 end

data/build/common_library.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -241,12 +241,12 @@ end
 # If you add a new shared definition file, don't forget to update
 # src/ruby_supportlib/phusion_passenger/packaging.rb!
 
-dependencies = ['src/cxx_supportlib/Constants.h.erb',
+dependencies = ['src/cxx_supportlib/Constants.h.cxxcodebuilder',
   'src/ruby_supportlib/phusion_passenger.rb',
   'src/ruby_supportlib/phusion_passenger/constants.rb']
 file 'src/cxx_supportlib/Constants.h' => dependencies do
   PhusionPassenger.require_passenger_lib 'constants'
-  template = TemplateRenderer.new('src/cxx_supportlib/Constants.h.erb')
+  template = CxxCodeTemplateRenderer.new('src/cxx_supportlib/Constants.h.cxxcodebuilder')
   template.render_to('src/cxx_supportlib/Constants.h')
 end
 

data/build/nginx.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -27,7 +27,7 @@ auto_generated_sources = %w(
   src/nginx_module/CreateLocationConfig.c
   src/nginx_module/MergeLocationConfig.c
   src/nginx_module/CacheLocationConfig.c
-  src/nginx_module/ConfigurationFields.h
+  src/nginx_module/LocationConfig.h
 )
 
 desc "Build Nginx support files"
@@ -70,11 +70,11 @@ end
 
 def create_nginx_auto_generated_source_task(source)
   dependencies = [
-    "#{source}.erb",
+    "#{source}.cxxcodebuilder",
     'src/ruby_supportlib/phusion_passenger/nginx/config_options.rb'
   ]
   file(source => dependencies) do
-    template = TemplateRenderer.new("#{source}.erb")
+    template = CxxCodeTemplateRenderer.new("#{source}.cxxcodebuilder")
     template.render_to(source)
   end
 end

data/build/packaging.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2015 Phusion Holding B.V.
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 #  "Passenger", "Phusion Passenger" and "Union Station" are registered
 #  trademarks of Phusion Holding B.V.
@@ -206,7 +206,7 @@ task 'package:release' => ['package:set_official', 'package:gem', 'package:tarba
           puts "HOMEBREW_DRY_RUN set, not submitting pull request. Please find the repo in /tmp/homebrew."
         else
           puts "Submitting Homebrew pull request..."
-          sh "cd #{homebrew_dir} && hub pull-request 'Update passenger to version #{version}' -b Homebrew:master"
+          sh "cd #{homebrew_dir} && hub pull-request -m 'passenger #{version}' -b Homebrew:master"
         end
       end
 
@@ -332,12 +332,13 @@ task 'package:update_homebrew' do
   sha256 = File.open("#{PKG_DIR}/passenger-#{version}.tar.gz", "rb") do |f|
     Digest::SHA256.hexdigest(f.read)
   end
-  sh "rm -rf #{homebrew_dir}"
-  sh "git clone git@github.com:phusion/homebrew.git #{homebrew_dir}"
-  sh "cd #{homebrew_dir} && git remote add Homebrew https://github.com/Homebrew/homebrew.git"
+  if !File.exist?(homebrew_dir)
+    sh "git clone git@github.com:phusion/homebrew-core.git #{homebrew_dir}"
+    sh "cd #{homebrew_dir} && git remote add Homebrew https://github.com/Homebrew/homebrew-core.git"
+  end
   sh "cd #{homebrew_dir} && git fetch Homebrew"
   sh "cd #{homebrew_dir} && git reset --hard Homebrew/master"
-  formula = File.read("/tmp/homebrew/Library/Formula/passenger.rb")
+  formula = File.read("/tmp/homebrew/Formula/passenger.rb")
   formula.gsub!(/passenger-.+?\.tar\.gz/, "passenger-#{version}.tar.gz") ||
     abort("Unable to substitute Homebrew formula tarball filename")
   formula.gsub!(/^  sha256 .*/, "  sha256 \"#{sha256}\"") ||
@@ -348,13 +349,13 @@ task 'package:update_homebrew' do
   necessary_dirs_str = word_wrap(necessary_dirs.inspect).split("\n").join("\n      ")
   formula.sub!(/necessary_files = .*?\]/m, "necessary_files = Dir#{necessary_dirs_str}") ||
     abort("Unable to substitute file whitelist")
-  File.open("/tmp/homebrew/Library/Formula/passenger.rb", "w") do |f|
+  File.open("/tmp/homebrew/Formula/passenger.rb", "w") do |f|
     f.write(formula)
   end
   sh "cd #{homebrew_dir} && git commit -a -m 'passenger #{version}'"
   sh "cd #{homebrew_dir} && git push -f"
   if boolean_option('HOMEBREW_TEST', true)
-    sh "cp /tmp/homebrew/Library/Formula/passenger.rb /usr/local/Library/Formula/passenger.rb"
+    sh "cp /tmp/homebrew/Formula/passenger.rb /usr/local/Library/Formula/passenger.rb"
     if `brew info passenger` !~ /^Not installed$/
       sh "brew uninstall passenger"
     end

data/build/support/cxx_dependency_map.rb

@@ -6237,7 +6237,9 @@ CXX_DEPENDENCY_MAP =
  "src/cxx_supportlib/MemoryKit/mbuf.cpp"=>
   ["src/cxx_supportlib/Logging.h",
    "src/cxx_supportlib/MemoryKit/mbuf.h",
+   "src/cxx_supportlib/StaticString.h",
    "src/cxx_supportlib/Utils/FastStringStream.h",
+   "src/cxx_supportlib/Utils/StrIntUtils.h",
    "src/cxx_supportlib/oxt/backtrace.hpp",
    "src/cxx_supportlib/oxt/detail/../spin_lock.hpp",
    "src/cxx_supportlib/oxt/detail/backtrace_disabled.hpp",
@@ -7406,16 +7408,14 @@ CXX_DEPENDENCY_MAP =
    "src/nginx_module/CacheLocationConfig.c",
    "src/nginx_module/Configuration.h",
    "src/nginx_module/ConfigurationCommands.c",
-   "src/nginx_module/ConfigurationFields.h",
    "src/nginx_module/ContentHandler.h",
    "src/nginx_module/CreateLocationConfig.c",
+   "src/nginx_module/LocationConfig.h",
    "src/nginx_module/MergeLocationConfig.c"],
  "src/nginx_module/Configuration.h"=>
-  ["src/nginx_module/ConfigurationFields.h"],
+  ["src/nginx_module/LocationConfig.h"],
  "src/nginx_module/ConfigurationCommands.c"=>
   [],
- "src/nginx_module/ConfigurationFields.h"=>
-  [],
  "src/nginx_module/ContentHandler.c"=>
   ["src/cxx_supportlib/AppTypes.h",
    "src/cxx_supportlib/Constants.h",
@@ -7442,8 +7442,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/thread.hpp",
    "src/cxx_supportlib/oxt/tracable_exception.hpp",
    "src/nginx_module/Configuration.h",
-   "src/nginx_module/ConfigurationFields.h",
    "src/nginx_module/ContentHandler.h",
+   "src/nginx_module/LocationConfig.h",
    "src/nginx_module/StaticContentHandler.h"],
  "src/nginx_module/ContentHandler.h"=>
   ["src/cxx_supportlib/AppTypes.h",
@@ -7471,6 +7471,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/tracable_exception.hpp"],
  "src/nginx_module/CreateLocationConfig.c"=>
   [],
+ "src/nginx_module/LocationConfig.h"=>
+  [],
  "src/nginx_module/MergeLocationConfig.c"=>
   [],
  "src/nginx_module/StaticContentHandler.c"=>
@@ -7503,8 +7505,8 @@ CXX_DEPENDENCY_MAP =
    "src/cxx_supportlib/oxt/thread.hpp",
    "src/cxx_supportlib/oxt/tracable_exception.hpp",
    "src/nginx_module/Configuration.h",
-   "src/nginx_module/ConfigurationFields.h",
-   "src/nginx_module/ContentHandler.h"],
+   "src/nginx_module/ContentHandler.h",
+   "src/nginx_module/LocationConfig.h"],
  "src/nginx_module/ngx_http_passenger_module.h"=>
   ["src/cxx_supportlib/AppTypes.h",
    "src/cxx_supportlib/Constants.h",

data/build/support/general.rb

@@ -48,6 +48,37 @@ class TemplateRenderer
   end
 end
 
+class CxxCodeTemplateRenderer
+  def initialize(filename)
+    if !defined?(CxxCodeBuilder)
+      require 'build/support/vendor/cxxcodebuilder/lib/cxxcodebuilder'
+    end
+    code = File.open(filename, 'rb') do |f|
+      f.read
+    end
+    @builder = CxxCodeBuilder::Builder.new
+    @builder.instance_eval(code, filename)
+  end
+
+  def render
+    @builder.to_s
+  end
+
+  def render_to(filename)
+    puts "Creating #{filename}"
+    text = render
+    # When packaging, some timestamps may be modified. The user may not
+    # have write access to the source root (for example, when Passenger
+    # Standalone is compiling its runtime), so we only write to the file
+    # when necessary.
+    if !File.exist?(filename) || File.writable?(filename) || File.read(filename) != text
+      File.open(filename, 'w') do |f|
+        f.write(text)
+      end
+    end
+  end
+end
+
 class Pathname
   if !method_defined?(:/)
     def /(other)
@@ -94,6 +125,14 @@ def maybe_wrap_in_ccache(command)
   end
 end
 
+def copyright_header_for(filename)
+  contents = File.open(filename, 'rb') do |f|
+    f.read
+  end
+  contents =~ /\A(#.+?)\n\n/m
+  $1.gsub(/^# */, '')
+end
+
 def ensure_target_directory_exists(target)
   dir = File.dirname(target)
   if !File.exist?(dir)

data/build/support/vendor/cxxcodebuilder/CxxCodeBuilder.sublime-project

@@ -0,0 +1,8 @@
+{
+	"folders":
+	[
+		{
+			"path": "."
+		}
+	]
+}

data/build/support/vendor/cxxcodebuilder/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org/'
+
+gem 'rake'
+gem 'rspec'

data/build/support/vendor/cxxcodebuilder/Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    rake (11.1.2)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rspec
+
+BUNDLED WITH
+   1.11.2

data/build/support/vendor/cxxcodebuilder/LICENSE.md

@@ -0,0 +1,19 @@
+Copyright (c) 2016 Phusion Holding B.V.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/build/support/vendor/cxxcodebuilder/README.md

@@ -0,0 +1,98 @@
+# cxxcodebuilder: generate C/C++ code with a Builder-style DSL
+
+Cxxcodebuilder gives you a simple Ruby API for programmatically outputting C/C++ code with proper indenting and formatting. Code using this API is much more readable than code building raw strings. Cxxcodebuilder is similar to [Jbuilder](https://github.com/rails/jbuilder), which is for outputting JSON.
+
+## Use cases
+
+This library is useful in build systems for automatically generating C/C++ code. It is much cleaner compared to using ERB or other generic text templating systems for the job.
+
+## Example
+
+Suppose that you want to write the following piece of code:
+
+~~~c++
+#include <stdio.h>
+
+static int limit = 0;
+static int magicNumbers[] = [1, 2, 3];
+static Foo foos[] = [
+    { "hello", 1 },
+    { "world", 2 }
+];
+
+/*
+ * This is an awesome model
+ * for a futuristic car.
+ */
+struct Car {
+    unsigned int seats;
+};
+
+static int
+modifyLimit(int diff) {
+    int oldLimit = limit;
+    limit += diff;
+    printf("The new limit is: %s\n", limit);
+    return oldLimit;
+}
+~~~
+
+Use Cxxcodebuilder as follows:
+
+~~~ruby
+require 'cxxcodebuilder'
+
+builder = CxxCodeBuilder::Builder.new do
+  include '<stdio.h>'
+
+  separator
+
+  field 'static int limit', 0
+
+  field 'static int magicNumbers[]' do
+    array_initializer do
+      element 1
+      element 2
+      element 3
+    end
+  end
+
+  field 'static Foo foo[]' do
+    array_initializer do
+      struct_element do
+        string_element 'hello'
+        element 1
+      end
+      struct_element do
+        string_element 'world'
+        element 2
+      end
+    end
+  end
+
+  separator
+
+  comment %q{
+    This is an awesome model
+    for a futuristic car.
+  }
+  struct 'Car' do
+    field 'unsigned int seats'
+  end
+
+  separator
+
+  function('static int modifyLimit(int diff)', %q{
+    int oldLimit = limit;
+    limit += diff;
+    printf("The new limit is: %s\n", limit);
+    return oldLimit;
+  })
+end
+
+puts(builder)
+~~~
+
+## API
+
+See the comments in lib/cxxcodebuilder/builder.rb for the full API.

data/build/support/vendor/cxxcodebuilder/Rakefile

@@ -0,0 +1,4 @@
+desc "Run test suite"
+task :test do
+  sh "bundle exec rspec spec/*_spec.rb"
+end