passenger 2.2.5 → 2.2.6

data/NEWS

@@ -1,3 +1,33 @@
+Release 2.2.6
+-------------
+
+ * Some /tmp cleaner programs such as tmpwatch try to remove subdirectories
+   in /tmp/passenger.xxx after a while because they think those
+   subdirectories are unused. This could cause Phusion Passenger to
+   malfunction, requiring a web server restart. Measures have now been
+   taken to prevent those tmp cleaner programs from removing anything
+   in /tmp/passenger.xxx. Issue #365.
+ * When autodetecting the application type, Rack is now given more priority
+   than Rails. This allows one to drop a config.ru file in a Rails directory
+   and have it detected as a Rack application instead of a Rails application.
+   Patch contributed by Sam Pohlenz: issue #338.
+ * The default socket backlog has been increased from 'SOMAXCONN' (which
+   is 128 on most platforms) to 1024. This should fix most
+   'helper_server.sock failed: Resource temporarily unavailable'
+   errors.
+ * Fixed compilation problems on Solaris. Issue #369 and issue #379.
+ * Fixed crashes on PowerPC.
+ * Some Ruby 1.9 compatibility fixes. Issue #398.
+ * The installer now displays correct dependency installation instructions
+   for Mandriva Linux.
+ * [Apache] The location of the 'apxs' and 'apr-config' commands can now
+   also be passed to the installer through the --apxs-path and
+   --apr-config-path parameters, in addition to the $APXS2 and $APR_CONFIG
+   environment variables. Issue #3.
+ * [Nginx] Various problems that only occur on 64-bit platforms have been fixed.
+ * [Nginx] The installer now installs Nginx 0.7.64 by default.
+
+
 Release 2.2.5
 -------------
 
@@ -134,4 +164,4 @@ Release 2.2.5
 
 Older releases
 --------------
-Please consult the blog posts on http://blog.phusion.nl/ for the information about older releases.
+Please consult the blog posts on http://blog.phusion.nl/ for the information about older releases.

data/bin/passenger-install-apache2-module

@@ -85,7 +85,7 @@ class Installer < PhusionPassenger::AbstractInstaller
 		check_dependencies || exit(1)
 		check_whether_apache_uses_compatible_mpm
 		check_write_permission_to_passenger_root || exit(1)
-		if install_apache2_module
+		if true || install_apache2_module
 			show_apache2_config_snippets
 			show_deployment_example
 		else
@@ -204,6 +204,12 @@ parser = OptionParser.new do |opts|
 	        "#{' ' * 37}input.") do
 		options[:auto] = true
 	end
+	opts.on("--apxs2-path PATH", String, "Path to 'apxs2' command.") do |value|
+		ENV['APXS2'] = value
+	end
+	opts.on("--apr-config-path PATH", String, "Path to 'apr-config' command.") do |value|
+		ENV['APR_CONFIG'] = value
+	end
 end
 begin
 	parser.parse!

data/bin/passenger-install-nginx-module

@@ -36,7 +36,7 @@ include PlatformInfo
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
 	
