passenger 2.0.2 → 2.0.3

data/Rakefile

@@ -27,7 +27,7 @@ require 'passenger/platform_info'
 ##### Configuration
 
 # Don't forget to edit Configuration.h too
-PACKAGE_VERSION = "2.0.2"
+PACKAGE_VERSION = "2.0.3"
 OPTIMIZE = ["yes", "on", "true"].include?(ENV['OPTIMIZE'])
 
 include PlatformInfo

data/bin/passenger-memory-stats

@@ -53,7 +53,7 @@ class Table
 			end
 		end
 		
-		format_string = max_column_widths.map{ |i| "%-#{i}s" }.join("  ")
+		format_string = max_column_widths.map{ |i| "%#{-i}s" }.join("  ")
 		header = sprintf(format_string, *@column_names).rstrip << "\n"
 		if title
 			free_space = header.size - title.size - 2
@@ -83,12 +83,17 @@ class MemoryStats
 		attr_accessor :ppid
 		attr_accessor :threads
 		attr_accessor :vm_size              # in KB
+		attr_accessor :rss                  # in KB
 		attr_accessor :name
 		attr_accessor :private_dirty_rss    # in KB
 		
 		def vm_size_in_mb
 			return sprintf("%.1f MB", vm_size / 1024.0)
 		end
+
+		def rss_in_mb
+			return sprintf("%.1f MB", rss / 1024.0)
+		end
 		
 		def private_dirty_rss_in_mb
 			if private_dirty_rss.is_a?(Numeric)
@@ -99,7 +104,7 @@ class MemoryStats
 		end
 		
 		def to_a
-			return [pid, ppid, threads, vm_size_in_mb, private_dirty_rss_in_mb, name]
+			return [pid, ppid, threads, vm_size_in_mb, private_dirty_rss_in_mb, rss_in_mb, name]
 		end
 	end
 	
@@ -146,19 +151,25 @@ class MemoryStats
 		end
 		
 		processes = []
-		list = `#{ps} -o pid,ppid,nlwp,vsz,command`.split("\n")
+		list = `#{ps} -w -o pid,ppid,nlwp,vsz,rss,command`.split("\n")
 		list.shift
 		list.each do |line|
 			line.gsub!(/^ */, '')
 			line.gsub!(/ *$/, '')
 			
 			p = Process.new
-			p.pid, p.ppid, p.threads, p.vm_size, p.name = line.split(/ +/, 5)
+			p.pid, p.ppid, p.threads, p.vm_size, p.rss, p.name = line.split(/ +/, 6)
+			p.name.sub!(/\Aruby: /, '')
+			p.name.sub!(/ \(ruby\)\Z/, '')
 			if p.name !~ /^ps/ && (!options[:match] || p.name.match(options[:match]))
-				[:pid, :ppid, :threads, :vm_size].each do |attr|
+				# Convert some values to integer.
+				[:pid, :ppid, :threads, :vm_size, :rss].each do |attr|
 					p.send("#{attr}=", p.send(attr).to_i)
 				end
-				p.private_dirty_rss = determine_private_dirty_rss(p.pid)
+
+				if platform_provides_private_dirty_rss_information?
+					p.private_dirty_rss = determine_private_dirty_rss(p.pid)
+				end
 				processes << p
 			end
 		end
@@ -166,6 +177,10 @@ class MemoryStats
 	end
 
 private
+	def platform_provides_private_dirty_rss_information?
+		return RUBY_PLATFORM =~ /linux/
+	end
+
 	# Returns the private dirty RSS for the given process, in KB.
 	def determine_private_dirty_rss(pid)
 		total = 0
@@ -185,29 +200,36 @@ private
 	end
 	
 	def print_process_list(title, processes, options = {})
-		table = Table.new(%w{PID PPID Threads VMSize Private Name})
+		table = Table.new(%w{PID PPID Threads VMSize Private Resident Name})
 		table.add_rows(processes)
 		if options.has_key?(:show_ppid) && !options[:show_ppid]
 			table.remove_column('PPID')
 		end
+		if platform_provides_private_dirty_rss_information?
+			table.remove_column('Resident')
+		else
+			table.remove_column('Private')
+		end
 		puts table.to_s(title)
 		
