hayabusa 0.0.15 → 0.0.16

data/Gemfile

@@ -9,12 +9,13 @@ gem "mail"
 gem "datet"
 gem "http2"
 gem "tpool"
+gem "fcgi"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "json"
-  gem "rspec", "~> 2.3.0"
+  gem "rspec", ">= 2.3.0"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.6.3"
   gem "sqlite3" if RUBY_ENGINE != "jruby"

data/Gemfile.lock

@@ -4,15 +4,16 @@ GEM
     datet (0.0.20)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    fcgi (0.8.8)
     git (1.2.5)
-    http2 (0.0.10)
+    http2 (0.0.12)
     i18n (0.6.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     json (1.7.5)
-    knjrbfw (0.0.98)
+    knjrbfw (0.0.99)
       datet
       http2
       php4r
@@ -28,14 +29,14 @@ GEM
       http2
     polyglot (0.3.3)
     rake (0.9.2.2)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
     sqlite3 (1.3.6)
     tpool (0.0.4)
     treetop (1.4.10)
@@ -51,11 +52,12 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   datet
   erubis
+  fcgi
   http2
   jeweler (~> 1.6.3)
   json
   knjrbfw
   mail
-  rspec (~> 2.3.0)
+  rspec (>= 2.3.0)
   sqlite3
   tpool

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/hayabusa.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "hayabusa"
-  s.version = "0.0.15"
+  s.name = %q{hayabusa}
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2012-09-30"
-  s.description = "A threadded web/app-server that focuses on threadding, shared ressources, speed and more."
-  s.email = "k@spernj.org"
+  s.date = %q{2012-10-05}
+  s.description = %q{A threadded web/app-server that focuses on threadding, shared ressources, speed and more.}
+  s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "hayabusa_benchmark.rb", "hayabusa_cgi.rb", "hayabusa_fcgi.fcgi", "hayabusa_fcgi.rb", "hayabusa_fcgi_server.rb", "hayabusa_spec_restart.rb", "knjappserver_start.rb"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -95,17 +95,18 @@ Gem::Specification.new do |s|
     "pages/spec_vars_get.rhtml",
     "pages/spec_vars_header.rhtml",
     "pages/spec_vars_post.rhtml",
+    "pages/spec_vars_post_fileupload.rhtml",
     "pages/tests.rhtml",
     "pages/threadded_content_test.rhtml",
     "spec/fcgi_multiple_processes_spec.rb",
     "spec/hayabusa_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/kaspernj/hayabusa"
+  s.homepage = %q{http://github.com/kaspernj/hayabusa}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "A threadded web/app-server that supports stand-alone, CGI and FCGI-modes."
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{A threadded web/app-server that supports stand-alone, CGI and FCGI-modes.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -117,8 +118,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<datet>, [">= 0"])
       s.add_runtime_dependency(%q<http2>, [">= 0"])
       s.add_runtime_dependency(%q<tpool>, [">= 0"])
+      s.add_runtime_dependency(%q<fcgi>, [">= 0"])
       s.add_development_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.3"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
@@ -129,8 +131,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<datet>, [">= 0"])
       s.add_dependency(%q<http2>, [">= 0"])
       s.add_dependency(%q<tpool>, [">= 0"])
+      s.add_dependency(%q<fcgi>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<rspec>, [">= 2.3.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
@@ -142,8 +145,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<datet>, [">= 0"])
     s.add_dependency(%q<http2>, [">= 0"])
     s.add_dependency(%q<tpool>, [">= 0"])
+    s.add_dependency(%q<fcgi>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<rspec>, [">= 2.3.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
     s.add_dependency(%q<sqlite3>, [">= 0"])

data/lib/hayabusa_cgi_tools.rb

@@ -5,8 +5,13 @@ class Hayabusa::Cgi_tools
   def convert_fcgi_post(params)
     post_hash = {}
     
-    params.each do |key, val|
-      post_hash[key] = val.first
+    params.each do |key, realval|
+      val = realval.first
+      
+      #Sometimes uploaded files are given as StringIO's.
+      val = val.string if val.is_a?(StringIO)
+      
+      post_hash[key] = val
     end
     
     post_ret = {}

data/lib/hayabusa_ext/threadding.rb

@@ -46,21 +46,15 @@ class Hayabusa
         
         thread_obj.args[:running] = true
         yield(*args[:args])
-        _hb.log_puts("Done yielding for #{args[:id]}")
       rescue => e
         thread_obj.args[:error] = true
         thread_obj.args[:error_obj] = e
         
         self.handle_error(e)
       ensure
-        _hb.log_puts("Seting arguments on thread.") if @debug
         thread_obj.args[:running] = false
         thread_obj.args[:done] = true
-        
-        _hb.log_puts("Free thread ob-db.") if @debug
         @ob.db.free_thread if @ob.db.opts[:threadsafe]
-        
-        _hb.log_puts("Free thread db-handler.") if @debug
         @db_handler.free_thread if @db_handler.opts[:threadsafe]
       end
     end
@@ -123,7 +117,6 @@ class Hayabusa::Thread_instance
   
   def join
     while !@args[:done] and !@args[:error]
-      _hb.log_puts(@args)
       sleep 0.1
     end
   end

data/lib/hayabusa_fcgi.rb

@@ -44,7 +44,7 @@ class Hayabusa::Fcgi
     File.open(fcgi_config_fp) do |fp|
       fp.flock(File::LOCK_EX)
       
-      fcgi_config_cont = File.read(fcgi_config_fp)
+      fcgi_config_cont = File.read(fcgi_config_fp) rescue ""
       if !fcgi_config_cont.empty?
         #Seems like an instance is already running - check PID to be sure.
         fcgi_config = Marshal.load(File.read(fcgi_config_fp))

data/lib/hayabusa_http_session.rb

@@ -121,7 +121,7 @@ class Hayabusa::Http_session < Hayabusa::Client_session
       @hb.log_puts "#{__id__} - Closing httpsession because of timeout." if @debug
     rescue Errno::ECONNRESET, Errno::ENOTCONN, Errno::EPIPE => e
       @hb.log_puts "#{__id__} - Connection error (#{e.inspect})..." if @debug
-      @hb.log_puts e.backtrace
+      @hb.log_puts e.backtrace if @debug
     rescue Interrupt => e
       raise e
     rescue Exception => e

data/lib/hayabusa_http_session_post_multipart.rb

@@ -1,41 +1,97 @@
+require "tempfile"
+
 #This class parses and handels post-multipart requests.
 class Hayabusa::Http_session::Post_multipart
+  #This hash contains all the data read from the post-request.
   attr_reader :return
   
   def initialize(args)
     @args = args
-    boundary_regexp = /\A--#{@args["boundary"]}(--)?#{@args["crlf"]}\z/
+    crlf = args[:crlf]
+    
+    boundary_regexp = /\A--#{Regexp.escape(@args[:boundary])}(--)?(\r\n|\n|$)\z/
     @return = {}
     @data = nil
     @mode = nil
+    @clength = 0
     @headers = {}
     @counts = {}
+    str_crlf = nil
     
-    @args["io"].each do |line|
-      if boundary_regexp =~ line
+    @args[:io].each do |line|
+      begin
+        boundary_match = line.match(boundary_regexp)
+      rescue ArgumentError
+        #Happens when "invalid byte sequence in UTF-8" - the boundary-line will be UTF-8-valid and match the 'boundary_regexp'.
+        boundary_match = false
+      end
+      
+      if boundary_match
         #Finish the data we were writing.
         self.finish_data if @data
         
-        @data = ""
+        @data_first = true
+        @data_written = 0
+        @clength = nil
+        @name = nil
         @mode = "headers"
+        str_crlf = nil
       elsif @mode == "headers"
-        if match = line.match(/^(.+?):\s+(.+)#{@args["crlf"]}$/)
-          @headers[match[1].to_s.downcase] = match[2]
-        elsif line == @args["crlf"]
+        if match = line.match(/^(.+?):\s+(.+)#{crlf}$/)
+          key = match[1].to_s.downcase
+          val = match[2]
+          
+          @headers[key] = val
+          
+          if key == "content-length"
+            @clength = val.to_i
+          elsif key == "content-disposition"
+            #Figure out value-name in post-hash.
+            match_name = val.match(/name=\"(.+?)\"/)
+            raise "Could not match name." if !match_name
+            @name = match_name[1]
+            
+            #Fix count with name if given as increamental [].
+            if match = @name.match(/^(.+)\[\]$/)
+              if !@counts.key?(match[1])
+                @counts[match[1]] = 0
+              else
+                @counts[match[1]] += 1
+              end
+              
+              @name = "#{match[1]}[#{@counts[match[1]]}]"
+            end
+            
+            #Figure out actual filename.
+            if match_fname = val.match(/filename=\"(.+?)\"/)
+              @fname = match_fname[1]
+              @data = Tempfile.new("hayabusa_http_session_post_multipart")
+            else
+              @data = ""
+            end
+          end
+        elsif line == crlf
           @mode = "body"
         else
           raise "Could not match header from: '#{line}'."
         end
       elsif @mode == "body"
-        @data << line
-      elsif line == @args["crlf"] and !@mode
+        match = line.match(/^(.*?)(\r\n|\n)$/)
+        str = "#{str_crlf}#{match[1]}"
+        str_crlf = match[2]
+        
+        @data_written += str.bytesize
+        @data << str
+        
+        self.finish_data if @clength and @data_written >= @clength
+      elsif !@mode and (line == crlf or line == "\n" or line == "\r\n")
         #ignore.
       else
-        raise "Invalid mode: '#{@mode}' for line: '#{line}'."
+        raise "Invalid mode: '#{@mode}' (#{@mode.class.name}) for line: '#{line}' for total post-string:\n#{@args[:io].string}"
       end
     end
     
-    self.finish_data if @data and @data.to_s.length > 0
+    self.finish_data if @data
     
     @data = nil
     @headers = nil
@@ -45,50 +101,37 @@ class Hayabusa::Http_session::Post_multipart
   
   #Add the current treated data to the return-hash.
   def finish_data
-    @data.chop!
-    name = nil
-    
-    disp = @headers["content-disposition"]
-    raise "No 'content-disposition' was given." if !disp
-    
-    
-    #Figure out value-name in post-hash.
-    match_name = disp.match(/name=\"(.+?)\"/)
-    raise "Could not match name." if !match_name
-    name = match_name[1]
-    
-    
-    #Fix count with name if given as increamental [].
-    if match = name.match(/^(.+)\[\]$/)
-      if !@counts.key?(match[1])
-        @counts[match[1]] = 0
-      else
-        @counts[match[1]] += 1
-      end
+    if @headers.empty? and @data_written == 0
+      @data.close(true) if @data.is_a?(Tempfile)
       
-      name = "#{match[1]}[#{@counts[match[1]]}]"
+      self.reset_data
+      return nil
     end
     
+    @data.close(false) if @data.is_a?(Tempfile)
+    raise "No 'content-disposition' was given (#{@headers}) (#{@data})." if !@name
     
-    #Figure out actual filename.
-    match_fname = disp.match(/filename=\"(.+?)\"/)
-    
-    if match_fname
+    if @fname
       obj = Hayabusa::Http_session::Post_multipart::File_upload.new(
-        "fname" => match_fname[1],
-        "headers" => @headers,
-        "data" => @data
+        :fname => @fname,
+        :headers => @headers,
+        :data => @data
       )
-      @return[name] = obj
-      @data = nil
-      @headers = {}
-      @mode = nil
+      @return[@name] = obj
     else
-      @return[name] = @data
-      @data = nil
-      @headers = {}
-      @mode = nil
+      @return[@name] = @data
     end
+    
+    self.reset_data
+  end
+  
+  def reset_data
+    @data = nil
+    @name = nil
+    @fname = nil
+    @headers = {}
+    @mode = nil
+    @clength = 0
   end
 end
 
@@ -100,27 +143,27 @@ class Hayabusa::Http_session::Post_multipart::File_upload
   
   #Returns the size of the upload.
   def size
-    return @args["data"].length
+    return @args[:data].length
   end
   
   #Returns the size of the fileupload.
   def length
-    return @args["data"].length
+    return @args[:data].length
   end
   
   #Returns the filename given for the fileupload.
   def filename
-    return @args["fname"]
+    return @args[:fname]
   end
   
   #Returns the headers given for the fileupload. Type and more should be here.
   def headers
-    return @args["headers"]
+    return @args[:headers]
   end
   
   #Returns the content of the file-upload as a string.
   def to_s
-    return @args["data"]
+    return File.read(@args[:data].path)
   end
   
   #Saves the content of the fileupload to a given path.

data/lib/hayabusa_http_session_request.rb

@@ -1,4 +1,4 @@
-require "knj/web"
+require "tempfile"
 
 #If we are running on JRuby or Rubinius this will seriously speed things up if we are behind a proxy.
 if RUBY_PLATFORM == "java" or RUBY_ENGINE == "rbx"
@@ -156,31 +156,40 @@ class Hayabusa::Http_session::Request
               sleep 2
             end
           rescue => e
-            if @hb
-              @hb.handle_error(e)
-            else
-              STDOUT.print Knj::Errors.error_str(e) if !STDOUT.closed?
-            end
+            @hb.handle_error(e)
           end
         end
         
+        if @headers["content-type"] and match = @headers["content-type"].first.match(/^multipart\/form-data; boundary=(.+)\Z/)
+          #This is useually used for file-uploads and is expected to be slower because of disk-access. Use temporary file to spare memory.
+          mode = :multipart
+          post_data = Tempfile.open("hayabusa_multipart_raw")
+        else
+          #This is a normal post useually only with strings and such. That can be handeled by memory.
+          mode = :normal
+          post_data = ""
+        end
+        
         while @read < @clength
           read_size = @clength - @read
-          read_size = 4096 if read_size > 4096
+          read_size = 8192 if read_size > 8192
           
           raise Errno::ECONNRESET, "Socket closed." if socket.closed?
           read = socket.read(read_size)
           raise Errno::ECONNRESET, "Socket returned non-string: '#{read.class.name}'." if !read.is_a?(String)
+          
           post_data << read
-          @read += read.length
+          @read += read.bytesize
         end
         
-        if @headers["content-type"] and match = @headers["content-type"].first.match(/^multipart\/form-data; boundary=(.+)\Z/)
+        if mode == :multipart
+          post_data.rewind
           post_treated = Hayabusa::Http_session::Post_multipart.new(
-            "io" => StringIO.new("#{post_data}"),
-            "boundary" => match[1],
-            "crlf" => @crlf
+            :io => post_data,
+            :boundary => match[1],
+            :crlf => @crlf
           ).return
+          post_data.close(true)
           
           self.convert_post(@post, post_treated, {:urldecode => false})
         else

data/lib/kernel_ext/gettext_methods.rb

@@ -1,15 +1,21 @@
 #coding: utf-8
 
 def _(str)
-  hb = _hb
-  session = Thread.current[:hayabusa][:session].sess_data if Thread.current[:hayabusa] and Thread.current[:hayabusa][:session]
+  thread = Thread.current
+  thread_hayabusa = thread[:hayabusa]
+  raise "Could not register Hayabusa-data." if !thread_hayabusa
+  hb = thread_hayabusa[:hb]
+  raise "Could not register Hayabusa." if !hb
+  raise "'gettext' not enabled for Hayabusa." if !hb.gettext
+  
+  session = thread_hayabusa[:session].sess_data if thread_hayabusa[:session]
   locale = nil
   
-  if Thread.current[:locale].to_s.length > 0
-    locale = Thread.current[:locale]
-  elsif session and session[:locale].to_s.strip.length > 0
+  if !thread[:locale].to_s.empty?
+    locale = thread[:locale]
+  elsif session and !session[:locale].to_s.strip.empty?
     locale = session[:locale]
-  elsif hb and hb.config[:locale_default].to_s.strip.length > 0
+  elsif hb and !hb.config[:locale_default].to_s.strip.empty?
     session[:locale] = hb.config[:locale_default] if session
     locale = hb.config[:locale_default]
   elsif !session and !hb

data/pages/spec_thread_joins.rhtml

@@ -2,23 +2,17 @@
   #Knj.p _hb.config
   #exit
   
-  _hb.log_puts("1")
   print "1"
   
-  _hb.log_puts("2")
   cont = "2"
   t1 = _hb.thread(:id => 4) do
     sleep 0.5
-    _hb.log_puts("4")
     cont << "4"
-    _hb.log_puts("4 done")
   end
   
   t2 = _hb.thread(:id => 3) do
     sleep 0.3
-    _hb.log_puts("3")
     cont << "3"
-    _hb.log_puts("3 done")
   end
   
   sleep 0.1
@@ -29,7 +23,6 @@
   t1.join
   t2.join_error
   
-  _hb.log_puts("5")
   cont << "5"
   
   print cont

data/pages/spec_vars_post_fileupload.rhtml

@@ -0,0 +1,9 @@
+<%
+  pdata = {}
+  _post.each do |key, val|
+    pdata[key] = val.to_s
+  end
+  
+  require "json"
+  print JSON.generate(pdata)
+%>

data/spec/hayabusa_spec.rb

@@ -3,11 +3,22 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Hayabusa" do
   it "should be able to start a sample-server" do
     require "rubygems"
-    require "hayabusa"
-    require "/home/kaspernj/Dev/Ruby/Gems/knjrbfw/lib/knjrbfw.rb"
     require "sqlite3" if RUBY_ENGINE != "jruby"
     require "json"
-    Knj.gem_require(:Http2, "http2")
+    
+    begin
+      require "#{File.realpath(File.dirname(__FILE__))}/../../knjrbfw/lib/knjrbfw.rb"
+    rescue LoadError
+      require "knjrbfw"
+    end
+    
+    require "#{File.realpath(File.dirname(__FILE__))}/../lib/hayabusa.rb"
+    
+    begin
+      require "#{File.realpath(File.dirname(__FILE__))}/../../http2/lib/http2.rb"
+    rescue LoadError
+      require "http2"
+    end
     
     db_path = "#{Knj::Os.tmpdir}/hayabusa_rspec.sqlite3"
     File.unlink(db_path) if File.exists?(db_path)
@@ -52,7 +63,7 @@ describe "Hayabusa" do
     
     raise "Expected thread-pool-priority to be '-3' but it wasnt: '#{$appserver.threadpool.args[:priority]}'." if $appserver.threadpool.args[:priority] != -3
     
-    http = Http2.new(:host => "localhost", :port => 80)
+    http = Http2.new(:host => "localhost", :port => 80, :encoding_gzip => false, :debug => false)
     
     $testmodes = [{
       :name => :standalone,
@@ -76,6 +87,36 @@ describe "Hayabusa" do
   #  end
   #end
   
+  it "should be able to upload files" do
+    $testmodes.each do |tdata|
+      fpath = "#{File.realpath(File.dirname(__FILE__))}/../pages/spec_thread_joins.rhtml"
+      
+      res = tdata[:http].post_multipart(:url => "#{tdata[:path_pre]}spec_vars_post_fileupload.rhtml", :post => {
+        "testfile" => {
+          :filename => "spec_thread_joins.rhtml",
+          :fpath => fpath
+        }
+      })
+      
+      data = JSON.parse(res.body)
+      
+      if data["testfile"] != File.read(fpath)
+        File.open("/tmp/hayabusa_spec_testfile1", "w") do |fp|
+          fp.puts("Class: #{data["testfile"].class.name}")
+          fp.write(data["testfile"])
+        end
+        
+        File.open("/tmp/hayabusa_spec_testfile2", "w") do |fp|
+          fp.write(File.read(fpath))
+        end
+        
+        raise "Expected uploaded data for mode '#{tdata[:name]}' to be the same but it wasnt:\n\"#{data["testfile"]}\"\n\n\"#{File.read(fpath)}\""
+      end
+    end
+  end
+  
+  if false
+  
   it "should be able to handle a GET-request." do
     $testmodes.each do |tdata|
       res = tdata[:http].get("#{tdata[:path_pre]}spec.rhtml")
@@ -302,6 +343,8 @@ describe "Hayabusa" do
     end
   end
   
+  end
+  
   it "should be able to stop." do
     $appserver.stop
   end

metadata

@@ -1,141 +1,153 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hayabusa
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.16
   prerelease: 
-  version: 0.0.15
 platform: ruby
-authors: 
+authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-05 00:00:00.000000000 +02:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &16343080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16343080
+- !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &16341740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16341740
+- !ruby/object:Gem::Dependency
   name: mail
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &16340380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16340380
+- !ruby/object:Gem::Dependency
   name: datet
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &16321500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16321500
+- !ruby/object:Gem::Dependency
   name: http2
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &16320740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16320740
+- !ruby/object:Gem::Dependency
   name: tpool
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &16320020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16320020
+- !ruby/object:Gem::Dependency
+  name: fcgi
+  requirement: &16319300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *16319300
+- !ruby/object:Gem::Dependency
   name: json
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &16318580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16318580
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &16317540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16317540
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &16316440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16316440
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &16315300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16315300
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &16312540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id011
-description: A threadded web/app-server that focuses on threadding, shared ressources, speed and more.
+  version_requirements: *16312540
+description: A threadded web/app-server that focuses on threadding, shared ressources,
+  speed and more.
 email: k@spernj.org
-executables: 
+executables:
 - check_running.rb
 - hayabusa_benchmark.rb
 - hayabusa_cgi.rb
@@ -145,11 +157,10 @@ executables:
 - hayabusa_spec_restart.rb
 - knjappserver_start.rb
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -227,40 +238,39 @@ files:
 - pages/spec_vars_get.rhtml
 - pages/spec_vars_header.rhtml
 - pages/spec_vars_post.rhtml
+- pages/spec_vars_post_fileupload.rhtml
 - pages/tests.rhtml
 - pages/threadded_content_test.rhtml
 - spec/fcgi_multiple_processes_spec.rb
 - spec/hayabusa_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/kaspernj/hayabusa
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 1606654535065321094
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3140330148185755228
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A threadded web/app-server that supports stand-alone, CGI and FCGI-modes.
 test_files: []
-