passenger 4.0.41 → 4.0.42

data/test/integration_tests/nginx_tests.rb

@@ -195,6 +195,7 @@ describe "Phusion Passenger for Nginx" do
 			@nginx.add_server do |server|
 				server[:server_name] = "1.passenger.test"
 				server[:root]        = "#{PhusionPassenger.source_root}/test/stub"
+				server[:passenger_friendly_error_pages] = 'on'
 				server << %Q{
 					location ~ ^/subapp(/.*|$) {
 						alias #{@stub.full_app_root}/public$1;
@@ -234,6 +235,7 @@ describe "Phusion Passenger for Nginx" do
 			@nginx.add_server do |server|
 				server[:server_name] = "1.passenger.test"
 				server[:root]        = "#{@stub.full_app_root}/public"
+				server[:passenger_friendly_error_pages] = "on"
 				server << %q{
 					location /crash_without_friendly_error_page {
 						passenger_enabled on;

data/test/stub/rack/config.ru

@@ -1,19 +1,6 @@
 # encoding: binary
 
-def text_response(body)
-	body = binary_string(body.to_s)
-	return [200, { "Content-Type" => "text/plain", "Content-Length" => body.size.to_s }, [body]]
-end
-
-if "".respond_to?(:force_encoding)
-	def binary_string(str)
-		return str.force_encoding("binary")
-	end
-else
-	def binary_string(str)
-		return str
-	end
-end
+require File.expand_path(File.dirname(__FILE__) + "/library")
 
 app = lambda do |env|
 	case env['PATH_INFO']
@@ -40,6 +27,12 @@ app = lambda do |env|
 			body << "#{key} = #{value}\n"
 		end
 		text_response(body)
+	when '/system_env'
+		body = ''
+		ENV.sort.each do |key, value|
+			body << "#{key} = #{value}\n"
+		end
+		text_response(body)
 	when '/touch_file'
 		req = Rack::Request.new(env)
 		filename = req.params["file"]

data/test/stub/rack/library.rb

@@ -0,0 +1,16 @@
+# encoding: binary
+
+def text_response(body)
+	body = binary_string(body.to_s)
+	return [200, { "Content-Type" => "text/plain", "Content-Length" => body.size.to_s }, [body]]
+end
+
+if "".respond_to?(:force_encoding)
+	def binary_string(str)
+		return str.force_encoding("binary")
+	end
+else
+	def binary_string(str)
+		return str
+	end
+end

data/test/support/test_helper.rb

@@ -227,9 +227,6 @@ module TestHelper
 				"your hosts file.\n" <<
 				"Please add these to your /etc/hosts:\n\n" <<
 				"127.0.0.1 passenger.test\n" <<
-				"127.0.0.1 mycook.passenger.test\n" <<
-				"127.0.0.1 zsfa.passenger.test\n" <<
-				"127.0.0.1 norails.passenger.test\n" <<
 				"127.0.0.1 1.passenger.test 2.passenger.test 3.passenger.test\n" <<
 				"127.0.0.1 4.passenger.test 5.passenger.test 6.passenger.test\n" <<
 				"127.0.0.1 7.passenger.test 8.passenger.test 9.passenger.test\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.41
+  version: 4.0.42
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -2363,6 +2363,7 @@ files:
 - lib/phusion_passenger/classic_rails/thread_handler_extension.rb
 - lib/phusion_passenger/common_library.rb
 - lib/phusion_passenger/config/about_command.rb
+- lib/phusion_passenger/config/build_native_support_command.rb
 - lib/phusion_passenger/config/command.rb
 - lib/phusion_passenger/config/detach_process_command.rb
 - lib/phusion_passenger/config/main.rb
@@ -2597,72 +2598,10 @@ files:
 - test/stub/node/public/.gitignore
 - test/stub/node/tmp/.gitignore
 - test/stub/rack/config.ru
+- test/stub/rack/library.rb
 - test/stub/rack/public/.gitignore
 - test/stub/rack/start.rb
 - test/stub/rack/tmp/.gitignore
-- test/stub/rails2.3-mycook/Rakefile
-- test/stub/rails2.3-mycook/app/controllers/application_controller.rb
-- test/stub/rails2.3-mycook/app/controllers/recipes_controller.rb
-- test/stub/rails2.3-mycook/app/controllers/uploads_controller.rb
-- test/stub/rails2.3-mycook/app/controllers/welcome_controller.rb
-- test/stub/rails2.3-mycook/app/helpers/application_helper.rb
-- test/stub/rails2.3-mycook/app/helpers/recipes_helper.rb
-- test/stub/rails2.3-mycook/app/helpers/test_helper.rb
-- test/stub/rails2.3-mycook/app/helpers/uploads_helper.rb
-- test/stub/rails2.3-mycook/app/helpers/welcome_helper.rb
-- test/stub/rails2.3-mycook/app/views/layouts/default.rhtml
-- test/stub/rails2.3-mycook/app/views/recipes/create.rhtml
-- test/stub/rails2.3-mycook/app/views/recipes/index.rhtml
-- test/stub/rails2.3-mycook/app/views/recipes/new.rhtml
-- test/stub/rails2.3-mycook/app/views/uploads/index.rhtml
-- test/stub/rails2.3-mycook/app/views/uploads/new.html.erb
-- test/stub/rails2.3-mycook/app/views/welcome/cached.rhtml
-- test/stub/rails2.3-mycook/app/views/welcome/index.rhtml
-- test/stub/rails2.3-mycook/config/boot.rb
-- test/stub/rails2.3-mycook/config/database.yml
-- test/stub/rails2.3-mycook/config/environment.rb
-- test/stub/rails2.3-mycook/config/environments/development.rb
-- test/stub/rails2.3-mycook/config/environments/production.rb
-- test/stub/rails2.3-mycook/config/initializers/inflections.rb
-- test/stub/rails2.3-mycook/config/initializers/mime_types.rb
-- test/stub/rails2.3-mycook/config/routes.rb
-- test/stub/rails2.3-mycook/log/useless.txt
-- test/stub/rails2.3-mycook/public/.htaccess
-- test/stub/rails2.3-mycook/public/404.html
-- test/stub/rails2.3-mycook/public/422.html
-- test/stub/rails2.3-mycook/public/500.html
-- test/stub/rails2.3-mycook/public/dispatch.cgi
-- test/stub/rails2.3-mycook/public/dispatch.fcgi
-- test/stub/rails2.3-mycook/public/dispatch.rb
-- test/stub/rails2.3-mycook/public/favicon.ico
-- test/stub/rails2.3-mycook/public/images/angrywizard.gif
-- test/stub/rails2.3-mycook/public/images/cookbook.gif
-- test/stub/rails2.3-mycook/public/images/header.png
-- test/stub/rails2.3-mycook/public/images/rails.png
-- test/stub/rails2.3-mycook/public/robots.txt
-- test/stub/rails2.3-mycook/public/uploads.html
-- test/stub/rails2.3-mycook/public/uploads/.gitignore
-- test/stub/rails2.3-mycook/public/welcome/cached.html
-- test/stub/rails2.3-mycook/script/about
-- test/stub/rails2.3-mycook/script/console
-- test/stub/rails2.3-mycook/script/dbconsole
-- test/stub/rails2.3-mycook/script/destroy
-- test/stub/rails2.3-mycook/script/generate
-- test/stub/rails2.3-mycook/script/performance/benchmarker
-- test/stub/rails2.3-mycook/script/performance/profiler
-- test/stub/rails2.3-mycook/script/performance/request
-- test/stub/rails2.3-mycook/script/plugin
-- test/stub/rails2.3-mycook/script/process/inspector
-- test/stub/rails2.3-mycook/script/process/reaper
-- test/stub/rails2.3-mycook/script/process/spawner
-- test/stub/rails2.3-mycook/script/runner
-- test/stub/rails2.3-mycook/script/server
-- test/stub/rails2.3-mycook/sites/some.site/public/uploads.html
-- test/stub/rails2.3-mycook/sites/some.site/public/welcome/cached.html
-- test/stub/rails2.3-mycook/tmp/cache/useless.txt
-- test/stub/rails2.3-mycook/tmp/pids/useless.txt
-- test/stub/rails2.3-mycook/tmp/sessions/useless.txt
-- test/stub/rails2.3-mycook/tmp/sockets/useless.txt
 - test/stub/rails2.3/Rakefile
 - test/stub/rails2.3/app/controllers/application_controller.rb
 - test/stub/rails2.3/app/controllers/bar_controller_1.rb
@@ -2893,24 +2832,9 @@ files:
 - test/stub/rails4.0/vendor/assets/stylesheets/.keep
 - test/stub/start_error.pl
 - test/stub/upload_data.txt
-- test/stub/vendor_rails/minimal/README
-- test/stub/vendor_rails/minimal/actionmailer/lib/action_mailer.rb
-- test/stub/vendor_rails/minimal/actionpack/lib/action_controller.rb
-- test/stub/vendor_rails/minimal/actionpack/lib/action_pack.rb
-- test/stub/vendor_rails/minimal/actionpack/lib/action_view.rb
-- test/stub/vendor_rails/minimal/activerecord/lib/active_record.rb
-- test/stub/vendor_rails/minimal/activeresource/lib/active_resource.rb
-- test/stub/vendor_rails/minimal/activesupport/lib/active_support.rb
-- test/stub/vendor_rails/minimal/activesupport/lib/active_support/whiny_nil.rb
-- test/stub/vendor_rails/minimal/railties/lib/dispatcher.rb
-- test/stub/vendor_rails/minimal/railties/lib/initializer.rb
-- test/stub/vendor_rails/minimal/railties/lib/ruby_version_check.rb
 - test/stub/wsgi/passenger_wsgi.py
 - test/stub/wsgi/public/.gitignore
 - test/stub/wsgi/tmp/.gitignore
-- test/stub/zsfa/header.png
-- test/stub/zsfa/index.html
-- test/stub/zsfa/zsfa.png
 - test/support/allocate_memory.c
 - test/support/apache2_controller.rb
 - test/support/multipart.rb

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTRE10AAoJECrHRaUKISqMc78H/3zO8kI6oWl0kMwHmVN6WUtd
-Q8qSkAa2beHwrFsTXCQYmnfUa8N5cjNgvCjI2FX5/9vu+s4yuJG5h8lkcpd+97pw
-u3zUdFWsgr5BXD8BX3F7vmkPahXmmhsar4MHCu/1WK5pX2mZbihmXGBVtIkPKmVN
-uGD0AqzSB0H4XAH84aiMqi8gssgKzwTM6jYs4uZ3gNhUSmRLl6sKSh9YHfc4ggLI
-5CBvZdh29jWSXKzcvPPuLNsMkbsmHvixeK/R3cBBUA3TWHdJqid5bhOCY6rcw9tn
-W2VwBmL7v3q/WEuCJJyQ5D2NAG0F5aT71pSu9Eirr7nXtZ5p/rMsyZT+RTiQquc=
-=JLge
+iQEcBAABAgAGBQJTagHhAAoJECrHRaUKISqMD6cH+wWb6/mBkguwed9UWsjY+LC8
+42sUBsesd5hlxmVqjFN0jHxuPEE8tpcZSVBTrL3ZUZ1Ie05Eqen7Hv4MwkJvsPxz
+lUABjMsO8pWsK7Gy+epXYGsfzY47Tgeyc2VaXZsx5BlRRxzTQrnH3vKyPSaRKc12
+GxZs3I8up/rKek/R+WAkQdiVIu4ciQ7VSRET4QHYzNU4oCAgecSgh8SqXPUbqcHU
+lt0wSGudNa5o6NrIAkiRJ28mITiEfKHuuDdBV7OuGSeOT6tjSINL3UbANPb81O3x
+hOLafWUnPmfTgXCv3SFycp7mdIwTOROnx4c/kQfPXXln02TlCYjzkFVHFHG2Lrw=
+=fwu8
 -----END PGP SIGNATURE-----

data/test/stub/rails2.3-mycook/Rakefile

@@ -1,10 +0,0 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-require 'tasks/rails'

data/test/stub/rails2.3-mycook/app/controllers/application_controller.rb

@@ -1,12 +0,0 @@
-# Filters added to this controller apply to all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
-
-class ApplicationController < ActionController::Base
-  helper :all # include all helpers, all the time
-
-  # See ActionController::RequestForgeryProtection for details
-  # Uncomment the :secret if you're not using the cookie session store
-  #protect_from_forgery # :secret => '7eb64d7b9c847975d50f1923a12e4896'
-  
-  layout 'default'
-end

data/test/stub/rails2.3-mycook/app/controllers/recipes_controller.rb

@@ -1,5 +0,0 @@
-class RecipesController < ApplicationController
-	def create
-		
-	end
-end

data/test/stub/rails2.3-mycook/app/controllers/uploads_controller.rb

@@ -1,15 +0,0 @@
-class UploadsController < ApplicationController
-	caches_page :index
-	
-	def create
-		headers["Content-Type"] = "text/plain"
-		render :text =>
-			"name 1 = " + params[:upload][:name1] + "\n" +
-			"name 2 = " + params[:upload][:name2] + "\n" +
-			"data = " + params[:upload][:data].read
-	end
-	
-	def single
-		render :text => params[:foo]
-	end
-end

data/test/stub/rails2.3-mycook/app/controllers/welcome_controller.rb

@@ -1,71 +0,0 @@
-class WelcomeController < ApplicationController
-	caches_page :cached
-	
-	def parameters_test
-		headers["Content-Type"] = "text/plain"
-		render :text => params.to_xml
-	end
-	
-	def headers_test
-		headers["X-Foo"] = "Bar"
-		render :nothing => true
-	end
-	
-	def touch
-		File.unlink('public/touch.txt') rescue nil
-		File.open('public/touch.txt', 'w') do end
-		render :nothing => true
-	end
-	
-	def in_passenger
-		render :text => !!defined?(PhusionPassenger)
-	end
-	
-	def rails_env
-		render :text => RAILS_ENV
-	end
-	
-	def backtrace
-		render :text => caller.join("\n")
-	end
-	
-	def passenger_name
-		render :text => Passenger.new.name
-	end
-	
-	def terminate
-		exit!
-	end
-
-	def show_id
-		render :text => params[:id]
-	end
-	
-	def environment
-		text = ""
-		ENV.each_pair do |key, value|
-			text << "#{key} = #{value}\n"
-		end
-		render :text => text
-	end
-	
-	def cgi_environment
-		text = ""
-		request.headers.each_pair do |key, value|
-			text << "#{key} = #{value}\n"
-		end
-		render :text => text
-	end
-
-	def request_uri
-		render :text => request.request_uri
-	end
-	
-	def sleep_until_exists
-		File.open("#{RAILS_ROOT}/waiting_#{params[:name]}", 'w')
-		while !File.exist?("#{RAILS_ROOT}/#{params[:name]}")
-			sleep 0.1
-		end
-		render :nothing => true
-	end
-end

data/test/stub/rails2.3-mycook/app/helpers/application_helper.rb

@@ -1,3 +0,0 @@
-# Methods added to this helper will be available to all templates in the application.
-module ApplicationHelper
-end

data/test/stub/rails2.3-mycook/app/helpers/recipes_helper.rb

@@ -1,2 +0,0 @@
-module RecipesHelper
-end

data/test/stub/rails2.3-mycook/app/helpers/test_helper.rb

@@ -1,2 +0,0 @@
-module TestHelper
-end

data/test/stub/rails2.3-mycook/app/helpers/uploads_helper.rb

@@ -1,2 +0,0 @@
-module UploadsHelper
-end

data/test/stub/rails2.3-mycook/app/helpers/welcome_helper.rb

@@ -1,2 +0,0 @@
-module WelcomeHelper
-end

data/test/stub/rails2.3-mycook/app/views/layouts/default.rhtml

@@ -1,26 +0,0 @@
-<html>
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8">
-	<title>MyCook&trade; beta</title>
-	<style type="text/css">
-	body {
-		background: url('<%= image_path('cookbook.gif') %>');
-	}
-	
-	#content {
-		margin-top: 2em;
-		margin-left: 20%;
-		margin-right: 20%;
-		padding: 1em;
-		border: solid 5px orange;
-		background: white;
-	}
-	</style>
-</head>
-
-<body>
-	<div id="content">
-		<%= yield %>
-	</div>
-</body>
-</html>

data/test/stub/rails2.3-mycook/app/views/recipes/create.rhtml

@@ -1,13 +0,0 @@
-<h1>Uh oh...</h1>
-
-<p>
-Have we already told you that MyCook&trade; is currently in beta? We haven't implemented saving of recipes yet!
-But for your information, this is what you submitted:
-</p>
-
-<ul>
-<li>HTTP method: <%=h request.method %></li>
-<li>Name: <%=h params[:recipe][:name] %></li>
-<li>Instructions: <%=h params[:recipe][:instructions] %></li>
-</ul>
-

data/test/stub/rails2.3-mycook/app/views/recipes/index.rhtml

@@ -1,3 +0,0 @@
-<h1>All recipes</h1>
-
-Not implemented yet. Sorry.

data/test/stub/rails2.3-mycook/app/views/recipes/new.rhtml

@@ -1,8 +0,0 @@
-<h1>Create a new recipe</h1>
-<% form_tag(recipes_url, :method => :post) do %>
-	<p>Name:<br><%= text_field :recipe, :name %></p>
-	<p>Instructions:<br><%= text_area :recipe, :instructions, :rows => 15, :cols => 60 %></p>
-	<p>
-		<%= submit_tag('Submit') %>
-	</p>
-<% end %>

data/test/stub/rails2.3-mycook/app/views/uploads/index.rhtml

@@ -1 +0,0 @@
-This content should not be shown because of page caching.

data/test/stub/rails2.3-mycook/app/views/uploads/new.html.erb

@@ -1,8 +0,0 @@
-<h1>Upload something useless</h1>
-
-<% form_tag(uploads_path, { :method => :post, :multipart => true }) do %>
-	<p>Name 1:<br><%= text_field :upload, :name1 %></p>
-	<p>Name 2:<br><%= text_field :upload, :name2 %></p>
-	<p>File:<br><%= file_field :upload, :data %></p>
-	<%= submit_tag 'Upload!' %>
-<% end %>

data/test/stub/rails2.3-mycook/app/views/welcome/cached.rhtml

@@ -1 +0,0 @@
-This content should never be displayed because of page caching.

data/test/stub/rails2.3-mycook/app/views/welcome/index.rhtml

@@ -1,20 +0,0 @@
-<h1>Welcome to MyCook&trade;</h1>
-<h2>Your personal online cookbook</h1>
-
-<%= image_tag('angrywizard.gif', :style => 'float: right') %>
-
-<p>We're currently in <strike>alpha</strike> <b>beta</b>. These are the things you can currently do:</p>
-<ul>
-<li><%= link_to 'Create a new recipe', new_recipe_url %></li>
-<li><%= link_to 'See all recipes', recipes_url %></li>
-<li><%= link_to 'Upload something useless', new_upload_url %></li>
-</ul>
-
-<p>Oh and you know what?</p>
-
-<div style="font-family: 'Times New Roman'; font-size: 40pt; color: red">
-<blink>We love Zed!</blink>
-<marquee behavior="alternate" scrolldelay="20" scrollamount="6">He is our hero!</marquee>
-</div>
-
-<div><%= image_tag('header.png') %></div>