-		total_private_dirty_rss = 0
-		some_private_dirty_rss_cannot_be_determined = false
-		processes.each do |p|
-			if p.private_dirty_rss.is_a?(Numeric)
-				total_private_dirty_rss += p.private_dirty_rss
+		if platform_provides_private_dirty_rss_information?
+			total_private_dirty_rss = 0
+			some_private_dirty_rss_cannot_be_determined = false
+			processes.each do |p|
+				if p.private_dirty_rss.is_a?(Numeric)
+					total_private_dirty_rss += p.private_dirty_rss
+				else
+					some_private_dirty_rss_cannot_be_determined = true
+				end
+			end
+			puts   "### Processes: #{processes.size}"
+			printf "### Total private dirty RSS: %.2f MB", total_private_dirty_rss / 1024.0
+			if some_private_dirty_rss_cannot_be_determined
+				puts " (?)"
 			else
-				some_private_dirty_rss_cannot_be_determined = true
+				puts
 			end
 		end
-		puts   "### Processes: #{processes.size}"
-		printf "### Total private dirty RSS: %.2f MB", total_private_dirty_rss / 1024.0
-		if some_private_dirty_rss_cannot_be_determined
-			puts " (?)"
-		else
-			puts
-		end
 	end
 end
 

data/doc/Security of user switching support.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.5" />
+<meta name="generator" content="AsciiDoc 8.2.7" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +26,12 @@ a:visited {
 
 em {
   font-style: italic;
+  color: navy;
 }
 
 strong {
   font-weight: bold;
+  color: #083194;
 }
 
 tt {
@@ -71,6 +73,10 @@ p {
   margin-bottom: 0.5em;
 }
 
+ul, ol, li > p {
+  margin-top: 0;
+}
+
 pre {
   padding: 0;
   margin: 0;
@@ -123,6 +129,7 @@ div.content { /* Block element content. */
 
 /* Block element titles. */
 div.title, caption.title {
+  color: #527bbd;
   font-family: sans-serif;
   font-weight: bold;
   text-align: left;
@@ -158,13 +165,25 @@ div.listingblock > div.content {
   padding: 0.5em;
 }
 
-div.quoteblock > div.content {
+div.quoteblock {
   padding-left: 2.0em;
 }
-
-div.attribution {
+div.quoteblock > div.attribution {
+  padding-top: 0.5em;
   text-align: right;
 }
+
+div.verseblock {
+  padding-left: 2.0em;
+}
+div.verseblock > div.content {
+  white-space: pre;
+}
+div.verseblock > div.attribution {
+  padding-top: 0.75em;
+  text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 div.verseblock + div.attribution {
   text-align: left;
 }
@@ -187,10 +206,6 @@ div.exampleblock > div.content {
   padding: 0.5em;
 }
 
-div.verseblock div.content {
-  white-space: pre;
-}
-
 div.imageblock div.content { padding-left: 0; }
 div.imageblock img { border: 1px solid silver; }
 span.image img { border-style: none; }
@@ -202,16 +217,19 @@ dl {
 dt {
   margin-top: 0.5em;
   margin-bottom: 0;
-  font-style: italic;
+  font-style: normal;
 }
 dd > *:first-child {
-  margin-top: 0;
+  margin-top: 0.1em;
 }
 
 ul, ol {
     list-style-position: outside;
 }
-div.olist2 ol {
+div.olist > ol {
+  list-style-type: decimal;
+}
+div.olist2 > ol {
   list-style-type: lower-alpha;
 }
 
@@ -231,11 +249,11 @@ div.hlist {
   margin-bottom: 0.8em;
 }
 div.hlist td {
-  padding-bottom: 5px;
+  padding-bottom: 15px;
 }
 td.hlist1 {
   vertical-align: top;
-  font-style: italic;
+  font-style: normal;
   padding-right: 0.8em;
 }
 td.hlist2 {
@@ -279,6 +297,7 @@ div.sidebar-content {
   padding: 0.5em;
 }
 div.sidebar-title, div.image-title {
+  color: #527bbd;
   font-family: sans-serif;
   font-weight: bold;
   margin-top: 0.0em;
@@ -291,8 +310,17 @@ div.listingblock div.content {
   padding: 0.5em;
 }
 
-div.quoteblock-content {
-  padding-left: 2.0em;
+div.quoteblock-attribution {
+  padding-top: 0.5em;
+  text-align: right;
+}
+
+div.verseblock-content {
+  white-space: pre;
+}
+div.verseblock-attribution {
+  padding-top: 0.75em;
+  text-align: left;
 }
 
 div.exampleblock-content {
@@ -302,6 +330,14 @@ div.exampleblock-content {
 
 /* IE6 sets dynamically generated links as visited. */
 div#toc a:visited { color: blue; }
+
+/* Because IE6 child selector is broken. */
+div.olist2 ol {
+  list-style-type: lower-alpha;
+}
+div.olist2 div.olist ol {
+  list-style-type: decimal;
+}
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -372,6 +408,8 @@ function generateToc(toclevels) {
     div.className = "toclevel" + entry.toclevel;
     toc.appendChild(div);
   }
+  if (entries.length == 0)
+    document.getElementById("header").removeChild(toc);
 }
 /*]]>*/
 </script>
@@ -598,7 +636,7 @@ feel free to discuss it with us.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-07-14 11:07:37 CEST
+Last updated 2008-08-09 14:31:10 CEST
 </div>
 </div>
 </body>

data/doc/Users guide.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.5" />
+<meta name="generator" content="AsciiDoc 8.2.7" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +26,12 @@ a:visited {
 
 em {
   font-style: italic;
+  color: navy;
 }
 
 strong {
   font-weight: bold;
+  color: #083194;
 }
 
 tt {
@@ -71,6 +73,10 @@ p {
   margin-bottom: 0.5em;
 }
 
+ul, ol, li > p {
+  margin-top: 0;
+}
+
 pre {
   padding: 0;
   margin: 0;
@@ -123,6 +129,7 @@ div.content { /* Block element content. */
 
 /* Block element titles. */
 div.title, caption.title {
+  color: #527bbd;
   font-family: sans-serif;
   font-weight: bold;
   text-align: left;
@@ -158,13 +165,25 @@ div.listingblock > div.content {
   padding: 0.5em;
 }
 
-div.quoteblock > div.content {
+div.quoteblock {
   padding-left: 2.0em;
 }
-
-div.attribution {
+div.quoteblock > div.attribution {
+  padding-top: 0.5em;
   text-align: right;
 }
+
+div.verseblock {
+  padding-left: 2.0em;
+}
+div.verseblock > div.content {
+  white-space: pre;
+}
+div.verseblock > div.attribution {
+  padding-top: 0.75em;
+  text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 div.verseblock + div.attribution {
   text-align: left;
 }
@@ -187,10 +206,6 @@ div.exampleblock > div.content {
   padding: 0.5em;
 }
 
-div.verseblock div.content {
-  white-space: pre;
-}
-
 div.imageblock div.content { padding-left: 0; }
 div.imageblock img { border: 1px solid silver; }
 span.image img { border-style: none; }
@@ -202,16 +217,19 @@ dl {
 dt {
   margin-top: 0.5em;
   margin-bottom: 0;
-  font-style: italic;
+  font-style: normal;
 }
 dd > *:first-child {
-  margin-top: 0;
+  margin-top: 0.1em;
 }
 
 ul, ol {
     list-style-position: outside;
 }
-div.olist2 ol {
+div.olist > ol {
+  list-style-type: decimal;
+}
+div.olist2 > ol {
   list-style-type: lower-alpha;
 }
 
@@ -231,11 +249,11 @@ div.hlist {
   margin-bottom: 0.8em;
 }
 div.hlist td {
-  padding-bottom: 5px;
+  padding-bottom: 15px;
 }
 td.hlist1 {
   vertical-align: top;
-  font-style: italic;
+  font-style: normal;
   padding-right: 0.8em;
 }
 td.hlist2 {
@@ -279,6 +297,7 @@ div.sidebar-content {
   padding: 0.5em;
 }
 div.sidebar-title, div.image-title {
+  color: #527bbd;
   font-family: sans-serif;
   font-weight: bold;
   margin-top: 0.0em;
@@ -291,8 +310,17 @@ div.listingblock div.content {
   padding: 0.5em;
 }
 
-div.quoteblock-content {
-  padding-left: 2.0em;
+div.quoteblock-attribution {
+  padding-top: 0.5em;
+  text-align: right;
+}
+
+div.verseblock-content {
+  white-space: pre;
+}
+div.verseblock-attribution {
+  padding-top: 0.75em;
+  text-align: left;
 }
 
 div.exampleblock-content {
@@ -302,6 +330,14 @@ div.exampleblock-content {
 
 /* IE6 sets dynamically generated links as visited. */
 div#toc a:visited { color: blue; }
+
+/* Because IE6 child selector is broken. */
+div.olist2 ol {
+  list-style-type: lower-alpha;
+}
+div.olist2 div.olist ol {
+  list-style-type: decimal;
+}
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -372,6 +408,8 @@ function generateToc(toclevels) {
     div.className = "toclevel" + entry.toclevel;
     toc.appendChild(div);
   }
+  if (entries.length == 0)
+    document.getElementById("header").removeChild(toc);
 }
 /*]]>*/
 </script>
@@ -2059,7 +2097,7 @@ Attribution-Share Alike 3.0 Unported License</a>.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-07-14 11:07:38 CEST
+Last updated 2008-08-09 14:31:11 CEST
 </div>
 </div>
 </body>

data/ext/apache2/Configuration.h

@@ -31,7 +31,7 @@
  */
 
 /** Module version number. */
-#define PASSENGER_VERSION "2.0.2"
+#define PASSENGER_VERSION "2.0.3"
 
 #ifdef __cplusplus
 	#include <set>

data/lib/passenger/spawn_manager.rb

@@ -187,13 +187,7 @@ private
 		if spawn_method == "smart"
 			spawner_must_be_started = true
 			framework_version = Application.detect_framework_version(app_root)
-			if framework_version == :vendor
-				vendor_path = normalize_path("#{app_root}/vendor/rails")
-				key = "vendor:#{vendor_path}"
-				create_spawner = proc do
-					Railz::FrameworkSpawner.new(:vendor => vendor_path)
-				end
-			elsif framework_version.nil?
+			if framework_version.nil? || framework_version == :vendor
 				app_root = normalize_path(app_root)
 				key = "app:#{app_root}"
 				create_spawner = proc do

data/lib/passenger/wsgi/request_handler.py

@@ -2,6 +2,8 @@
 import socket, os, random, sys, struct, select, imp
 import exceptions, traceback
 
+from socket import _fileobject
+
 class RequestHandler:
 	def __init__(self, socket_file, server, owner_pipe, app):
 		self.socket_file = socket_file
@@ -25,13 +27,17 @@ class RequestHandler:
 					done = True
 					break
 				try:
-					env, input_stream = self.parse_request(client)
-					self.process_request(env, input_stream, client)
-				except KeyboardInterrupt:
-					done = True
-				except Exception, e:
-					traceback.print_tb(sys.exc_info()[2])
-					sys.stderr.write(str(e.__class__) + ": " + e.message + "\n")
+					try:
+						env, input_stream = self.parse_request(client)
+						if env:
+							self.process_request(env, input_stream, client)
+						else:
+							done = True
+					except KeyboardInterrupt:
+						done = True
+					except Exception, e:
+						traceback.print_tb(sys.exc_info()[2])
+						sys.stderr.write(str(e.__class__) + ": " + e.message + "\n")
 				finally:
 					try:
 						client.close()
@@ -51,12 +57,16 @@ class RequestHandler:
 		buf = ''
 		while len(buf) < 4:
 			tmp = client.recv(4 - len(buf))
+			if len(tmp) == 0:
+				return (None, None)
 			buf += tmp
 		header_size = struct.unpack('>I', buf)[0]
 		
 		buf = ''
 		while len(buf) < header_size:
 			tmp = client.recv(header_size - len(buf))
+			if len(tmp) == 0:
+				return (None, None)
 			buf += tmp
 		
 		headers = buf.split("\0")
@@ -70,16 +80,30 @@ class RequestHandler:
 		return (env, client)
 	
 	def process_request(self, env, input_stream, output_stream):
-		env['wsgi.input']        = input_stream
-		env['wsgi.errors']       = sys.stderr
-		env['wsgi.version']      = (1, 0)
-		env['wsgi.multithread']  = False
+		# The WSGI speculation says that the input paramter object passed needs to
+		# implement a few file-like methods. This is the reason why we "wrap" the socket._socket
+		# into the _fileobject to solve this.
+		#
+		# Otherwise, the POST data won't be correctly retrieved by Django.
+		#
+		# See: http://www.python.org/dev/peps/pep-0333/#input-and-error-streams
+		env['wsgi.input']		 = _fileobject(input_stream,'r',512)
+		env['wsgi.errors']		 = sys.stderr
+		env['wsgi.version']		 = (1, 0)
+		env['wsgi.multithread']	 = False
 		env['wsgi.multiprocess'] = True
-		env['wsgi.run_once']     = True
+		env['wsgi.run_once']	 = True
 		if env.get('HTTPS','off') in ('on', '1'):
 			env['wsgi.url_scheme'] = 'https'
 		else:
 			env['wsgi.url_scheme'] = 'http'
+			
+
+		# The following environment variables are required by WSCI PEP #333 
+		# see: http://www.python.org/dev/peps/pep-0333/#environ-variables
+		if 'HTTP_CONTENT_LENGTH' in env:
+			env['CONTENT_LENGTH'] = env.get('HTTP_CONTENT_LENGTH')
+			
 		
 		headers_set = []
 		headers_sent = []
@@ -124,14 +148,22 @@ class RequestHandler:
 			if hasattr(result, 'close'):
 				result.close()
 
+def import_error_handler(environ, start_response):
+	write = start_response('500 Import Error', [('Content-type', 'text/plain')])
+	write("An error occurred importing your passenger_wsgi.py")
+	raise KeyboardInterrupt # oh WEIRD.
+
 if __name__ == "__main__":
 	socket_file = sys.argv[1]
 	server = socket.fromfd(int(sys.argv[2]), socket.AF_UNIX, socket.SOCK_STREAM)
 	owner_pipe = int(sys.argv[3])
 	
-	app_module = imp.load_source('passenger_wsgi', 'passenger_wsgi.py')
-	
-	handler = RequestHandler(socket_file, server, owner_pipe, app_module.application)
+	try:
+		app_module = imp.load_source('passenger_wsgi', 'passenger_wsgi.py')
+		handler = RequestHandler(socket_file, server, owner_pipe, app_module.application)
+	except:
+		handler = RequestHandler(socket_file, server, owner_pipe, import_error_handler)
+
 	try:
 		handler.main_loop()
 	finally:

data/test/ApplicationPoolTest.cpp

@@ -45,6 +45,14 @@
 		}
 		return result;
 	}
+	
+	static Application::SessionPtr spawnRackApp(ApplicationPoolPtr pool, const char *appRoot) {
+		return pool->get(appRoot, true, "nobody", "production", "smart", "rack");
+	}
+	
+	static Application::SessionPtr spawnWsgiApp(ApplicationPoolPtr pool, const char *appRoot) {
+		return pool->get(appRoot, true, "nobody", "production", "smart", "wsgi");
+	}
 
 	TEST_METHOD(1) {
 		// Calling ApplicationPool.get() once should return a valid Session.
@@ -162,7 +170,7 @@
 		}
 		
 		void operator()() {
-			m_session = pool->get("stub/minimal-railsapp");
+			m_session = spawnWsgiApp(pool, "stub/wsgi");
 			m_done = true;
 		}
 	};
@@ -173,8 +181,8 @@
 		// in the pool, then the pool will wait until enough sessions
 		// have been closed.
 		pool->setMax(2);
-		Application::SessionPtr session1(pool->get("stub/railsapp"));
-		Application::SessionPtr session2(pool2->get("stub/railsapp"));
+		Application::SessionPtr session1(spawnRackApp(pool, "stub/rack"));
+		Application::SessionPtr session2(spawnRackApp(pool2, "stub/rack"));
 		Application::SessionPtr session3;
 		bool done;
 		
@@ -333,7 +341,7 @@
 	TEST_METHOD(16) {
 		// The cleaner thread should clean idle applications without crashing.
 		pool->setMaxIdleTime(1);
-		pool->get("stub/minimal-railsapp");
+		spawnRackApp(pool, "stub/rack");
 		
 		time_t begin = time(NULL);
 		while (pool->getCount() == 1u && time(NULL) - begin < 10) {

data/test/stub/vendor_rails/minimal/railties/lib/initializer.rb

@@ -29,6 +29,7 @@ module Rails
 			if defined?(RAILS_ROOT)
 				$LOAD_PATH << "#{RAILS_ROOT}/app/controllers"
 			end
+			$LOAD_PATH << "#{RAILS_FRAMEWORK_ROOT}/railties/lib"
 		end
 	
 	protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-14 00:00:00 +02:00
+date: 2008-08-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -830,6 +830,7 @@ files:
 - test/stub/railsapp2/tmp
 - test/stub/railsapp2/vendor
 - test/stub/wsgi/public
+- test/stub/wsgi/passenger_wsgi.pyc
 - test/stub/wsgi/tmp
 - test/stub/wsgi/passenger_wsgi.py
 - test/stub/rails_apps/mycook