knjappserver 0.0.16 → 0.0.17

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjappserver
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000 +01:00
+date: 2012-02-21 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &19883700 !ruby/object:Gem::Requirement
+  requirement: &16146280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *19883700
+  version_requirements: *16146280
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &19796260 !ruby/object:Gem::Requirement
+  requirement: &16145700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19796260
+  version_requirements: *16145700
 - !ruby/object:Gem::Dependency
   name: knjdbrevision
-  requirement: &19795540 !ruby/object:Gem::Requirement
+  requirement: &16145200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *19795540
+  version_requirements: *16145200
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &19794800 !ruby/object:Gem::Requirement
+  requirement: &16144680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19794800
+  version_requirements: *16144680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19794080 !ruby/object:Gem::Requirement
+  requirement: &16144020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *19794080
+  version_requirements: *16144020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19793340 !ruby/object:Gem::Requirement
+  requirement: &16143360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19793340
+  version_requirements: *16143360
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19792580 !ruby/object:Gem::Requirement
+  requirement: &16141740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *19792580
+  version_requirements: *16141740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &19791860 !ruby/object:Gem::Requirement
+  requirement: &16090320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19791860
+  version_requirements: *16090320
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19791040 !ruby/object:Gem::Requirement
+  requirement: &16089600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19791040
+  version_requirements: *16089600
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &19790320 !ruby/object:Gem::Requirement
+  requirement: &16088860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19790320
+  version_requirements: *16088860
 description: Which supports a lot of undocumented stuff.
 email: k@spernj.org
 executables:
@@ -150,17 +150,18 @@ files:
 - lib/files/run/README
 - lib/include/class_customio.rb
 - lib/include/class_erbhandler.rb
-- lib/include/class_httpresp.rb
 - lib/include/class_httpserver.rb
 - lib/include/class_httpsession.rb
 - lib/include/class_httpsession_contentgroup.rb
-- lib/include/class_httpsession_knjengine.rb
-- lib/include/class_httpsession_mongrel.rb
-- lib/include/class_httpsession_webrick.rb
+- lib/include/class_httpsession_http_request.rb
+- lib/include/class_httpsession_http_response.rb
+- lib/include/class_httpsession_post_multipart.rb
 - lib/include/class_knjappserver.rb
 - lib/include/class_knjappserver_cleaner.rb
 - lib/include/class_knjappserver_cmdline.rb
 - lib/include/class_knjappserver_errors.rb
+- lib/include/class_knjappserver_leakproxy_client.rb
+- lib/include/class_knjappserver_leakproxy_server.rb
 - lib/include/class_knjappserver_logging.rb
 - lib/include/class_knjappserver_mailing.rb
 - lib/include/class_knjappserver_sessions.rb
@@ -182,13 +183,23 @@ files:
 - lib/pages/benchmark_print.rhtml
 - lib/pages/benchmark_simple.rhtml
 - lib/pages/benchmark_threadded_content.rhtml
+- lib/pages/debug_database_connections.rhtml
+- lib/pages/debug_http_sessions.rhtml
+- lib/pages/error_notfound.rhtml
 - lib/pages/logs_latest.rhtml
 - lib/pages/logs_show.rhtml
 - lib/pages/spec.rhtml
+- lib/pages/spec_post.rhtml
 - lib/pages/spec_test_multiple_clients.rhtml
+- lib/pages/spec_thread_joins.rhtml
 - lib/pages/spec_threadded_content.rhtml
+- lib/pages/tests.rhtml
 - lib/scripts/benchmark.rb
+- lib/scripts/knjappserver_cgi.rb
+- lib/scripts/knjappserver_fcgi.rb
+- lib/scripts/leakproxy.rb
 - spec/knjappserver_spec.rb
+- spec/leakproxy_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kaspernj/knjappserver
@@ -206,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4377496633346000305
+      hash: -3001161973856161206
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/include/class_httpsession_knjengine.rb

