passenger 4.0.44 → 4.0.45

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjE0MmI0OTJkOTRiYTA1NDYyNmJmNjM2NzFlOTMxZTBmM2QxYzU3ZA==
+    OTQxZWYyOGY1YmIzMDg1MjllZTY3YzNkZmE0ZWIwZTE2NWI5MjdjZg==
   data.tar.gz: !binary |-
-    YzUzNGUzNDNjMDQ4YmM5YWEyNDIxZmU0MGZhODA0MTI0YzA3M2I5MA==
+    ODI1MDFmYzg5YWQyMjU4MzQ4MmU3MmJjNzM4MTAzN2M4OTY0M2I0MQ==
 SHA512:
   metadata.gz: !binary |-
-    NTExZDgyNzE2OGQxMDVhNWY4Yzc1NGQ0NjRhMTllOTRhYWQ0NjY4ZjIxMDI3
-    ZjAyZDE0MzgwNmQzN2IwMDU5OTdkNzcwN2Y0ZDc2ZGFhZTM1YTkwOTBlZjZl
-    NjFjMTIxM2U5MWMzMWM2Y2ViZjIyNDY3ODkwY2MzMTNjMGZmYTU=
+    MjM2MDgyNzQyNDg1Yjg2MmIyMjcwMWY4MDFkYzliM2VmMTgwMmY5MGJmYmI4
+    YjdjYjMwMDI4N2ZkMDk4ZDM1YzQ3ZTNjZmVjZWJjMTdkMjg2OWFhYmM1YzU4
+    NzllOWU2ZGQzMDhkNDM2N2EyZDc3MzQ0ZDQ3ZTNkOGFmMDcwNjk=
   data.tar.gz: !binary |-
-    ZDE2NzdlOGQyZGY5NjE5ZmEyMGY0OTQ2OGRjZDllMDNlZjQ4MzMwMzEyY2Rh
-    ODI4ODFlNTNhNDYzYzZkODI5Yjc1ZTdjNzA2MDAxZWYyMzE2ZGZkOTk1M2Y2
-    OTFmZDQ0NzFmMzMzNWQwNjdkNWFhNjlkMjE3MTMyNWY3ODA1ZjU=
+    ZmJhNjExZTdmOTMwM2IyY2FjMjI5M2RkZWE5YjMxNmUxY2VjYWQ4MmY2ZDNj
+    ZTdlNjVhN2RhYTU1NGNhZmY2YjU0NTVhNTNiNzkzYTBmNzgxNTI1ZTcyMGZk
+    MjA1MzE0Mzk5NDQ3Y2EzMjE3N2I1ZDk3ZmU3ZDUwNGI2M2YxODY=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJThyRmAAoJECrHRaUKISqMHS4H/2z5ltAxui7WJ5E/13DDIR2T
-BLxFDixTzjGIgyA6WONunPQJQsR4JG7dIyUGm5cZAo0AlmJ8ptuClIVv3Q9JCP2g
-YQeaYR2bc0ahrjxzOnCdysA/PKHlkQMDAdmKvPGE+qN8CJBwk1/jTtW/CYrG0Zi5
-xDVvww0z1DnhQlKPRyu8a9R3r4ZTZdixZmbZneE0NGlRFcQbQPWlmp0Q0gh3TsYY
-rkvYEQxhQWsjUf0g7Id0tLxpnh7N/go6vWnC6EAXWVJe+T0V4U98vBk8sG/84A64
-O/4nbys5SiNGo2ampAgXn2Ol6r3jblJ9nhVXuU4YLMksKOGOif0WxOsMGEvlVAw=
-=+CYd
+iQEcBAABAgAGBQJTmYzGAAoJECrHRaUKISqMhFYH/R98G3A4TabyzULioj4MnFL2
+exwefHsSLPT5GkpqHn9JEGA0FkX9R+cQhYtaMiiy63Y3w6cCzC+GnCiMlhWwLd9k
+jDUo2PdC+nuWP7DxUSrUtikHsBMY9Dw+xWAGTyjF/gahINKL72nRyMgVhLzxYXlj
+M74M8SPFFfFW8Ajy+/WF/Q68kx/1oGGeOETgJGjwEi4gI+bE129oErsTe3Ia2TO5
+yesWCGeR+AE2DnrLkUVoxAih7uZkL9bVT8exG5YytP70uo21CjwDkxJKv0P8cZn6
+rXjmCEgxh4dAfvqLz5TBK1Fc3JMQcgnXXq4QOVNXgL7Mq0jlKtz+ubYxaZJo5/M=
+=rQKT
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJThyRmAAoJECrHRaUKISqM2Q0H/1T5KZVf5LIddFcIOCSRo6ww
-FmLU9oQ3zJVtWwn8BFItGOzF1UXd5e4Lnlrf0Jje6YovQagiTzkAeR8R3sALQEmC
-MZux3X80nW4IalyNiM6DBVEIebh0h/MGAbAsr0NrxfcKtBNqdW1oZpP3xQhpGdyd
-CFIPQOeU3RCSTjZqK2aeTXZDYzVoJ7eDuM47+nHQLItfsUGJxkVEcZsIv1wmvqk5
-FGpUQD03NY58QjpevoTVvM9DE0JS5SMp+iNup2FpjhLimBtG6hENY9dMmYHRCgBj
-R1R8ZpbdOvNeiqaHFR03K1xtIE9aAeDjWefFzDk1D7ySVAqCMD6mbL8BiIVTsUA=
-=SFYQ
+iQEcBAABAgAGBQJTmYzGAAoJECrHRaUKISqMlvsH/3KowVMQS+UI3bAP2Os6mhKW
+p3N73sotyHBtWmsYyWsgp2H9JnzEIf2Z7eNhh9VLVAXSrSBSLNEUVa5JmqHGI6eb
+5f2NrHE0DawKYznK4DEtRSqH2P6iUAsP+XCGnpwoZBP0LaJzCdOPFcfUrWqlHo0z
+aOrJzsh/KS2Jr0694elf+uMmn3AKnqbPU4neGliOIeiSHM2LO36WSaBOZiagiWXK
+Eti3XYSmClE8tFOUmjdVfHJAom0UrBCTFUI6UhBPFuyq1bdUcbNcnKT9hKClphjL
+jYpx3G1iCuacbCMbF93LHxN3wh4U0f0hkW41Sirz/P7ItT4Ieet3hOg95OZkiv8=
+=Y+ZE
 -----END PGP SIGNATURE-----