-	NGINX_VERSION = "0.7.61"
+	NGINX_VERSION = "0.7.64"
 	
 	def dependencies
 		result = [

data/bin/passenger-memory-stats

@@ -76,7 +76,7 @@ class Table
 				left_bar_size = free_space / 2
 				right_bar_size = free_space - left_bar_size
 			end
-			result = "#{BLUE_BG}#{BOLD}#{YELLOW}"
+			result = "#{BLUE_BG}#{BOLD}#{YELLOW}\n"
 			result << "#{"-" * left_bar_size} #{title} #{"-" * right_bar_size}\n"
 			if !@rows.empty?
 				result << WHITE
@@ -124,7 +124,7 @@ class MemoryStats
 		end
 		
 		def to_a
-			return [pid, ppid, threads, vm_size_in_mb, private_dirty_rss_in_mb, rss_in_mb, name]
+			return [pid, ppid, vm_size_in_mb, private_dirty_rss_in_mb, rss_in_mb, name]
 		end
 	end
 	
@@ -264,7 +264,7 @@ private
 	end
 	
 	def print_process_list(title, processes, options = {})
-		table = Table.new(%w{PID PPID Threads VMSize Private Resident Name})
+		table = Table.new(%w{PID PPID VMSize Private Resident Name})
 		table.add_rows(processes)
 		if options.has_key?(:show_ppid) && !options[:show_ppid]
 			table.remove_column('PPID')

data/doc/Users guide Apache.html

@@ -798,14 +798,36 @@ are run, is “production”. You can change this by changing the
 </tr></table>
 </div>
 <h3 id="_deploying_to_a_virtual_host_8217_s_root">3.1. Deploying to a virtual host&#8217;s root</h3>
-<div class="paragraph"><p>Add a virtual host entry to your Apache configuration file. The virtual host&#8217;s
-document root must point to your Ruby on Rails application&#8217;s <em>public</em> folder.
-For example:</p></div>
+<div class="paragraph"><p>Add a virtual host entry to your Apache configuration file. Make sure that the
+following conditions are met:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+The virtual host&#8217;s document root must point to your Ruby on Rails application&#8217;s
+  <em>public</em> folder.
+</p>
+</li>
+<li>
+<p>
+The Apache per-directory permissions must allow access to this folder.
+</p>
+</li>
+<li>
+<p>
+MultiViews must be disabled for this folder.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>For example:</p></div>
 <div class="listingblock">
 <div class="content">
 <pre><tt>&lt;VirtualHost *:80&gt;
     ServerName www.mycook.com
     DocumentRoot /webapps/mycook/public
+    &lt;Directory /webapps/mycook/public&gt;
+        Allow from all
+        Options -MultiViews
+    &lt;/Directory&gt;
 &lt;/VirtualHost&gt;</tt></pre>
 </div></div>
 <div class="paragraph"><p>You may also need to tweak your file/folder permissions. Make sure that the
@@ -835,6 +857,9 @@ all parent folders. That is, /webapps/mycook and /webapps must also be readable
 <pre><tt>&lt;VirtualHost *:80&gt;
     ServerName www.phusion.nl
     DocumentRoot /websites/phusion
+    &lt;Directory /websites/phusion&gt;
+        Allow from all
+    &lt;/Directory&gt;
 &lt;/VirtualHost&gt;</tt></pre>
 </div></div>
 <div class="paragraph"><p>And you want your Ruby on Rails application to be accessible from the URL
@@ -845,13 +870,34 @@ folder to a directory in the document root. For example:</p></div>
 <div class="content">
 <pre><tt>ln -s /webapps/mycook/public /websites/phusion/rails</tt></pre>
 </div></div>
-<div class="paragraph"><p>Next, add a <a href="#RailsBaseURI">RailsBaseURI</a> option to the virtual host configuration:</p></div>
+<div class="paragraph"><p>Next, add a <a href="#RailsBaseURI">RailsBaseURI</a> option to the virtual host configuration,
+and also make sure that:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+The Apache per-directory permissions allow access to this folder.
+</p>
+</li>
+<li>
+<p>
+MultiViews is disabled for this folder.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>For example:</p></div>
 <div class="listingblock">
 <div class="content">
 <pre><tt>&lt;VirtualHost *:80&gt;
     ServerName www.phusion.nl
     DocumentRoot /websites/phusion
-    RailsBaseURI /rails                # This line has been added.
+    &lt;Directory /websites/phusion&gt;
+        Allow from all
+    &lt;/Directory&gt;
+
+    RailsBaseURI /rails                   # &lt;-- These lines have
+    &lt;Directory /websites/phusion/rails&gt;   # &lt;-- been added.
+        Options -MultiViews               # &lt;--
+    &lt;/Directory&gt;                          # &lt;--
 &lt;/VirtualHost&gt;</tt></pre>
 </div></div>
 <div class="paragraph"><p>Then restart Apache. The application has now been deployed.</p></div>
@@ -1001,19 +1047,45 @@ the Apache configuration file:</p></div>
 <pre><tt>&lt;VirtualHost *:80&gt;
     ServerName www.rackexample.com
     DocumentRoot /webapps/rack_example/public
+    &lt;Directory /webapps/rack_example/public&gt;
+        Allow from all
+        Options -MultiViews
+    &lt;/Directory&gt;
 &lt;/VirtualHost&gt;</tt></pre>
 </div></div>
 <div class="paragraph"><p>And we&#8217;re done! After an Apache restart, the above Rack application will be available
 under the URL <em>http://www.rackexample.com/</em>.</p></div>
 <h3 id="_deploying_to_a_virtual_host_8217_s_root_2">4.2. Deploying to a virtual host&#8217;s root</h3>
-<div class="paragraph"><p>Add a virtual host entry to your Apache configuration file. The virtual host&#8217;s
-document root must point to your Rack application&#8217;s <em>public</em> folder.
-For example:</p></div>
+<div class="paragraph"><p>Add a virtual host entry to your Apache configuration file. Make sure that the
+following conditions are met:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+The virtual host&#8217;s document root must point to your Rack application&#8217;s
+  <em>public</em> folder.
+</p>
+</li>
+<li>
+<p>
+The Apache per-directory permissions must allow access to this folder.
+</p>
+</li>
+<li>
+<p>
+MultiViews must be disabled for this folder.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>For example:</p></div>
 <div class="listingblock">
 <div class="content">
 <pre><tt>&lt;VirtualHost *:80&gt;
     ServerName www.rackapp.com
     DocumentRoot /webapps/rackapp/public
+    &lt;Directory /webapps/rackapp/public&gt;
+        Allow from all
+        Options -MultiViews
+    &lt;/Directory&gt;
 &lt;/VirtualHost&gt;</tt></pre>
 </div></div>
 <div class="paragraph"><p>You may also need to tweak your file/folder permissions. Make sure that the
@@ -1043,6 +1115,9 @@ all parent folders. That is, /webapps/rackapp and /webapps must also be readable
 <pre><tt>&lt;VirtualHost *:80&gt;
     ServerName www.phusion.nl
     DocumentRoot /websites/phusion
+    &lt;Directory /websites/phusion&gt;
+        Allow from all
+    &lt;/Directory&gt;
 &lt;/VirtualHost&gt;</tt></pre>
 </div></div>
 <div class="paragraph"><p>And you want your Rack application to be accessible from the URL
@@ -1053,13 +1128,34 @@ folder to a directory in the document root. For example:</p></div>
 <div class="content">
 <pre><tt>ln -s /webapps/rackapp/public /websites/phusion/rack</tt></pre>
 </div></div>
-<div class="paragraph"><p>Next, add a <a href="#RackBaseURI">RackBaseURI</a> option to the virtual host configuration:</p></div>
+<div class="paragraph"><p>Next, add a <a href="#RackBaseURI">RackBaseURI</a> option to the virtual host configuration,
+and also make sure that:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+The Apache per-directory permissions allow access to this folder.
+</p>
+</li>
+<li>
+<p>
+MultiViews is disabled for this folder.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>For example:</p></div>
 <div class="listingblock">
 <div class="content">
 <pre><tt>&lt;VirtualHost *:80&gt;
     ServerName www.phusion.nl
     DocumentRoot /websites/phusion
-    RackBaseURI /rack                # This line has been added.
+    &lt;Directory /websites/phusion&gt;
+        Allow from all
+    &lt;/Directory&gt;
+
+    RackBaseURI /rails                    # &lt;-- These lines have
+    &lt;Directory /websites/phusion/rails&gt;   # &lt;-- been added.
+        Options -MultiViews               # &lt;--
+    &lt;/Directory&gt;                          # &lt;--
 &lt;/VirtualHost&gt;</tt></pre>
 </div></div>
 <div class="paragraph"><p>Then restart Apache. The application has now been deployed.</p></div>
@@ -1862,7 +1958,7 @@ virtual hosts or URLs that need it:</p></div>
 accessing <a href="http://www.example.com/about">http://www.example.com/about</a> will properly display the result of
 <a href="http://www.example.com/info/about">http://www.example.com/info/about</a>. Notice that PassengerAllowEncodedSlashes only
 interferes with passthrough rules, not with any other mod_rewrite rules. The rules for
-displaying maintenance.html will work fine even URLs starting with "/users".</p></div>
+displaying maintenance.html will work fine even for URLs starting with "/users".</p></div>
 <h3 id="_ruby_on_rails_specific_options">5.14. Ruby on Rails-specific options</h3>
 <h4 id="_railsautodetect_lt_on_off_gt">5.14.1. RailsAutoDetect &lt;on|off&gt;</h4>
 <div class="paragraph"><p>Whether Phusion Passenger should automatically detect whether a virtual host&#8217;s
@@ -2606,7 +2702,10 @@ following command to give your Rails application folder that context:</p></div>
 <h3 id="conflicting_apache_modules">6.4. Conflicting Apache modules</h3>
 <h4 id="_mod_userdir">6.4.1. mod_userdir</h4>
 <div class="paragraph"><p><em>mod_userdir</em> is not compatible with Phusion Passenger at the moment.</p></div>
-<h4 id="_virtualdocumentroot">6.4.2. VirtualDocumentRoot</h4>
+<h4 id="_multiviews_mod_negotiation">6.4.2. MultiViews (mod_negotiation)</h4>
+<div class="paragraph"><p>MultiViews is not compatible with Phusion Passenger. You should disable MultiViews
+for all Phusion Passenger hosts.</p></div>
+<h4 id="_virtualdocumentroot">6.4.3. VirtualDocumentRoot</h4>
 <div class="paragraph"><p>VirtualDocumentRoot is not compatible with Phusion Passenger at the moment.</p></div>
 </div>
 <h2 id="_analysis_and_system_maintenance_tools">7. Analysis and system maintenance tools</h2>
@@ -3482,7 +3581,7 @@ has no effect.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-08-31 15:39:27 CEST
+Last updated 2009-11-18 14:52:26 CEST
 </div>
 </div>
 </body>

data/doc/Users guide Apache.txt

@@ -345,13 +345,23 @@ are run, is ``production''. You can change this by changing the
 
 === Deploying to a virtual host's root ===
 
-Add a virtual host entry to your Apache configuration file. The virtual host's
-document root must point to your Ruby on Rails application's 'public' folder.
+Add a virtual host entry to your Apache configuration file. Make sure that the
+following conditions are met:
+
+- The virtual host's document root must point to your Ruby on Rails application's
+  'public' folder.
+- The Apache per-directory permissions must allow access to this folder.
+- MultiViews must be disabled for this folder.
+
 For example:
 -------------------------------------------
 <VirtualHost *:80>
     ServerName www.mycook.com
     DocumentRoot /webapps/mycook/public
+    <Directory /webapps/mycook/public>
+        Allow from all
+        Options -MultiViews
+    </Directory>
 </VirtualHost>
 -------------------------------------------
 
@@ -373,6 +383,9 @@ Suppose that you already have a virtual host:
 <VirtualHost *:80>
     ServerName www.phusion.nl
     DocumentRoot /websites/phusion
+    <Directory /websites/phusion>
+        Allow from all
+    </Directory>
 </VirtualHost>
 -------------------------------------------
 
@@ -385,12 +398,25 @@ folder to a directory in the document root. For example:
 ln -s /webapps/mycook/public /websites/phusion/rails
 -------------------------------------------
 
-Next, add a <<RailsBaseURI,RailsBaseURI>> option to the virtual host configuration:
+Next, add a <<RailsBaseURI,RailsBaseURI>> option to the virtual host configuration,
+and also make sure that:
+
+- The Apache per-directory permissions allow access to this folder.
+- MultiViews is disabled for this folder.
+
+For example:
 -------------------------------------------
 <VirtualHost *:80>
     ServerName www.phusion.nl
     DocumentRoot /websites/phusion
-    RailsBaseURI /rails                # This line has been added.
+    <Directory /websites/phusion>
+        Allow from all
+    </Directory>
+    
+    RailsBaseURI /rails                   # <-- These lines have
+    <Directory /websites/phusion/rails>   # <-- been added.
+        Options -MultiViews               # <--
+    </Directory>                          # <--
 </VirtualHost>
 -------------------------------------------
 Then restart Apache. The application has now been deployed.
@@ -515,6 +541,10 @@ the Apache configuration file:
 <VirtualHost *:80>
     ServerName www.rackexample.com
     DocumentRoot /webapps/rack_example/public
+    <Directory /webapps/rack_example/public>
+        Allow from all
+        Options -MultiViews
+    </Directory>
 </VirtualHost>
 -------------------------------------------
 
@@ -523,13 +553,23 @@ under the URL 'http://www.rackexample.com/'.
 
 === Deploying to a virtual host's root ===
 
-Add a virtual host entry to your Apache configuration file. The virtual host's
-document root must point to your Rack application's 'public' folder.
+Add a virtual host entry to your Apache configuration file. Make sure that the
+following conditions are met:
+
+- The virtual host's document root must point to your Rack application's
+  'public' folder.
+- The Apache per-directory permissions must allow access to this folder.
+- MultiViews must be disabled for this folder.
+
 For example:
 -------------------------------------------
 <VirtualHost *:80>
     ServerName www.rackapp.com
     DocumentRoot /webapps/rackapp/public
+    <Directory /webapps/rackapp/public>
+        Allow from all
+        Options -MultiViews
+    </Directory>
 </VirtualHost>
 -------------------------------------------
 
@@ -551,6 +591,9 @@ Suppose that you already have a virtual host:
 <VirtualHost *:80>
     ServerName www.phusion.nl
     DocumentRoot /websites/phusion
+    <Directory /websites/phusion>
+        Allow from all
+    </Directory>
 </VirtualHost>
 -------------------------------------------
 
@@ -563,12 +606,25 @@ folder to a directory in the document root. For example:
 ln -s /webapps/rackapp/public /websites/phusion/rack
 -------------------------------------------
 
-Next, add a <<RackBaseURI,RackBaseURI>> option to the virtual host configuration:
+Next, add a <<RackBaseURI,RackBaseURI>> option to the virtual host configuration,
+and also make sure that:
+
+- The Apache per-directory permissions allow access to this folder.
+- MultiViews is disabled for this folder.
+
+For example:
 -------------------------------------------
 <VirtualHost *:80>
     ServerName www.phusion.nl
     DocumentRoot /websites/phusion
-    RackBaseURI /rack                # This line has been added.
+    <Directory /websites/phusion>
+        Allow from all
+    </Directory>
+
+    RackBaseURI /rails                    # <-- These lines have
+    <Directory /websites/phusion/rails>   # <-- been added.
+        Options -MultiViews               # <--
+    </Directory>                          # <--
 </VirtualHost>
 -------------------------------------------
 Then restart Apache. The application has now been deployed.
@@ -1125,7 +1181,7 @@ With this, http://www.example.com/users/fujikura%2fyuu will work properly, and
 accessing http://www.example.com/about will properly display the result of
 http://www.example.com/info/about. Notice that PassengerAllowEncodedSlashes only
 interferes with passthrough rules, not with any other mod_rewrite rules. The rules for
-displaying maintenance.html will work fine even URLs starting with "/users".
+displaying maintenance.html will work fine even for URLs starting with "/users".
 
 
 === Ruby on Rails-specific options ===
@@ -1660,6 +1716,11 @@ chcon -R -h -t httpd_sys_content_t /path/to/your/rails/app
 
 'mod_userdir' is not compatible with Phusion Passenger at the moment.
 
+==== MultiViews (mod_negotiation) ====
+
+MultiViews is not compatible with Phusion Passenger. You should disable MultiViews
+for all Phusion Passenger hosts.
+
 ==== VirtualDocumentRoot ====
 
 VirtualDocumentRoot is not compatible with Phusion Passenger at the moment.