passenger 2.2.5 → 2.2.6

data/lib/phusion_passenger/templates/apache2/deployment_example.txt.erb

@@ -1,16 +1,19 @@
 <banner>Deploying a Ruby on Rails application: an example</banner>
 
-Suppose you have a Ruby on Rails application in <b>/somewhere</b>. Add a virtual host
-to your Apache configuration file, and set its DocumentRoot to
-<b>/somewhere/public</b>, like this:
+Suppose you have a Rails application in <b>/somewhere</b>. Add a virtual host to your
+Apache configuration file and set its DocumentRoot to <b>/somewhere/public</b>:
 <b>
    <VirtualHost *:80>
       ServerName www.yourhost.com
       DocumentRoot /somewhere/public    # <-- be sure to point to 'public'!
+      <Directory /somewhere/public>
+         AllowOverride all              # <-- relax Apache security settings
+         Options -MultiViews            # <-- MultiViews must be turned off
+      </Directory>
    </VirtualHost>
 </b>
 And that's it! You may also want to check the Users Guide for security and
-optimization tips and other useful information:
+optimization tips, troubleshooting and other useful information:
 
   <yellow><%= @users_guide %></yellow>
 

data/lib/phusion_passenger/utils.rb

@@ -31,6 +31,7 @@ require 'pathname'
 require 'etc'
 require 'fcntl'
 require 'tempfile'
+require 'stringio'
 require 'phusion_passenger/exceptions'
 if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby"
 	require 'phusion_passenger/native_support'

data/test/integration_tests/apache2_tests.rb

@@ -554,6 +554,22 @@ describe "Apache 2 module" do
 		it_should_behave_like "HelloWorld Rack application"
 	end
 	
+	describe "Rack application running within Rails directory structure" do
+		before :all do
+			@stub = setup_rails_stub('mycook')
+			FileUtils.cp_r("stub/rack/.", @stub.app_root)
+			@apache2.set_vhost('passenger.test', File.expand_path(@stub.app_root) + "/public")
+			@apache2.start
+			@server = "http://passenger.test:#{@apache2.port}"
+		end
+
+		after :all do
+			@stub.destroy
+		end
+
+		it_should_behave_like "HelloWorld Rack application"
+	end
+
 	describe "WSGI application running in root URI" do
 		before :all do
 			@stub = setup_stub('wsgi')

data/test/integration_tests/nginx_tests.rb

@@ -94,6 +94,52 @@ describe "Phusion Passenger for Nginx" do
 		end
 	end
 	
+	describe "Rack application running in root URI" do
+		before :all do
+			@server = "http://passenger.test:#{@nginx.port}"
+			@stub = setup_stub('rack')
+			@nginx.add_server do |server|
+				server[:server_name] = "passenger.test"
+				server[:root]        = File.expand_path("#{@stub.app_root}/public")
+			end
+			@nginx.start
+		end
+		
+		after :all do
+			@stub.destroy
+		end
+		
+		before :each do
+			@stub.reset
+		end
+		
+		it_should_behave_like "HelloWorld Rack application"
+	end
+	
+	describe "Rack application running within Rails directory structure" do
+		before :all do
+			@server = "http://passenger.test:#{@nginx.port}"
+			@stub = setup_rails_stub('mycook')
+			FileUtils.cp_r("stub/rack/.", @stub.app_root)
+			@nginx.add_server do |server|
+				server[:server_name] = "passenger.test"
+				server[:root]        = File.expand_path("#{@stub.app_root}/public")
+			end
+			@nginx.start
+		end
+
+		after :all do
+			@stub.destroy
+		end
+		
+		before :each do
+			@stub.reset
+			FileUtils.cp_r("stub/rack/.", @stub.app_root)
+		end
+
+		it_should_behave_like "HelloWorld Rack application"
+	end
+	
 	
 	##### Helper methods #####
 	

data/test/stub/MessageServer.dSYM/Contents/Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.MessageServer</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>1.0</string>
+		<key>CFBundleVersion</key>
+		<string>1</string>
+		<key>dSYM_UUID</key>
+		<dict>
+			<key>i386</key>
+			<string>7B7098EA-C075-7166-E6F2-B4822BCD721D</string>
+		</dict>
+	</dict>
+</plist>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-01 00:00:00 +02:00
+date: 2009-11-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -1209,6 +1209,8 @@ files:
 - test/stub/message_channel.rb
 - test/stub/message_channel_2.rb
 - test/stub/message_channel_3.rb
+- test/stub/MessageServer.dSYM/Contents/Info.plist
+- test/stub/MessageServer.dSYM/Contents/Resources/DWARF/MessageServer
 - test/stub/nginx/koi-utf
 - test/stub/nginx/koi-win
 - test/stub/nginx/mime.types