data/.travis.yml

@@ -10,3 +10,6 @@ env:
   - TEST_SOURCE_PACKAGING=1 TEST_DEBIAN_PACKAGING=1
 
 script: ./dev/run_travis.sh
+
+notifications:
+  slack: phusionnl:PH5p7JYXyv2XLDpICHh8Nj6F

data/CHANGELOG

@@ -1,3 +1,34 @@
+Release 4.0.45
+--------------
+
+ * Major improvements in Node.js and Meteor compatibility. Older Phusion Passenger
+   versions implemented Node.js support by emulating Node.js' HTTP library.
+   This approach was found to be unsustainable, so we've abandoned that approach
+   and replaced it with a much simpler approach that does not involve emulating
+   the HTTP library.
+ * Introduced support for sticky sessions. Sticky sessions are useful -- or even
+   required -- for apps that store state inside process memory. Prominent examples
+   include SockJS, Socket.io, faye-websocket and Meteor. Sticky sessions are
+   required to make the aforementioned examples work in multi-process scenarios.
+   By introducing sticky sessions support, we've much improved WebSocket support
+   and support for the aforementioned libraries and frameworks.
+ * Due to user demand, GET requests with request bodies are once again supported.
+   Support for these kinds of requests was removed in 4.0.42 in an attempt to
+   increase the strictness and robustness of our request handling code. It has
+   been determined that GET requests with request bodies can be adequately
+   supported without degrading robustness in Phusion Passenger. However, GET
+   requests with both request bodies and WebSocket upgrade headers are
+   unsupported. Fixes issue #1092.
+ * [Enterprise] The [Flying Passenger](http://www.modrails.com/documentation/Users%20guide%20Apache.html#flying_passenger)
+   feature is now also available on Apache.
+ * Fixed some issues with RVM mixed mode support, issue #1121.
+ * Fixed Passenger Standalone complaining about not finding PassengerHelperAgent
+   during startup.
+ * Fixed various minor issues such as #1190 and #1197.
+ * The download timeout for passenger-install-nginx-module has been increased.
+   Patch by 亀田 義裕.
+
+
 Release 4.0.44
 --------------
 

data/CONTRIBUTING.md

@@ -1,17 +1,35 @@
-# Contributing to Phusion Passenger
+# Contributors Guide
+
+**Table of contents**
+
+ * [Filing bug reports](#file_bugs)
+ * [Contributing documentation](#contrib_docs)
+ * [Contributing by bug triaging](#contrib_triag)
+ * [Contributing community support](#contrib_support)
+ * [Contributing code](#contrib_code)
+   * [Developer QuickStart](#dev_quickstart)
+   * [Design and Architecture](#design_and_architecture)
+   * [Compilation and build system](#build_system)
+   * [Running the unit tests](#unit_tests)
+   * [Directory structure](#dir_structure)
+   * [C++ coding style](#cxx_coding_style)
+   * [Ruby coding style](#ruby_coding_style)
+   * [Systems programming fundamentals](#systems_programming_fundamentals)
+   * [Further reading](#further_reading)
 
 Thank you for your interest in Phusion Passenger. Phusion Passenger is open source so your contributions are very welcome. Although we also provide a [commercial version](https://www.phusionpassenger.com/enterprise) and [commercial support](https://www.phusionpassenger.com/commercial_support), the core remains open source and we remain committed to keep it that way. This guide gives you an overview of the ways with which you can contribute, as well as contribution guidelines.
 
 You can contribute in one of the following areas:
 
- * Documentation (user documentation, developer documentation, contributor documentation).
+ * Filing bugs.
  * Bug triage.
+ * Documentation (user documentation, developer documentation, contributor documentation).
  * Community support.
  * Code.
 
 We require contributors to sign our [contributor agreement](http://www.phusion.nl/forms/contributor_agreement) before we can merge their patches.
 
-Please submit patches in the form of a Github pull request or as a patch on the [bug tracker](http://code.google.com/p/phusion-passenger/issues/list). Pull requests are preferred and generally get more attention because Github has better email notifications and better discussion capabilities.
+Please submit patches in the form of a Github pull request or as a patch on the [bug tracker](https://github.com/phusion/passenger/issues). Pull requests are preferred and generally get more attention because Github has better email notifications and better discussion capabilities.
 
 You should also install required developer tools. The following command will install everything you need:
 
@@ -21,15 +39,27 @@ If your system requires gems to be installed with root privileges, run:
 
     rake test:install_deps SUDO=1
 
+<a name="file_bugs"></a>
+## Filing bug reports
+
+When filing a bug report, please ensure that you include the following information:
+
+ * What steps will reproduce the problem?
+ * What is the expected output? What do you see instead?
+ * What version of Phusion Passenger are you using?
+ * Which version of Ruby, Rails, Node.js or Meteor are you using? On what operating system?
+
+<a name="contrib_docs"></a>
 ## Contributing documentation
 
 All good software should have good documentation, and we take this very seriously. However writing and maintaing quality documentation is not an easy task. If you are not skilled in C++ or programming, then writing documentation is the easiest way to contribute.
 
 Most documentation can be located in the `doc` directory, and are either written in Markdown or in Asciidoc format. They can be compiled to HTML with `rake doc`. You need [Mizuho](https://github.com/FooBarWidget/mizuho) to compile Asciidoc and [BlueCloth](http://deveiate.org/projects/BlueCloth) to compile Markdown. Both gems are automatically installed as part of the Phusion Passenger developer tools.
 
+<a name="contrib_tiag"></a>
 ## Contributing by bug triaging
 
-Users [fill bug reports](http://code.google.com/p/phusion-passenger/issues/list) on a regular basis, but not all bug reports are legit, not all bug reports are equally important, etc. By helping with bug triaging you make the lives of the core developers a lot easier.
+Users [file bug reports](https://github.com/phusion/passenger/issues) on a regular basis, but not all bug reports are legit,contain sufficient information, are equally important, etc. By helping with bug triaging you make the lives of the core developers a lot easier.
 
 To start contributing, please submit a comment on any bug report that needs triaging. This comment should contain triaging instructions, e.g. whether a report should be considered duplicate. If you contribute regularly we'll give you moderator access to the bug tracker so that you can apply triaging labels directly.
 
@@ -43,19 +73,31 @@ Here are some of the things that you should look for:
 
 **Always be polite to bug reporters.** Not all reporters are fluent in English, and not everybody may be tech-savvy. But we ask you for your patience and tolerance on this. We want to stimulate a positive and ejoyable environment.
 
+<a name="contrib_support"></a>
 ## Contributing community support
 
 You can contribute by answering support questions on the [community discussion forum](http://groups.google.com/group/phusion-passenger) or on [Stack Overflow](http://stackoverflow.com/search?q=passenger).
 
+<a name="contrib_code"></a>
 ## Contributing code
 
-Phusion Passenger is mostly written in C++, but the build system and various small helper scripts are in Ruby. The loaders for each supported language is written in the respective language.
+Phusion Passenger is mostly written in C++, but the build system and various small helper scripts are in Ruby. The loaders for each supported language is written in the respective language. The source code is filled with inline comments, so look there if you want to understand how things work.
+
+<a name="dev_quickstart"></a>
+### Developer QuickStart
+
+<a href="https://vimeo.com/phusionnl/review/97427161/15cb4cc59a"><img src="http://blog.phusion.nl/wp-content/uploads/2014/06/passenger_developer_quickstart.png"></a>
 
-The source code is filled with inline comments, so look there if you want to understand how things work. We also have dedicated documents on some topics and for some subsystems. Some interesting documents are:
+_Watch the Developer QuickStart screencast_
 
- * ext/common/ApplicationPool2/README.md - If you're interesting in the ApplicationPool and Spawner subsystems.
- * doc/DebuggingAndStressTesting.md
+We provide an easy and convenient development environment that contributors can use. Learn more at the [Developer QuickStart](https://github.com/phusion/passenger/blob/master/doc/DeveloperQuickstart.md).
 
+<a name="design_and_architecture"></a>
+### Design and Architecture
+
+Phusion Passenger's design and architecture is documented in detail in the [Design & Architecture](https://www.phusionpassenger.com/documentation/Design%20and%20Architecture.html) document.
+
+<a name="build_system"></a>
 ### Compilation and build system
 
 `passenger-install-apache2-module` and `passenger-install-nginx-module` are actually user-friendly wrappers around the build system. The build system is written in Rake, and most of it can be found in the `build/` directory.
@@ -67,6 +109,7 @@ Run the following command to compile everything:
 
 It is recommended that you install ccache and set the `USE_CCACHE=1` environment variable. The build system will then automatically wrap all compiler calls in ccache, significantly improving recompilation times.
 
+<a name="unit_tests"></a>
 ### Running the unit tests
 
 The tests depend on the Phusion Passenger developer tools. Make sure they're installed:
@@ -109,6 +152,7 @@ Run just the integration tests:
 
 Note that some tests, such as the ones that test privilege lowering, require root privileges. Those will only be run if Rake is run as root.
 
+<a name="dir_structure"></a>
 ### Directory structure
 
 The most important directories are:
@@ -160,6 +204,7 @@ Less important directories:
  * `build` <br>
    Source code of the build system.
 
+<a name="cxx_coding_style"></a>
 ### C++ coding style
 
  * Use 4-space tabs for indentation.
@@ -273,6 +318,7 @@ Less important directories:
 
    Other than the aforementioned rules, function definitions follow the same rules as function declarations.
 
+<a name="ruby_coding_style"></a>
 ### Ruby coding style
 
 The usual Ruby coding style applies, with some exceptions:
@@ -280,6 +326,20 @@ The usual Ruby coding style applies, with some exceptions:
  * Use 4-space tabs for indentation.
  * Return values explicitly with `return`.
 
-## Further reading
+<a name="systems_programming_fundamentals"></a>
+### Systems programming fundamentals
+
+Large parts of Phusion Passenger are written in C++. You can find a free C++ tutorial at [cplusplus.com](http://www.cplusplus.com/doc/tutorial/).
+
+Phusion Passenger heavily utilizes POSIX, the API that is in use by all Unix systems. The POSIX API is heavily used for:
+
+ * Filesystem operations.
+ * Process management.
+ * Sockets.
+
+A good and comprehensive, but rather large source for learning POSIX is the [POSIX Programmer's Guide](ftp://92.42.8.18/pub/doc/books/OReilly_-_POSIX_Programmers_Guide.pdf) by Donald A. Lewine. You can find smaller but less comprehensive documents all over the Internet. In particular, you will want to familiarize yourself with [fork-exec](http://en.wikipedia.org/wiki/Fork-exec), the standard process creation pattern in Unix.
+
+<a name="further_reading"></a>
+### Further reading
 
-Please read "doc/CodingTipsAndPitfalls.md".
+ * [Coding Tips and Pitfalls](https://github.com/phusion/passenger/blob/master/doc/CodingTipsAndPitfalls.md)

data/CONTRIBUTORS

@@ -9,6 +9,7 @@ Andy Allan
 Benjamin Fleischer
 Bernd Ahlers
 Chad Fowler
+Chris Walquist
 Christoffer Sawicki
 Damien Le Berrigaud
 Dan Peterson
@@ -21,6 +22,7 @@ Dmitry Galinsky
 Dylan Vaughn
 Erik Ogan
 Evan Phoenix
+flygoast
 Gaspard Bucher
 Goffert van Gool (Phusion)
 Gokulnath Manakkattil
@@ -53,6 +55,7 @@ Neil Wilson
 Ninh Bui (Phusion)
 Pat Downey
 Paul Kmiec
+Pepijn Looije
 Perry Smith
 Philip M. Gollucci
 Redmar Kerkhoff
@@ -68,3 +71,4 @@ Tim Carey-Smith
 Tinco Andringa (Phusion)
 W. Andrew Loe III
 Weyert de Boer
+亀田 義裕

data/README.md

@@ -16,7 +16,7 @@ Please follow [the installation instructions on the website](https://www.phusion
 
 ### Installing the source directly from git
 
-If you mean to install the latest version of Passenger directly from this git repository, then you should run one of the following commands. Installing from the git repository is basically the same as the tarball installation method, as [described in the manual](http://modrails.com/documentation/Users%20guide.html#installation).
+If you mean to install the latest version of Passenger directly from this git repository, then you should run one of the following commands. Installing from the git repository is basically the same as the tarball installation method, as [described in the manual](https://www.phusionpassenger.com/documentation/Users%20guide.html#installation).
 
     ./bin/passenger-install-apache2-module
 

data/Vagrantfile

@@ -0,0 +1,50 @@
+# This Vagrantfile sets up an Ubuntu VM, for the purpose of developing Phusion Passenger.
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+CPUS   = ENV.fetch('CPUS', 2).to_i
+MEMORY = ENV.fetch('MEMORY', 2048).to_i
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "phusion-open-ubuntu-14.04-amd64"
+  config.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/latest/ubuntu-14.04-amd64-vbox.box"
+  config.ssh.forward_agent = true
+
+  # Passenger Standalone and 'rails server'
+  config.vm.network :forwarded_port, :host => 3000, :guest => 3000
+  config.vm.network :forwarded_port, :host => 3001, :guest => 3001
+  config.vm.network :forwarded_port, :host => 3002, :guest => 3002
+  # Apache
+  config.vm.network :forwarded_port, :host => 8000, :guest => 8000
+  config.vm.network :forwarded_port, :host => 8001, :guest => 8001
+  config.vm.network :forwarded_port, :host => 8002, :guest => 8002
+  config.vm.network :forwarded_port, :host => 8003, :guest => 8003
+  config.vm.network :forwarded_port, :host => 8004, :guest => 8004
+  config.vm.network :forwarded_port, :host => 8005, :guest => 8005
+  config.vm.network :forwarded_port, :host => 8010, :guest => 8010
+  # Nginx
+  config.vm.network :forwarded_port, :host => 8100, :guest => 8100
+  config.vm.network :forwarded_port, :host => 8101, :guest => 8101
+  config.vm.network :forwarded_port, :host => 8102, :guest => 8102
+  config.vm.network :forwarded_port, :host => 8103, :guest => 8103
+  config.vm.network :forwarded_port, :host => 8104, :guest => 8104
+  config.vm.network :forwarded_port, :host => 8105, :guest => 8105
+  config.vm.network :forwarded_port, :host => 8110, :guest => 8110
+
+  config.vm.provider :virtualbox do |vb, override|
+    # VirtualBox shared folders are WAAAAY too slow
+    override.vm.network :private_network, :type => "dhcp"
+    override.vm.synced_folder ".", "/vagrant", :type => "nfs"
+    vb.cpus   = CPUS
+    vb.memory = MEMORY
+  end
+
+  config.vm.provider :vmware_fusion do |vf, override|
+    override.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/latest/ubuntu-14.04-amd64-vmwarefusion.box"
+    vf.vmx["numvcpus"] = CPUS.to_s
+    vf.vmx["memsize"]  = MEMORY.to_s
+  end
+
+  config.vm.provision :shell, :path => "dev/vagrant/provision.sh"
+end

data/bin/passenger-install-nginx-module

@@ -42,6 +42,11 @@ PhusionPassenger.require_passenger_lib 'abstract_installer'
 PhusionPassenger.require_passenger_lib 'utils/terminal_choice_menu'
 PhusionPassenger.require_passenger_lib 'utils/tmpio'
 
+DOWNLOAD_OPTION = {
+	:connect_timeout => 30,
+	:idle_timeout    => 30
+}
+
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
 	TerminalChoiceMenu = PhusionPassenger::Utils::TerminalChoiceMenu
@@ -260,7 +265,7 @@ private
 		dirname = "pcre-#{PREFERRED_PCRE_VERSION}"
 		tarball = "#{@working_dir}/pcre.tar.gz"
 		
-		if download(url, tarball)
+		if download(url, tarball, DOWNLOAD_OPTION)
 			Dir.chdir(@working_dir) do
 				puts "<banner>Verifying PCRE checksum...</banner>"
 				if Digest::SHA256.file(tarball) != PCRE_SHA256_CHECKSUM
@@ -298,7 +303,7 @@ private
 		dirname = "nginx-#{PREFERRED_NGINX_VERSION}"
 		tarball = "#{@working_dir}/nginx.tar.gz"
 		
-		if download(url, tarball)
+		if download(url, tarball, DOWNLOAD_OPTION)
 			Dir.chdir(@working_dir) do
 				puts "<banner>Verifying Nginx checksum...</banner>"
 				if Digest::SHA256.file(tarball) != NGINX_SHA256_CHECKSUM

data/build/basics.rb

@@ -97,7 +97,7 @@ def boolean_option(name, default_value = false)
 end
 
 def maybe_wrap_in_ccache(command)
-	if boolean_option('USE_CCACHE', false)
+	if boolean_option('USE_CCACHE', false) && command !~ /^ccache /
 		return "ccache #{command}"
 	else
 		return command
@@ -128,6 +128,9 @@ if boolean_option('CACHING', true) && !boolean_option('RELEASE')
 	FileUtils.mkdir_p(PlatformInfo.cache_dir)
 end
 
+# https://github.com/phusion/passenger/issues/672
+ENV.delete('CDPATH')
+
 #################################################
 
 PACKAGE_NAME    = PhusionPassenger::PACKAGE_NAME

data/build/documentation.rb

@@ -91,3 +91,9 @@ def create_markdown_compilation_task(target)
 end
 
 create_markdown_compilation_task('doc/Packaging.html')
+
+desc "Upload documentation to the Phusion web server"
+task 'doc:rsync' => :doc do
+	sh "cd doc && rsync -rv --progress --partial-dir=.rsync-partial --human-readable . " +
+		"shell.phusion.nl:/home/phusion/websites/passenger_docs/"
+end

data/build/node_tests.rb

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

data/build/packaging.rb

@@ -104,6 +104,11 @@ task :clobber => 'package:clean'
 
 task 'package:set_official' do
 	ENV['OFFICIAL_RELEASE'] = '1'
+	# These environment variables interfere with 'brew install'
+	# and maybe other stuff, so unset them.
+	ENV.delete('CC')
+	ENV.delete('CXX')
+	ENV.delete('USE_CCACHE')
 end
 
 desc "Build, sign & upload gem & tarball"

data/build/test_basics.rb

@@ -51,7 +51,8 @@ task 'test:install_deps' do
 	if boolean_option('BASE_DEPS', default)
 		sh "#{gem_install} rails -v 2.3.15"
 		sh "#{gem_install} mime-types -v 1.25"
-		sh "#{gem_install} bundler rspec daemon_controller json rack"
+		sh "#{gem_install} rspec -v 2.14.1"
+		sh "#{gem_install} bundler daemon_controller json rack"
 	end
 	if boolean_option('DOCTOOLS', default)
 		begin
@@ -77,7 +78,6 @@ task 'test:install_deps' do
                 end
 	end
 	if boolean_option('NODE_MODULES', default)
-		sh "npm install mocha should sinon"
-		sh "npm install express@3.4.8"
+		sh "npm install"
 	end
 end