@@ -1,154 +0,0 @@
-require "uri"
-
-if RUBY_PLATFORM == "java" or RUBY_ENGINE == "rbx"
-  BasicSocket.do_not_reverse_lookup = true
-end
-
-class Knjappserver::Httpsession::Knjengine
-	attr_reader :get, :post, :cookie, :meta, :page_path, :headers, :http_version
-	
-	def initialize(args)
-		@args = args
-		@kas = @args[:kas]
-		@crlf = "\r\n"
-	end
-	
-	def read_socket
-		loop do
-			raise Errno::ECONNRESET, "Socket closed." if @socket.closed?
-			read = @socket.gets
-			raise Errno::ECONNRESET, "Socket returned non-string: '#{read.class.name}'." if !read.is_a?(String)
-			@cont += read
-			break if @cont[-4..-1] == "\r\n\r\n" or @cont[-2..-1] == "\n\n"
-		end
-	end
-	
-	def socket_parse(socket)
-		@cont = ""
-		@socket = socket
-		self.read_socket
-		
-		#Parse URI (page_path and get).
-		match = @cont.match(/^(GET|POST|HEAD) (.+) HTTP\/1\.(\d+)\s*/)
-		raise "Could not parse request: '#{@cont.split("\n").first}'." if !match
-    
-		@http_version = "1.#{match[3]}"
-		
-		method = match[1]
-		@cont = @cont.gsub(match[0], "")
-		uri = URI.parse(match[2])
-		
-		page_filepath = Knj::Web.urldec(uri.path)
-		if page_filepath.length <= 0 or page_filepath == "/" or File.directory?("#{@kas.config[:doc_root]}/#{page_filepath}")
-			page_filepath = "#{page_filepath}/#{@kas.config[:default_page]}"
-		end
-		
-		@page_path = "#{@kas.config[:doc_root]}/#{page_filepath}"
-		@get = Knj::Web.parse_urlquery(uri.query.to_s, {:urldecode => true, :force_utf8 => true})
-		
-		
-		#Parse headers, cookies and meta.
-		if RUBY_PLATFORM == "java" or RUBY_ENGINE == "rbx"
-			if @kas.config[:peeraddr_static]
-				addr_peer = [0, 0, @kas.config[:peeraddr_static]]
-			else
-				addr_peer = @socket.peeraddr
-			end
-			
-			addr = @socket.addr
-		else
-			addr = @socket.addr(false)
-			addr_peer = @socket.peeraddr(false)
-		end
-		
-		@headers = {}
-		@cookie = {}
-		@meta = {
-			"REQUEST_METHOD" => method,
-			"QUERY_STRING" => uri.query,
-			"REQUEST_URI" => match[2],
-			"REMOTE_ADDR" => addr[2],
-			"REMOTE_PORT" => addr[1],
-			"SERVER_ADDR" => addr_peer[2],
-			"SERVER_PORT" => addr_peer[1],
-			"SCRIPT_NAME" => uri.path
-		}
-		
-		@cont.scan(/(\S+):\s*(.+)\r\n/) do |header_match|
-			key = header_match[0].downcase
-			val = header_match[1]
-			
-			@headers[key] = [] if !@headers.has_key?(key)
-			@headers[key] << val
-			
-			case key
-				when "cookie"
-					Knj::Web.parse_cookies(val).each do |key, val|
-						@cookie[key] = val
-					end
-        else
-          key = key.upcase.gsub("-", "_")
-          @meta["HTTP_#{key}"] = val
-			end
-		end
-		
-		
-		#Parse post
-		@post = {}
-		
-		if method == "POST"
-			post_treated = {}
-			post_data = @socket.read(@headers["content-length"][0].to_i)
-			
-			if @headers["content-type"] and match = @headers["content-type"][0].match(/^multipart\/form-data; boundary=(.+)\Z/)
-				io = StringIO.new(post_data)
-				post_treated = parse_form_data(io, match[1])
-			else
-				post_data.split("&").each do |splitted|
-					splitted = splitted.split("=")
-					post_treated[Knj::Web.urldec(splitted[0])] = splitted[1]
-				end
-			end
-			
-			self.convert_webrick_post(@post, post_treated, {:urldecode => true})
-		end
-	end
-	
-	def convert_webrick_post(seton, webrick_post, args = {})
-		webrick_post.each do |varname, value|
-			Knj::Web.parse_name(seton, varname, value, args)
-		end
-	end
-	
-	#Thanks to WEBrick
-	def parse_form_data(io, boundary)
-		boundary_regexp = /\A--#{boundary}(--)?#{@crlf}\z/
-		form_data = {}
-		return form_data unless io
-		data = nil
-		
-		io.each do |line|
-		  if boundary_regexp =~ line
-			  if data
-          data.chop!
-          key = data.name
-          
-          if form_data.has_key?(key)
-            form_data[key].append_data(data)
-          else
-            form_data[key] = data
-          end
-			  end
-			  
-			  data = WEBrick::HTTPUtils::FormData.new
-			  next
-		  else
-			  if data
-				  data << line
-			  end
-		  end
-		end
-		
-		return form_data
-  end
-end

