swiftiply 0.6.1 → 0.6.1.1

data/src/swiftcore/Swiftiply.rb

@@ -18,7 +18,7 @@ end
 
 module Swiftcore
 	module Swiftiply
-		Version = '0.6.1'
+		Version = '0.6.1.1'
 
 		# Yeah, these constants look kind of tacky.  Inside of tight loops,
 		# though, using them makes a small but measurable difference, and those
@@ -407,7 +407,8 @@ module Swiftcore
 					@data.unshift data
 					push
 				else
-					if data =~ /^Host:\s*([^\r:]*)/
+					# Note the \0 below.  intern() blows up when passed a \0.  People who are trying to break a server like to pass \0s.  This should cope with that.
+					if data =~ /^Host:\s*([^\r\0:]*)/
 						# NOTE: Should I be using intern for this?  It might not
 						# be a good idea.
 						@name = $1.intern

data/src/swiftcore/evented_mongrel.rb

@@ -82,14 +82,19 @@ module Mongrel
 	end
 
 	class HttpServer
-		def initialize(host, port, num_processors=(2**30-1), timeout=0)
+		def initialize(host, port, num_processors=950, x=0, y=nil) # Deal with Mongrel 1.0.1 or earlier, as well as later.
 			@socket = nil
 			@classifier = URIClassifier.new
 			@host = host
 			@port = port
 			@workers = ThreadGroup.new
-			@timeout = timeout
-			@num_processors = num_processors
+			if y
+				@throttle = x
+				@timeout = y || 60
+			else
+				@timeout = x
+			end
+			@num_processors = num_processors #num_processors is pointless for evented....
 			@death_time = 60
 			self.class.const_set(:Instance,self)
 		end
@@ -98,6 +103,8 @@ module Mongrel
 			trap('INT') { raise StopServer }
 			trap('TERM') { raise StopServer }
 			@acceptor = Thread.new do
+				EventMachine.epoll
+				EventMachine.set_descriptor_table_size(4096)
 				EventMachine.run do
 					begin
 						EventMachine.start_server(@host,@port,MongrelProtocol)

data/src/swiftcore/swiftiplied_mongrel.rb

@@ -94,14 +94,19 @@ module Mongrel
 		# a key.  If someone want to donate any patches.  Otherwise, this won't
 		# really be useful to most people until 0.7.0.
 		
-		def initialize(host, port, num_processors=(2**30-1), timeout=0,key = '')
+		def initialize(host, port, num_processors=950, x=0, y=nil,key='') # Deal with Mongrel 1.0.1 or earlier, as well as later.
 			@socket = nil
 			@classifier = URIClassifier.new
 			@host = host
 			@port = port
 			@key = key
 			@workers = ThreadGroup.new
-			@timeout = timeout
+			if y
+				@throttle = x
+				@timeout = y || 60
+			else
+				@timeout = x
+			end
 			@num_processors = num_processors
 			@death_time = 60
 			self.class.const_set(:Instance,self)

data/swiftiply.gemspec

@@ -11,7 +11,7 @@ spec = Gem::Specification.new do |s|
   s.name              = 'swiftiply'
   s.author            = %q(Kirk Haines)
   s.email             = %q(wyhaines@gmail.com)
-  s.version           = '0.6.1'
+  s.version           = '0.6.1.1'
   s.summary           = %q(A fast clustering proxy for web applications.)
   s.platform          = Gem::Platform::RUBY
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: swiftiply
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
-date: 2007-08-13 00:00:00 +02:00
+  version: 0.6.1.1
+date: 2007-11-06 00:00:00 -06:00
 summary: A fast clustering proxy for web applications.
 require_paths: 
 - src
@@ -29,52 +29,52 @@ post_install_message:
 authors: 
 - Kirk Haines
 files: 
-- bin
 - external
-- src
+- bin
 - test
-- CONTRIBUTORS
-- README
-- setup.rb
+- src
 - ext
 - swiftiply.gemspec
-- bin/swiftiply
+- README
+- CONTRIBUTORS
+- setup.rb
+- external/package.rb
+- external/test_support.rb
 - bin/mongrel_rails
+- bin/swiftiply
 - bin/swiftiply_mongrel_rails
 - bin/echo_client
-- external/test_support.rb
-- external/package.rb
-- src/swiftcore
-- src/fastfilereader.rb
-- src/swiftcore/types.rb
-- src/swiftcore/Swiftiply.rb
-- src/swiftcore/swiftiplied_mongrel.rb
-- src/swiftcore/evented_mongrel.rb
-- src/swiftcore/Swiftiply
-- src/swiftcore/Swiftiply/swiftiply_client.rb
-- src/swiftcore/Swiftiply/support_pagecache.rb
-- test/TC_Swiftiply.rb
-- test/TC_ProxyBag.rb
 - test/TC_ProxyBag
 - test/TC_Swiftiply
+- test/TC_Swiftiply.rb
+- test/TC_ProxyBag.rb
 - test/TC_ProxyBag/test_serve_static_file
-- test/TC_Swiftiply/mongrel
+- test/TC_Swiftiply/test_serve_normal_proxy_with_authentication
 - test/TC_Swiftiply/slow_echo_client
+- test/TC_Swiftiply/mongrel
+- test/TC_Swiftiply/test_serve_static_file_from_cachedir
 - test/TC_Swiftiply/test_serve_static_file
 - test/TC_Swiftiply/test_serve_normal_proxy
-- test/TC_Swiftiply/test_serve_static_file_from_cachedir
-- test/TC_Swiftiply/test_serve_normal_proxy_with_authentication
+- test/TC_Swiftiply/mongrel/threaded_hello.rb
 - test/TC_Swiftiply/mongrel/swiftiplied_hello.rb
 - test/TC_Swiftiply/mongrel/evented_hello.rb
-- test/TC_Swiftiply/mongrel/threaded_hello.rb
 - test/TC_Swiftiply/test_serve_static_file_from_cachedir/public
+- src/fastfilereader.rb
+- src/swiftcore
+- src/swiftcore/types.rb
+- src/swiftcore/Swiftiply
+- src/swiftcore/evented_mongrel.rb
+- src/swiftcore/Swiftiply.rb
+- src/swiftcore/swiftiplied_mongrel.rb
+- src/swiftcore/Swiftiply/swiftiply_client.rb
+- src/swiftcore/Swiftiply/support_pagecache.rb
 - ext/swiftiply_parse
 - ext/fastfilereader
 - ext/swiftiply_parse/parse.rl
-- ext/fastfilereader/extconf.rb
 - ext/fastfilereader/rubymain.cpp
-- ext/fastfilereader/mapper.cpp
+- ext/fastfilereader/extconf.rb
 - ext/fastfilereader/mapper.h
+- ext/fastfilereader/mapper.cpp
 test_files: []
 
 rdoc_options: