0
@@ -21,7 +21,7 @@
0
 
0
 namespace Passenger {
0
 
0
-int _debugLevel = 2;
0
+int _debugLevel = 1;
0
 ostream *_logStream = &cerr;
0
 ostream *_debugStream = &cerr;
0
 

0
@@ -21,6 +21,7 @@ require 'passenger/application_spawner'
0
 require 'passenger/html_template'
0
 require 'passenger/exceptions'
0
 require 'passenger/utils'
0
+require 'passenger/platform_info'
0
 module Passenger
0
 
0
 # This class is capable of spawning Ruby on Rails application instances.

0
@@ -38,7 +38,7 @@
0
       if (ret == 0) {
0
         break;
0
       } else if (ret == -1) {
0
-				throw strerror(errno);
0
+				throw SystemException("Cannot read from socket", errno);
0
       } else {
0
         result.append(buf, ret);
0
       }
0
@@ -50,11 +50,11 @@
0
     // Calling ApplicationPool.get() once should return a valid Session.
0
     Application::SessionPtr session(pool->get("stub/railsapp"));
0
     session->sendHeaders(createRequestHeaders());
0
-		session->closeWriter();
0
-		
0
-		int reader = session->getReader();
0
+		session->shutdownWriter();
0
+	
0
+		int reader = session->getStream();
0
     string result(readAll(reader));
0
-		session->closeReader();
0
+		session->closeStream();
0
     ensure(result.find("hello world") != string::npos);
0
   }
0
   
0
@@ -96,12 +96,12 @@
0
     ensure_equals("Before the sessions were closed, both apps were in the pool", pool->getCount(), 2u);
0
     
0
     session->sendHeaders(createRequestHeaders());
0
-		string result(readAll(session->getReader()));
0
+		string result(readAll(session->getStream()));
0
     ensure("Session 1 belongs to the correct app", result.find("hello world"));
0
     session.reset();
0
     
0
     session2->sendHeaders(createRequestHeaders());
0
-		result = readAll(session2->getReader());
0
+		result = readAll(session2->getStream());
0
     ensure("Session 2 belongs to the correct app", result.find("this is railsapp2"));
0
     session2.reset();
0
   }
0
@@ -232,11 +232,11 @@
0
     pool2.reset();
0
     
0
     session->sendHeaders(createRequestHeaders());
0
-		session->closeWriter();
0
+		session->shutdownWriter();
0
     
0
-		int reader = session->getReader();
0
+		int reader = session->getStream();
0
     string result(readAll(reader));
0
-		session->closeReader();
0
+		session->closeStream();
0
     ensure(result.find("hello world") != string::npos);
0
   }
0
   
0
@@ -319,7 +319,7 @@
0
       "stub/railsapp/app/controllers/bar_controller.rb");
0
     Application::SessionPtr session = pool->get("stub/railsapp");
0
     session->sendHeaders(createRequestHeaders("/bar"));
0
-		string result = readAll(session->getReader());
0
+		string result = readAll(session->getStream());
0
     ensure(result.find("bar 1!"));
0
     session.reset();
0
     
0
@@ -328,7 +328,7 @@
0
     system("touch stub/railsapp/tmp/restart.txt");
0
     session = pool->get("stub/railsapp");
0
     session->sendHeaders(createRequestHeaders("/bar"));
0
-		result = readAll(session->getReader());
0
+		result = readAll(session->getStream());
0
     ensure("App code has been reloaded", result.find("bar 2!"));
0
     unlink("stub/railsapp/app/controllers/bar_controller.rb");
0
   }

0
@@ -1,5 +1,6 @@
0
 #!/usr/bin/env ruby
0
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
0
+$LOAD_PATH << "#{File.dirname(__FILE__)}/../../ext"
0
 require 'passenger/message_channel'
0
 require 'passenger/utils'
0
 

0
@@ -1,5 +1,6 @@
0
 #!/usr/bin/env ruby
0
 $LOAD_PATH << "#{File.dirname(__FILE__)}/../../lib"
0
+$LOAD_PATH << "#{File.dirname(__FILE__)}/../../ext"
0
 require 'passenger/spawn_manager'
0
 
0
 include Passenger