data/lib/include/class_httpsession_mongrel.rb

@@ -1,75 +0,0 @@
-class Knjappserver::Httpsession::Webrick
-	attr_reader :get, :post, :cookie, :meta, :page_path, :headers
-	
-	def initialize(args)
-		@args = args
-		@kas = @args[:kas]
-	end
-	
-	def socket_parse(socket)
-		req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-		req.parse(socket)
-		
-		
-		#Set meta.
-		@meta = req.meta_vars
-		
-		
-		#Set page_path.
-		page_filepath = meta["PATH_INFO"]
-		if page_filepath.length <= 0 or page_filepath == "/" or File.directory?("#{@kas.config[:doc_root]}/#{page_filepath}")
-			page_filepath = "#{page_filepath}/#{@kas.config[:default_page]}"
-		end
-		
-		@page_path = "#{@kas.config[:doc_root]}/#{page_filepath}"
-		
-		
-		#Set get and headers.
-		@get = Knj::Web.parse_urlquery(@meta["QUERY_STRING"])
-		@headers = req.header
-		
-		
-		#Set post.
-		@post = {}
-		if meta["REQUEST_METHOD"] == "POST"
-			self.convert_webrick_post(@post, req.query)
-		end
-		
-		
-		#Set cookie.
-		@cookie = {}
-		
-		req.cookies.each do |cookie_enum|
-			@cookie[cookie_enum.name] = Knj::Web.urldec(cookie_enum.value)
-		end
-		
-		
-		req.fixup if req and req.keep_alive?
-	end
-	
-	def convert_webrick_post(seton, webrick_post, args = {})
-		webrick_post.each do |varname, value|
-			Knj::Web.parse_name(seton, varname, value, args)
-		end
-	end
-	
-	def destroy
-		@args.clear if @args
-		@args = nil
-		@kas = nil
-		
-		@meta.clear if @meta
-		@meta = nil
-		
-		@page_path = nil
-		
-		@get.clear if @get
-		@get = nil
-		
-		@post.clear if @post
-		@post = nil
-		
-		@cookie.clear if @cookie
-		@cookie = nil
-	end
-end

data/lib/include/class_httpsession_webrick.rb

@@ -1,75 +0,0 @@
-class Knjappserver::Httpsession::Webrick
-	attr_reader :get, :post, :cookie, :meta, :page_path, :headers
-	
-	def initialize(args)
-		@args = args
-		@kas = @args[:kas]
-	end
-	
-	def socket_parse(socket)
-		req = WEBrick::HTTPRequest.new(WEBrick::Config::HTTP)
-		req.parse(socket)
-		
-		
-		#Set meta.
-		@meta = req.meta_vars
-		
-		
-		#Set page_path.
-		page_filepath = meta["PATH_INFO"]
-		if page_filepath.length <= 0 or page_filepath == "/" or File.directory?("#{@kas.config[:doc_root]}/#{page_filepath}")
-			page_filepath = "#{page_filepath}/#{@kas.config[:default_page]}"
-		end
-		
-		@page_path = "#{@kas.config[:doc_root]}/#{page_filepath}"
-		
-		
-		#Set get and headers.
-		@get = Knj::Web.parse_urlquery(@meta["QUERY_STRING"])
-		@headers = req.header
-		
-		
-		#Set post.
-		@post = {}
-		if meta["REQUEST_METHOD"] == "POST"
-			self.convert_webrick_post(@post, req.query)
-		end
-		
-		
-		#Set cookie.
-		@cookie = {}
-		
-		req.cookies.each do |cookie_enum|
-			@cookie[cookie_enum.name] = Knj::Web.urldec(cookie_enum.value)
-		end
-		
-		
-		req.fixup if req and req.keep_alive?
-	end
-	
-	def convert_webrick_post(seton, webrick_post, args = {})
-		webrick_post.each do |varname, value|
-			Knj::Web.parse_name(seton, varname, value, args)
-		end
-	end
-	
-	def destroy
-		@args.clear if @args
-		@args = nil
-		@kas = nil
-		
-		@meta.clear if @meta
-		@meta = nil
-		
-		@page_path = nil
-		
-		@get.clear if @get
-		@get = nil
-		
-		@post.clear if @post
-		@post = nil
-		
-		@cookie.clear if @cookie
-		@cookie = nil
-	end
-end