passenger 3.0.8 → 3.0.9

data/test/cxx/TestSupport.cpp

@@ -1,5 +1,6 @@
 #include <dirent.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <pwd.h>
 #include <grp.h>
 #include "TestSupport.h"
@@ -54,6 +55,52 @@ readAll(int fd) {
 	return result;
 }
 
+void
+writeUntilFull(int fd) {
+	int flags, ret;
+	char buf[1024];
+	
+	memset(buf, 0, sizeof(buf));
+	flags = fcntl(fd, F_GETFL);
+	fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+	
+	while (true) {
+		ret = write(fd, buf, sizeof(buf));
+		if (ret == -1) {
+			int e = errno;
+			if (e == EAGAIN) {
+				break;
+			} else {
+				throw SystemException("write() failed", e);
+			}
+		}
+	}
+	while (true) {
+		ret = write(fd, buf, 50);
+		if (ret == -1) {
+			int e = errno;
+			if (e == EAGAIN) {
+				break;
+			} else {
+				throw SystemException("write() failed", e);
+			}
+		}
+	}
+	while (true) {
+		ret = write(fd, buf, 1);
+		if (ret == -1) {
+			int e = errno;
+			if (e == EAGAIN) {
+				break;
+			} else {
+				throw SystemException("write() failed", e);
+			}
+		}
+	}
+	
+	fcntl(fd, F_SETFL, flags);
+}
+
 string
 replaceString(const string &str, const string &toFind, const string &replaceWith) {
 	string::size_type pos = str.find(toFind);

data/test/cxx/TestSupport.h

@@ -92,6 +92,14 @@ string readAll(const string &filename);
  */
 string readAll(int fd);
 
+/**
+ * Writes zeroes into the given file descriptor its buffer is full (i.e.
+ * the next write will block).
+ *
+ * @throws SystemException
+ */
+void writeUntilFull(int fd);
+
 /**
  * Look for 'toFind' inside 'str', replace it with 'replaceWith' and return the result.
  * Only the first occurence of 'toFind' is replaced.

data/test/ruby/analytics_logger_spec.rb

@@ -76,9 +76,10 @@ describe AnalyticsLogger do
 		mock_time(TODAY)
 		
 		@logger.new_transaction("foobar").close(true)
-		shared_data = @logger.instance_variable_get(:"@shared_data")
-		shared_data.synchronize do
-			shared_data.client.close
+		connection = @logger.instance_variable_get(:"@connection")
+		connection.synchronize do
+			connection.channel.close
+			connection.channel = nil
 		end
 		
 		log = @logger.new_transaction("foobar")
@@ -92,24 +93,6 @@ describe AnalyticsLogger do
 		File.read(log_file).should =~ /hello/
 	end
 	
-	specify "#new_transaction reestablishes the connection to the logging server if the logging server crashed and was restarted" do
-		mock_time(TODAY)
-		
-		@logger.new_transaction("foobar").close
-		kill_agent
-		start_agent
-		
-		log = @logger.new_transaction("foobar")
-		begin
-			log.message("hello")
-		ensure
-			log.close(true)
-		end
-		
-		log_file = "#{@log_dir}/1/#{FOOBAR_MD5}/#{LOCALHOST_MD5}/requests/2010/04/11/12/log.txt"
-		File.read(log_file).should =~ /hello/
-	end
-	
 	specify "#new_transaction does not reconnect to the server for a short period of time if connecting failed" do
 		@logger.reconnect_timeout = 60
 		@logger.max_connect_tries = 1
@@ -157,9 +140,10 @@ describe AnalyticsLogger do
 		log2 = @logger2.continue_transaction(log.txn_id, "foobar")
 		log2.close(true)
 		
-		shared_data = @logger2.instance_variable_get(:"@shared_data")
-		shared_data.synchronize do
-			shared_data.client.close
+		connection = @logger2.instance_variable_get(:"@connection")
+		connection.synchronize do
+			connection.channel.close
+			connection.channel = nil
 		end
 		
 		log2 = @logger2.continue_transaction(log.txn_id, "foobar")
@@ -173,7 +157,7 @@ describe AnalyticsLogger do
 		File.read(log_file).should =~ /hello/
 	end
 	
-	specify "#continue_transaction reestablishes the connection to the logging server if the logging server crashed and was restarted" do
+	specify "#new_transaction and #continue_transaction eventually reestablish the connection to the logging server if the logging server crashed and was restarted" do
 		mock_time(TODAY)
 		
 		log = @logger.new_transaction("foobar")
@@ -181,12 +165,20 @@ describe AnalyticsLogger do
 		kill_agent
 		start_agent
 		
+		log = @logger.new_transaction("foobar")
+		log.should be_null
+		log2 = @logger2.continue_transaction("1234-abcd", "foobar")
+		log2.should be_null
+		
+		mock_time(TODAY + 60)
+		log = @logger.new_transaction("foobar")
 		log2 = @logger2.continue_transaction(log.txn_id, "foobar")
 		begin
 			log2.message("hello")
 		ensure
 			log2.close(true)
 		end
+		log.close(true)
 		
 		log_file = "#{@log_dir}/1/#{FOOBAR_MD5}/#{LOCALHOST_MD5}/requests/2010/04/11/12/log.txt"
 		File.read(log_file).should =~ /hello/
@@ -243,9 +235,9 @@ describe AnalyticsLogger do
 	specify "#clear_connection closes the connection" do
 		@logger.new_transaction("foobar").close
 		@logger.clear_connection
-		shared_data = @logger.instance_variable_get(:"@shared_data")
-		shared_data.synchronize do
-			shared_data.client.should be_nil
+		connection = @logger.instance_variable_get(:"@connection")
+		connection.synchronize do
+			connection.channel.should be_nil
 		end
 	end
 end

data/test/tut/tut.h

@@ -1100,6 +1100,7 @@ private:
                 test_result::ex_ctor, ex);
             return tr;
         }
+        /*
         catch (const std::exception& ex)
         {
             // test failed with std::exception
@@ -1122,6 +1123,7 @@ private:
                 test_result::ex);
             return tr;
         }
+        */
 
         // test passed
         test_result tr(name_,ti->first, current_test_name, test_result::ok);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 3
   - 0
-  - 8
-  version: 3.0.8
+  - 9
+  version: 3.0.9
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 +02:00
+date: 2011-09-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,7 +118,6 @@ files:
 - build/packagetask.rb
 - build/packaging.rb
 - build/rake_extensions.rb
-- build/rdoctask.rb
 - build/rpm.rb
 - build/ruby_extension.rb
 - build/ruby_tests.rb
@@ -234,6 +233,7 @@ files:
 - bin/passenger-memory-stats
 - bin/passenger-status
 - doc/ApplicationPool algorithm.txt
+- doc/Architectural overview.html
 - doc/Architectural overview.txt
 - doc/definitions.h
 - doc/images/by_sa.png
@@ -274,11 +274,15 @@ files:
 - doc/images/spawn_server_architecture.svg
 - doc/images/typical_isolated_web_application.png
 - doc/images/typical_isolated_web_application.svg
+- doc/Security of user switching support.html
 - doc/Security of user switching support.txt
 - doc/Users guide Apache with comments.html
+- doc/Users guide Apache.html
 - doc/Users guide Apache.idmap.txt
 - doc/Users guide Apache.txt
+- doc/Users guide Nginx.html
 - doc/Users guide Nginx.txt
+- doc/Users guide Standalone.html
 - doc/Users guide Standalone.txt
 - doc/users_guide_snippets/analysis_and_system_maintenance.txt
 - doc/users_guide_snippets/appendix_a_about.txt
@@ -374,6 +378,7 @@ files:
 - ext/common/Utils/IOUtils.h
 - ext/common/Utils/MD5.h
 - ext/common/Utils/MemZeroGuard.h
+- ext/common/Utils/MessageIO.h
 - ext/common/Utils/ProcessMetricsCollector.h
 - ext/common/Utils/ScopeGuard.h
 - ext/common/Utils/StreamBoyerMooreHorspool.h
@@ -1133,10 +1138,10 @@ files:
 - test/cxx/FileDescriptorTest.cpp
 - test/cxx/FilterSupportTest.cpp
 - test/cxx/HttpHeaderBuffererTest.cpp
-- test/cxx/HttpStatusExtractorTest.cpp
 - test/cxx/IOUtilsTest.cpp
 - test/cxx/LoggingTest.cpp
 - test/cxx/MessageChannelTest.cpp
+- test/cxx/MessageIOTest.cpp
 - test/cxx/MessageReadersWritersTest.cpp
 - test/cxx/MessageServerTest.cpp
 - test/cxx/PoolOptionsTest.cpp
@@ -1504,11 +1509,6 @@ files:
 - test/stub/zsfa/header.png
 - test/stub/zsfa/index.html
 - test/stub/zsfa/zsfa.png
-- doc/Users guide Apache.html
-- doc/Users guide Nginx.html
-- doc/Users guide Standalone.html
-- doc/Security of user switching support.html
-- doc/Architectural overview.html
 has_rdoc: true
 homepage: http://www.modrails.com/
 licenses: []

data/build/rdoctask.rb

@@ -1,209 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rake'
-require 'rake/tasklib'
-
-module Rake
-
-  # Create a documentation task that will generate the RDoc files for
-  # a project.
-  #
-  # The RDocTask will create the following targets:
-  #
-  # [<b>:<em>rdoc</em></b>]
-  #   Main task for this RDOC task.  
-  #
-  # [<b>:clobber_<em>rdoc</em></b>]
-  #   Delete all the rdoc files.  This target is automatically
-  #   added to the main clobber target.
-  #
-  # [<b>:re<em>rdoc</em></b>]
-  #   Rebuild the rdoc files from scratch, even if they are not out
-  #   of date.
-  #
-  # Simple example:
-  #
-  #   Rake::RDocTask.new do |rd|
-  #     rd.main = "README.rdoc"
-  #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-  #   end
-  #
-  # The +rd+ object passed to the block is an RDocTask object. See the
-  # attributes list for the RDocTask class for available customization options.
-  #
-  # == Specifying different task names
-  #
-  # You may wish to give the task a different name, such as if you are
-  # generating two sets of documentation.  For instance, if you want to have a
-  # development set of documentation including private methods:
-  #
-  #   Rake::RDocTask.new(:rdoc_dev) do |rd|
-  #     rd.main = "README.doc"
-  #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-  #     rd.options << "--all"
-  #   end
-  #
-  # The tasks would then be named :<em>rdoc_dev</em>, :clobber_<em>rdoc_dev</em>, and
-  # :re<em>rdoc_dev</em>. 
-  #
-  # If you wish to have completely different task names, then pass a Hash as
-  # first argument. With the <tt>:rdoc</tt>, <tt>:clobber_rdoc</tt> and
-  # <tt>:rerdoc</tt> options, you can customize the task names to your liking.
-  # For example:
-  #
-  #   Rake::RDocTask.new(:rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force")
-  #
-  # This will create the tasks <tt>:rdoc</tt>, <tt>:rdoc_clean</tt> and
-  # <tt>:rdoc:force</tt>.
-  #
-  class RDocTask < TaskLib
-    # Name of the main, top level task.  (default is :rdoc)
-    attr_accessor :name
-
-    # Name of directory to receive the html output files. (default is "html")
-    attr_accessor :rdoc_dir
-
-    # Title of RDoc documentation. (defaults to rdoc's default)
-    attr_accessor :title
-
-    # Name of file to be used as the main, top level file of the
-    # RDoc. (default is none)
-    attr_accessor :main
-
-    # Name of template to be used by rdoc. (defaults to rdoc's default)
-    attr_accessor :template
-
-    # List of files to be included in the rdoc generation. (default is [])
-    attr_accessor :rdoc_files
-
-    # Additional list of options to be passed rdoc.  (default is [])
-    attr_accessor :options
-
-    # Whether to run the rdoc process as an external shell (default is false)
-    attr_accessor :external
-    
-    attr_accessor :inline_source
-
-    # Create an RDoc task with the given name. See the RDocTask class overview
-    # for documentation.
-    def initialize(name = :rdoc)  # :yield: self
-      if name.is_a?(Hash)
-        invalid_options = name.keys.map { |k| k.to_sym } - [:rdoc, :clobber_rdoc, :rerdoc]
-        if !invalid_options.empty?
-          raise ArgumentError, "Invalid option(s) passed to RDocTask.new: #{invalid_options.join(", ")}"
-        end
-      end
-      
-      @name = name
-      @rdoc_files = Rake::FileList.new
-      @rdoc_dir = 'html'
-      @main = nil
-      @title = nil
-      @template = nil
-      @external = false
-      @inline_source = true
-      @options = []
-      yield self if block_given?
-      define
-    end
-    
-    # Create the tasks defined by this task lib.
-    def define
-      if rdoc_task_name != "rdoc"
-        desc "Build the RDOC HTML Files"
-      else
-        desc "Build the #{rdoc_task_name} HTML Files"
-      end
-      task rdoc_task_name
-      
-      desc "Force a rebuild of the RDOC files"
-      task rerdoc_task_name => [clobber_task_name, rdoc_task_name]
-      
-      desc "Remove rdoc products" 
-      task clobber_task_name do
-        rm_r rdoc_dir rescue nil
-      end
-      
-      task :clobber => [clobber_task_name]
-      
-      directory @rdoc_dir
-      task rdoc_task_name => [rdoc_target]
-      file rdoc_target => @rdoc_files + [Rake.application.rakefile] do
-        rm_r @rdoc_dir rescue nil
-        @before_running_rdoc.call if @before_running_rdoc
-        args = option_list + @rdoc_files
-        if @external
-          argstring = args.join(' ')
-          sh %{ruby -Ivendor vender/rd #{argstring}}
-        else
-          require 'rdoc/rdoc'
-          RDoc::RDoc.new.document(args)
-        end
-      end
-      self
-    end
-
-    def option_list
-      result = @options.dup
-      result << "-o" << @rdoc_dir
-      result << "--main" << quote(main) if main
-      result << "--title" << quote(title) if title
-      result << "-T" << quote(template) if template
-      result << "--inline-source" if inline_source && !@options.include?("--inline-source") && !@options.include?("-S")
-      result
-    end
-
-    def quote(str)
-      if @external
-        "'#{str}'"
-      else
-        str
-      end
-    end
-
-    def option_string
-      option_list.join(' ')
-    end
-    
-    # The block passed to this method will be called just before running the
-    # RDoc generator. It is allowed to modify RDocTask attributes inside the
-    # block.
-    def before_running_rdoc(&block)
-      @before_running_rdoc = block
-    end
-
-    private
-    
-    def rdoc_target
-      "#{rdoc_dir}/index.html"
-    end
-    
-    def rdoc_task_name
-      case name
-      when Hash
-        (name[:rdoc] || "rdoc").to_s
-      else
-        name.to_s
-      end
-    end
-    
-    def clobber_task_name
-      case name
-      when Hash
-        (name[:clobber_rdoc] || "clobber_rdoc").to_s
-      else
-        "clobber_#{name}"
-      end
-    end
-    
-    def rerdoc_task_name
-      case name
-      when Hash
-        (name[:rerdoc] || "rerdoc").to_s
-      else
-        "re#{name}"
-      end
-    end
-
-  end
-end