hayabusa 0.0.20 → 0.0.22

data/Gemfile

@@ -10,6 +10,7 @@ gem "datet"
 gem "http2"
 gem "tpool"
 gem "fcgi"
+gem "ruby_process"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -18,5 +19,6 @@ group :development do
   gem "rspec", ">= 2.3.0"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.6.3"
+  gem "rmagick"
   gem "sqlite3" if RUBY_ENGINE != "jruby"
 end

data/Gemfile.lock

@@ -1,49 +1,54 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    datet (0.0.20)
-    diff-lcs (1.1.3)
+    datet (0.0.25)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
-    fcgi (0.8.8)
+    fcgi (0.9.1)
     git (1.2.5)
-    http2 (0.0.12)
-    i18n (0.6.1)
+    http2 (0.0.21)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.7.5)
-    knjrbfw (0.0.99)
+    json (1.8.0)
+    knjrbfw (0.0.105)
       datet
       http2
       php4r
+      ruby_process
       tsafe
       wref
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    php4r (0.0.3)
+    mime-types (1.23)
+    php4r (0.0.4)
       datet
       http2
+      string-strtr
     polyglot (0.3.3)
-    rake (0.9.2.2)
-    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)
+    rake (10.1.0)
+    rmagick (2.13.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    ruby_process (0.0.8)
+      tsafe
+      wref
+    sqlite3 (1.3.7)
+    string-strtr (0.0.3)
     tpool (0.0.4)
-    treetop (1.4.10)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tsafe (0.0.11)
-    wref (0.0.5)
+    wref (0.0.6)
 
 PLATFORMS
   ruby
@@ -58,6 +63,8 @@ DEPENDENCIES
   json
   knjrbfw
   mail
+  rmagick
   rspec (>= 2.3.0)
+  ruby_process
   sqlite3
   tpool

data/VERSION

@@ -1 +1 @@
-0.0.20
+0.0.22

data/hayabusa.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{hayabusa}
-  s.version = "0.0.20"
+  s.name = "hayabusa"
+  s.version = "0.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-10-12}
-  s.description = %q{A threadded web/app-server that focuses on threadding, shared ressources, speed and more.}
-  s.email = %q{k@spernj.org}
+  s.date = "2013-06-28"
+  s.description = "A threadded web/app-server that focuses on threadding, shared ressources, speed and more."
+  s.email = "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",
@@ -96,6 +96,7 @@ Gem::Specification.new do |s|
     "pages/spec_vars_header.rhtml",
     "pages/spec_vars_post.rhtml",
     "pages/spec_vars_post_fileupload.rhtml",
+    "pages/testpic.jpeg",
     "pages/tests.rhtml",
     "pages/threadded_content_test.rhtml",
     "spec/fcgi_multiple_processes_spec.rb",
@@ -103,11 +104,11 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/test_upload.xlsx"
   ]
-  s.homepage = %q{http://github.com/kaspernj/hayabusa}
+  s.homepage = "http://github.com/kaspernj/hayabusa"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A threadded web/app-server that supports stand-alone, CGI and FCGI-modes.}
+  s.rubygems_version = "1.8.23"
+  s.summary = "A threadded web/app-server that supports stand-alone, CGI and FCGI-modes."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -120,10 +121,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<http2>, [">= 0"])
       s.add_runtime_dependency(%q<tpool>, [">= 0"])
       s.add_runtime_dependency(%q<fcgi>, [">= 0"])
+      s.add_runtime_dependency(%q<ruby_process>, [">= 0"])
       s.add_development_dependency(%q<json>, [">= 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<rmagick>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
       s.add_dependency(%q<knjrbfw>, [">= 0"])
@@ -133,10 +136,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<http2>, [">= 0"])
       s.add_dependency(%q<tpool>, [">= 0"])
       s.add_dependency(%q<fcgi>, [">= 0"])
+      s.add_dependency(%q<ruby_process>, [">= 0"])
       s.add_dependency(%q<json>, [">= 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<rmagick>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
@@ -147,10 +152,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<http2>, [">= 0"])
     s.add_dependency(%q<tpool>, [">= 0"])
     s.add_dependency(%q<fcgi>, [">= 0"])
+    s.add_dependency(%q<ruby_process>, [">= 0"])
     s.add_dependency(%q<json>, [">= 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<rmagick>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end

data/lib/hayabusa.rb

@@ -34,7 +34,7 @@ class Hayabusa
       :default_filetype => "text/html",
       :max_requests_working => 20,
       :size_send => 1024,
-      :cleaner_timeout => 300,
+      :cleaner_timeout => 60,
       :mailing_time => 30
     }.merge(config)
     
@@ -52,20 +52,20 @@ class Hayabusa
       [:Tpool, "tpool"]
     ]
     
-    gems.each do |gem|
-      if Kernel.const_defined?(gem[0])
-        puts "Gem already loaded: '#{gem[1]}'." if @debug
+    gems.each do |gem_i|
+      if Kernel.const_defined?(gem_i[0])
+        puts "Gem already loaded: '#{gem_i[1]}'." if @debug
         next
       end
       
-      fpath = "#{@@path}/../../#{gem[1]}/lib/#{gem[1]}.rb"
+      fpath = "#{@@path}/../../#{gem_i[1]}/lib/#{gem_i[1]}.rb"
       
       if File.exists?(fpath)
         puts "Loading custom gem-path: '#{fpath}'." if @debug
         require fpath
       else
-        puts "Loading gem: '#{gem[1]}'." if @debug
-        require gem[1]
+        puts "Loading gem: '#{gem_i[1]}'." if @debug
+        require gem_i[1]
       end
     end
     
@@ -544,4 +544,4 @@ class Hayabusa
     
     return @translations
   end
-end
+end

data/lib/hayabusa_cgi_session.rb

@@ -110,8 +110,7 @@ class Hayabusa::Cgi_session < Hayabusa::Client_session
     rescue SystemExit
       #do nothing - ignore.
     rescue Timeout::Error
-      @resp.status = 500
-      print "The request timed out."
+      @resp.status = 408
     end
   end
   

data/lib/hayabusa_client_session.rb

@@ -22,6 +22,14 @@ class Hayabusa::Client_session
     @cgroup.force_content(newcont)
   end
   
+  #Forces the output to be read from a file.
+  def force_fileread(fpath)
+    raise "Invalid filepath given: '#{fpath}'." if !fpath || !File.exists?(fpath)
+    @resp.chunked = false
+    @resp.header("Content-Length", File.size(fpath))
+    @cgroup.new_io(:type => :file, :path => fpath)
+  end
+  
   #Creates a new Hayabusa::Binding-object and returns the binding for that object.
   def create_binding
     return Hayabusa::Http_session::Page_environment.new(:httpsession => self, :hb => @hb).get_binding
@@ -82,6 +90,7 @@ class Hayabusa::Client_session
         if @handlers_cache.key?(@ext)
           @hb.log_puts("Calling handler.") if @debug
           @handlers_cache[@ext].call(self)
+          @hb.log_puts("Called handler.") if @debug
         else
           #check if we should use a handler for this request.
           @config[:handlers].each do |handler_info|
@@ -125,7 +134,7 @@ class Hayabusa::Client_session
                 end
               end
               
-              @cgroup.new_io(:type => :file, :path => @page_path)
+              self.force_fileread(@page_path)
             end
           end
         end
@@ -133,8 +142,8 @@ class Hayabusa::Client_session
     rescue SystemExit
       #do nothing - ignore.
     rescue Timeout::Error
-      @resp.status = 500
-      print "The request timed out."
+      @resp.status = 408
+      @hb.log_puts "The request timed out."
     end
   end
   
@@ -144,10 +153,7 @@ class Hayabusa::Client_session
     @hb.log_puts "#{__id__} - Served '#{@meta["REQUEST_URI"]}' in #{Time.now.to_f - @time_start} secs (#{@resp.status})." if @debug
     @time_start = nil
     @cgroup.join
-    
-    @hb.events.call(:request_done, {
-      :httpsession => self
-    }) if @hb.events
+    @hb.events.call(:request_done, :httpsession => self) if @hb.events
     @httpsession_var = {}
   end
-end
+end

data/lib/hayabusa_erb_handler.rb

@@ -20,7 +20,7 @@ class Hayabusa::Erb_handler
     httpsess.resp.status = 500 if eruby.error
   end
   
-  #Handels the event when an error in the eruby-instance occurs.
+  # Handels the event when an error in the eruby-instance occurs.
   def on_error(e)
     _hb.handle_error(e)
   end

data/lib/hayabusa_ext/cleaner.rb

@@ -9,7 +9,6 @@ class Hayabusa
   
   def clean
     self.clean_sessions
-    self.clean_autorestart
   end
   
   def clean_autorestart
@@ -108,18 +107,17 @@ class Hayabusa
     #Clean up various inactive sessions.
     session_not_ids = []
     time_check = Time.now.to_i - 300
-    newsessions = {}
-    @sessions.each do |session_hash, session_data|
+    @sessions.delete_if do |session_hash, session_data|
       session_data[:dbobj].flush
       
-      if session_data[:time_lastused].to_i > time_check
-        newsessions[session_hash] = session_data
+      if session_data[:dbobj].date_lastused.to_i > time_check
         session_not_ids << session_data[:dbobj].id
+        false
+      else
+        true
       end
     end
     
-    @sessions = newsessions
-    
     self.log_puts("Delete sessions...") if @debug
     @ob.list(:Session, {"id_not" => session_not_ids, "date_lastused_below" => (Time.now - 5356800)}) do |session|
       idhash = session[:idhash]

data/lib/hayabusa_ext/errors.rb

@@ -116,7 +116,7 @@ class Hayabusa
     begin
       block.call
     rescue => e
-      self.alert(e.message).back
+      Knj::Web.alert(e.message).back
     end
   end
   

data/lib/hayabusa_ext/mailing.rb

@@ -60,17 +60,17 @@ class Hayabusa
       
       #Use subprocessing to avoid the mail-framework (activesupport and so on, also possible memory leaks in those large frameworks).
       self.log_puts("Starting subprocess for mailing.") if @debug
-      Knj::Process_meta.new("debug" => @debug, "debug_err" => true, "id" => "hayabusa_mailing") do |subproc|
-        subproc.static("Object", "require", "rubygems")
-        subproc.static("Object", "require", "mail")
-        subproc.static("Object", "require", "#{@config[:knjrbfw_path]}knjrbfw")
-        subproc.static("Object", "require", "knj/autoload")
+      Ruby_process::Cproxy.run do |data|
+        subproc = data[:subproc]
+        subproc.static(:Object, :require, "rubygems")
+        subproc.static(:Object, :require, "mail")
+        subproc.static(:Object, :require, "#{Knj.knjrbfw_path}/../knjrbfw.rb")
         
         self.log_puts("Flushing emails.") if @debug
         @mails_waiting.each do |mail|
           begin
             self.log_puts("Sending email: #{mail.__id__}") if @debug
-            if mail.send("proc" => subproc)
+            if mail.send(:proc => subproc)
               self.log_puts("Email sent: #{mail.__id__}") if @debug
               @mails_waiting.delete(mail)
             end
@@ -119,25 +119,19 @@ class Hayabusa
     def send(args = {})
       @args[:hb].log_puts("Sending mail '#{__id__}'.") if @args[:hb].debug
       
-      if args["proc"]
-        args["proc"].static("Object", "require", "knj/mailobj")
-        mail = args["proc"].new("Knj::Mailobj", @args[:hb].config[:smtp_args])
-        mail._pm_send_noret("to=", @args[:to])
-        mail._pm_send_noret("subject=", @args[:subject]) if @args[:subject]
-        mail._pm_send_noret("html=", Knj::Strings.email_str_safe(@args[:html])) if @args[:html]
-        mail._pm_send_noret("text=", Knj::Strings.email_str_safe(@args[:text])) if @args[:text]
-        mail._pm_send_noret("from=", @args[:from])
-        mail._pm_send_noret("send")
+      if args[:proc]
+        mail = args[:proc].new("Knj::Mailobj", @args[:hb].config[:smtp_args])
       else
         mail = Knj::Mailobj.new(@args[:hb].config[:smtp_args])
-        mail.to = @args[:to]
-        mail.subject = @args[:subject] if @args[:subject]
-        mail.html = Knj::Strings.email_str_safe(@args[:html]) if @args[:html]
-        mail.text = Knj::Strings.email_str_safe(@args[:text]) if @args[:text]
-        mail.from = @args[:from]
-        mail.send
       end
       
+      mail.to = @args[:to]
+      mail.subject = @args[:subject] if @args[:subject]
+      mail.html = Knj::Strings.email_str_safe(@args[:html]) if @args[:html]
+      mail.text = Knj::Strings.email_str_safe(@args[:text]) if @args[:text]
+      mail.from = @args[:from]
+      mail.send
+      
       @args[:status] = :sent
       @args[:hb].log_puts("Sent email #{self.__id__}") if @args[:hb].debug
       return true

data/lib/hayabusa_ext/sessions.rb

@@ -1,4 +1,6 @@
 class Hayabusa
+  attr_reader :sessions
+  
   def initialize_sessions
     @sessions = Tsafe::MonHash.new
   end
@@ -13,8 +15,11 @@ class Hayabusa
         session = @ob.add(:Session, {
           :idhash => idhash,
           :user_agent => meta["HTTP_USER_AGENT"],
-          :ip => ip
+          :ip => ip,
+          :date_lastused => Time.now
         })
+      else
+        session[:date_lastused] = Time.now
       end
       
       hash = {}
@@ -28,8 +33,6 @@ class Hayabusa
     end
     
     raise ArgumentError, "Invalid IP." if ip != "bot" and !session.remember? and ip.to_s != session[:ip].to_s
-    
-    @sessions[idhash][:time_lastused] = Time.now
     return [session, hash]
   end
   

data/lib/hayabusa_ext/threadding.rb

@@ -16,10 +16,10 @@ class Hayabusa
   end
   
   #Inits the thread so it has access to the appserver and various magic methods can be used.
-  def thread_init(thread = nil)
-    thread = Thread.current if thread == nil
+  def thread_init(thread = Thread.current)
     thread[:hayabusa] = {} if !thread[:hayabusa]
     thread[:hayabusa][:hb] = self
+    return nil
   end
   
   #Spawns a new thread with access to magic methods, _db-method and various other stuff in the appserver.
@@ -72,7 +72,7 @@ class Hayabusa
     thread[:hayabusa][:hb] = self
     
     begin
-      block.call
+      return block.call
     ensure
       @ob.db.free_thread if @ob.db.opts[:threadsafe]
       @db_handler.free_thread if @db_handler.opts[:threadsafe]

data/lib/hayabusa_ext/web.rb

@@ -100,7 +100,7 @@ class Hayabusa
   
   #Urlencodes a string.
   #===Examples
-  #  _hb.redirect("mypage.rhtml?arg=#{_hb.urlenc(value_variable)}")
+  #  Knj::Web.redirect("mypage.rhtml?arg=#{_hb.urlenc(value_variable)}")
   def urlenc(str)
     return Knj::Web.urlenc(str)
   end

data/lib/hayabusa_fcgi.rb

@@ -64,7 +64,7 @@ class Hayabusa::Fcgi
             end
             
             if hayabusa_conf[:debug]
-              @fcgi_proxy[:fp_log] = File.open("/tmp/hayabusa_#{hayabusa_conf[:hayabusa][:title]}_#{Process.pid}.log", "w")
+              @fcgi_proxy[:fp_log] = File.open("/tmp/hayabusa_#{hayabusa_conf[:title]}_#{Process.pid}.log", "w")
               @fcgi_proxy[:fp_log].sync = true
             end
           rescue

data/lib/hayabusa_http_session.rb

@@ -82,31 +82,35 @@ class Hayabusa::Http_session < Hayabusa::Client_session
             @handler.socket_parse(@socket)
           end
           
-          @hb.log_puts "#{__id__} - Done parsing from socket." if @debug
-          
-          while @hb.paused? #Check if we should be waiting with executing the pending request.
-            @hb.log_puts "#{__id__} - Paused! (#{@hb.paused}) - sleeping." if @debug
-            sleep 0.1
-          end
-          
-          break if @hb.should_restart
-          
-          if max_requests_working and @httpserver
-            while @httpserver.working_count.to_i >= max_requests_working
-              @hb.log_puts "#{__id__} - Maximum amounts of requests are working (#{@httpserver.working_count}, #{max_requests_working}) - sleeping." if @debug
+          begin
+            @hb.log_puts "#{__id__} - Done parsing from socket." if @debug
+            
+            while @hb.paused? #Check if we should be waiting with executing the pending request.
+              @hb.log_puts "#{__id__} - Paused! (#{@hb.paused}) - sleeping." if @debug
               sleep 0.1
             end
-          end
-          
-          #Reserve database connections.
-          @hb.db_handler.get_and_register_thread if @hb.db_handler.opts[:threadsafe]
-          @hb.ob.db.get_and_register_thread if @hb.ob.db.opts[:threadsafe]
-          
-          @working = true
-          @hb.log_puts "#{__id__} - Serving." if @debug
-          
-          @httpserver.count_block do
-            self.serve
+            
+            break if @hb.should_restart
+            
+            if max_requests_working and @httpserver
+              while @httpserver.working_count.to_i >= max_requests_working
+                @hb.log_puts "#{__id__} - Maximum amounts of requests are working (#{@httpserver.working_count}, #{max_requests_working}) - sleeping." if @debug
+                sleep 0.1
+              end
+            end
+            
+            #Reserve database connections.
+            @hb.db_handler.get_and_register_thread if @hb.db_handler.opts[:threadsafe]
+            @hb.ob.db.get_and_register_thread if @hb.ob.db.opts[:threadsafe]
+            
+            @working = true
+            @hb.log_puts "#{__id__} - Serving." if @debug
+            
+            @httpserver.count_block do
+              self.serve
+            end
+          ensure
+            @handler.delete_tempfiles
           end
         ensure
           @hb.log_puts "#{__id__} - Closing request." if @debug
@@ -132,11 +136,11 @@ class Hayabusa::Http_session < Hayabusa::Client_session
   end
   
   def self.finalize(id)
-    @hb.log_puts "Http_session finalize #{id}." if @debug
+    @hb.log_puts "Hayabusa: Http_session finalize #{id}." if @debug
   end
   
   def destruct
-    @hb.log_puts "Http_session destruct (#{@httpserver.http_sessions.length})" if @debug and @httpserver and @httpserver.http_sessions
+    @hb.log_puts "Hayabusa: Http_session destruct (#{@httpserver.http_sessions.length})" if @debug and @httpserver and @httpserver.http_sessions
     
     begin
       @socket.close if !@socket.closed?
@@ -153,7 +157,7 @@ class Hayabusa::Http_session < Hayabusa::Client_session
   end
   
   def serve
-    @hb.log_puts "Generating meta, cookie, get, post and headers." if @debug
+    @hb.log_puts "Hayabusa: Generating meta, cookie, get, post and headers." if @debug
     @meta = @handler.meta.merge(@socket_meta)
     @cookie = @handler.cookie
     @get = @handler.get
@@ -184,7 +188,7 @@ class Hayabusa::Http_session < Hayabusa::Client_session
     @browser = Knj::Web.browser(@meta)
     @ip = @hb.ip(:meta => @meta)
     
-    @hb.log_puts "Figuring out session-ID, session-object and more." if @debug
+    @hb.log_puts "Hayabusa: Figuring out session-ID, session-object and more." if @debug
     if @cookie["HayabusaSession"].to_s.length > 0
       @session_id = @cookie["HayabusaSession"]
     elsif @browser["browser"] == "bot"
@@ -213,7 +217,7 @@ class Hayabusa::Http_session < Hayabusa::Client_session
     end
     
     if @config.key?(:logging) and @config[:logging][:access_db]
-      @hb.log_puts "Doing access-logging." if @debug
+      @hb.log_puts "Hayabusa: Doing access-logging." if @debug
       @ips = [@meta["REMOTE_ADDR"]]
       @ips << @meta["HTTP_X_FORWARDED_FOR"].split(",")[0].strip if @meta["HTTP_X_FORWARDED_FOR"]
       @hb.logs_access_pending << {

data/lib/hayabusa_http_session_contentgroup.rb

@@ -3,7 +3,7 @@
 #This class handels the adding of content and writing to socket. Since this can be done with multiple threads and multiple IO's it can get complicated.
 class Hayabusa::Http_session::Contentgroup
   attr_reader :done, :cur_data
-  attr_accessor :chunked, :socket
+  attr_accessor :chunked, :socket, :content_length, :length_written
   NL = "\r\n"
   
   def initialize(args = {})
@@ -13,6 +13,8 @@ class Hayabusa::Http_session::Contentgroup
     @httpsession = args[:httpsession]
     @mutex = Mutex.new
     @debug = false
+    @length_written = args[:length_written] ? args[:length_written] : 0
+    @content_length = args[:content_length]
   end
   
   def init
@@ -30,6 +32,7 @@ class Hayabusa::Http_session::Contentgroup
     @done = false
     @thread = nil
     @forced = false
+    @length_written = 0
     
     @mutex.synchronize do
       self.new_io
@@ -55,7 +58,7 @@ class Hayabusa::Http_session::Contentgroup
   end
   
   def new_thread
-    cgroup = Hayabusa::Http_session::Contentgroup.new(:socket => @socket, :chunked => @chunked)
+    cgroup = Hayabusa::Http_session::Contentgroup.new(:socket => @socket, :chunked => @chunked, :content_length => @content_length)
     cgroup.init
     
     @mutex.synchronize do
@@ -92,6 +95,8 @@ class Hayabusa::Http_session::Contentgroup
           STDERR.puts "Error while writing."
           STDERR.puts e.inspect
           STDERR.puts e.backtrace
+          
+          raise e
         end
       end
     end
@@ -125,7 +130,12 @@ class Hayabusa::Http_session::Contentgroup
     
     @ios.each do |data|
       if data.is_a?(Hayabusa::Http_session::Contentgroup)
+        data.length_written = @length_written
+        data.content_length = @content_length
+        data.chunked = @chunked
         data.write_to_socket
+        
+        @length_written += data.length_written
       elsif data.key?(:str)
         if data[:str].is_a?(Hash) and data[:str][:type] == :file
           File.open(data[:str][:path], "r") do |file|
@@ -136,6 +146,8 @@ class Hayabusa::Http_session::Contentgroup
                 break
               end
               
+              add_to_length_written(buf.bytesize)
+              
               if @chunked
                 @socket.write("#{buf.length.to_s(16)}#{NL}#{buf}#{NL}")
               else
@@ -157,6 +169,7 @@ class Hayabusa::Http_session::Contentgroup
             #512 could take a long time for big pages. 16384 seems to be an optimal number.
             str.each_slice(16384) do |slice|
               buf = slice.pack("C*")
+              add_to_length_written(buf.bytesize)
               
               if @chunked
                 @socket.write("#{buf.length.to_s(16)}#{NL}#{buf}#{NL}")
@@ -173,4 +186,10 @@ class Hayabusa::Http_session::Contentgroup
     
     count += 1
   end
+  
+  # Adds the given size to the length written and raises an exception if it exceeds the sat content-length.
+  def add_to_length_written(size)
+    @length_written += size
+    raise "Content-Length overwritten: #{@length_written}, #{@content_length}" if @content_length != nil && @length_written > @content_length
+  end
 end

data/lib/hayabusa_http_session_post_multipart.rb

@@ -17,6 +17,7 @@ class Hayabusa::Http_session::Post_multipart
     @clength = 0
     @headers = {}
     @counts = {}
+    @files_arr = args[:files_arr]
     str_crlf = nil
     
     @args[:io].each do |line|
@@ -112,7 +113,11 @@ class Hayabusa::Http_session::Post_multipart
       return nil
     end
     
-    @data.close(false) if @data.is_a?(Tempfile)
+    if @data.is_a?(Tempfile)
+      @data.close(false)
+      @files_arr << @data.path if @data.respond_to?(:path)
+    end
+    
     raise "No 'content-disposition' was given (#{@headers}) (#{@data})." if !@name
     
     if @fname
@@ -203,4 +208,8 @@ class Hayabusa::Http_session::Post_multipart::File_upload
   def to_json(*args)
     raise "File_upload-objects should not be converted to json."
   end
+  
+  def unset
+    
+  end
 end

data/lib/hayabusa_http_session_request.rb

@@ -7,7 +7,7 @@ end
 
 #This class parses the various HTTP requests into easy programmable objects. Get, post, cookie, meta and so on...
 class Hayabusa::Http_session::Request
-  attr_reader :get, :post, :cookie, :meta, :page_path, :headers, :http_version, :read, :clength, :speed, :percent, :secs_left
+  attr_reader :get, :post, :cookie, :files_arr, :meta, :page_path, :headers, :http_version, :read, :clength, :speed, :percent, :secs_left
   
   #Sets the various required data on the object. Hayabusa, crlf and arguments.
   def initialize(args)
@@ -79,6 +79,7 @@ class Hayabusa::Http_session::Request
     
     @page_path = "#{@hb.config[:doc_root]}/#{page_filepath}"
     @get = Knj::Web.parse_urlquery(uri[:query], :urldecode => true, :force_utf8 => true)
+    @files_arr = []
     
     if @get["_hb_httpsession_id"]
       @hb.httpsessions_ids[@get["_hb_httpsession_id"]] = @args[:httpsession]
@@ -187,7 +188,8 @@ class Hayabusa::Http_session::Request
           post_treated = Hayabusa::Http_session::Post_multipart.new(
             :io => post_data,
             :boundary => match[1],
-            :crlf => @crlf
+            :crlf => @crlf,
+            :files_arr => @files_arr
           ).return
           post_data.close(true)
           
@@ -237,4 +239,12 @@ class Hayabusa::Http_session::Request
       Knj::Web.parse_name(seton, varname, value, args)
     end
   end
+  
+  #Deletes all tempfiles created by this object. This is useually called from Http_session at the end of a request.
+  def delete_tempfiles
+    @files_arr.delete_if do |tempfile_path|
+      File.unlink(tempfile_path) if File.exists?(tempfile_path)
+      true
+    end
+  end
 end

data/lib/hayabusa_http_session_response.rb

@@ -21,6 +21,7 @@ class Hayabusa::Http_session::Response
     401 => "Unauthorized",
     403 => "Forbidden",
     404 => "Not Found",
+    408 => "Request Timeout",
     500 => "Internal Server Error"
   }
   NL = "\r\n"
@@ -40,29 +41,18 @@ class Hayabusa::Http_session::Response
     @trailers = []
     @skip_statuscode = true if args[:mode] == :cgi
     @session_cookie = args[:cookie]
-    
     @headers_sent = false
     @headers_trailing = {}
-    
     @mode = args[:mode]
+    @cookies = []
     
     @headers = {
       "date" => ["Date", Time.now.httpdate]
     }
     
-    @headers_11 = {
-      "Connection" => "Keep-Alive"
-    }
     if args[:mode] != :cgi and (!args.key?(:chunked) or args[:chunked])
-      @headers_11["Transfer-Encoding"] = "chunked"
+      @chunked = true
     end
-    
-    #Socket-timeout is currently broken in JRuby.
-    if RUBY_ENGINE != "jruby"
-      @headers_11["Keep-Alive"] = "timeout=15, max=30"
-    end
-    
-    @cookies = []
   end
   
   def header(key, val)
@@ -70,19 +60,48 @@ class Hayabusa::Http_session::Response
     raise "Value contains more lines than 1 (#{lines})." if lines > 1
     
     if !@headers_sent
-      @headers[key.to_s.downcase] = [key, val]
+      @headers[key.to_s.downcase.strip] = [key, val]
     else
       raise "Headers already sent and given header was not in trailing headers: '#{key}'." if @trailers.index(key) == nil
-      @headers_trailing[key.to_s.downcase] = [key, val]
+      @headers_trailing[key.to_s.downcase.strip] = [key, val]
     end
   end
   
+  # Returns the value of a header.
+  def get_header_value(header)
+    header_p = header.to_s.downcase.strip
+    
+    gothrough = [@headers, @headers_trailing]
+    gothrough.each do |headers|
+      headers.each do |key, val|
+        return val[1] if header_p == key
+      end
+    end
+    
+    return nil
+  end
+  
+  # Returns true if the given header-name is sat.
+  def has_header?(header)
+    header_p = header.to_s.downcase.strip
+    return @headers.key?(header_p) || @headers_trailing.key?(header_p)
+  end
+  
   def cookie(cookie)
     @cookies << cookie
     @session_cookie[cookie["name"]] = cookie["value"]
   end
   
   def header_str
+    if @http_version == "1.1" && @chunked
+      self.header("Connection", "Keep-Alive")
+      self.header("Transfer-Encoding", "chunked")
+    elsif @http_version == "1.1" && get_header_value("content-length").to_i > 0
+      self.header("Connection", "Keep-Alive")
+    end
+    
+    self.header("Keep-Alive", "timeout=15, max=30") if self.get_header_value("connection") == "Keep-Alive"
+    
     if @skip_statuscode
       res = ""
     else
@@ -102,10 +121,6 @@ class Hayabusa::Http_session::Response
     end
     
     if @http_version == "1.1"
-      @headers_11.each do |key, val|
-        res << "#{key}: #{val}#{NL}"
-      end
-      
       @trailers.each do |trailer|
         res << "Trailer: #{trailer}#{NL}"
       end
@@ -121,8 +136,17 @@ class Hayabusa::Http_session::Response
   end
   
   def write
-    @headers_sent = true
+    # Write headers to socket.
     @socket.write(self.header_str)
+    @headers_sent = true
+    @cgroup.chunked = @chunked
+    
+    # Set the content-length on the content-group to enable write-lenght-validation.
+    if self.has_header?("content-length")
+      @cgroup.content_length = self.get_header_value("content-length").to_i
+    else
+      @cgroup.content_length = nil
+    end
     
     if @status == 304
       #do nothing.
@@ -138,12 +162,19 @@ class Hayabusa::Http_session::Response
         @socket.write(NL)
       else
         @cgroup.write_to_socket
-        @socket.write("#{NL}#{NL}") if @mode != :cgi
       end
     end
     
+    # Validate that no more has been written than given in content-length, since that will corrupt the client.
+    if self.has_header?("content-length")
+      length = cgroup.length_written
+      content_length = self.get_header_value("content-length").to_i
+      raise "More written than given in content-length: #{length}, #{content_length}" if length != content_length
+    end
+    
+    # Close socket if that should be done.
     if @close and @mode != :cgi
-      @hb.log_puts("Closing socket.")
+      @hb.log_puts("Hauabusa: Closing socket.")
       @socket.close
     end
   end

data/pages/debug_memory_usage.rhtml

@@ -1,7 +1,14 @@
 <%
   if _get["choice"] == "dogarbagecollect"
+    _hb.clean
     GC.start
-    _hb.redirect("?show=debug_memory_usage")
+    
+    #Clean all Knj::Objects used in the application.
+    ObjectSpace.each_object(Knj::Objects) do |objects|
+      objects.clean_all
+    end
+    
+    Knj::Web.redirect("?show=debug_memory_usage")
   end
 %>
 
@@ -11,6 +18,22 @@
   <input type="button" value="Garbage collect" onclick="location.href='?show=debug_memory_usage&amp;choice=dogarbagecollect';" />
 </div>
 
+<h1>Hayabusa sessions</h1>
+<table style="width: 600px;">
+  <tbody>
+    <tr>
+      <td>Active sessions</td>
+      <td><%=_hb.num(_hb.sessions.length, 0)%></td>
+    </tr>
+    <tr>
+      <td>Total sessions</td>
+      <td><%=_hb.num(_hb.ob.list(:Session, "count" => true), 0)%>
+    </tr>
+  </tbody>
+</table>
+
+<br />
+
 <%
   Knj::Memory_analyzer.new.write
 %>

data/spec/hayabusa_spec.rb

@@ -63,21 +63,56 @@ 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, :encoding_gzip => false, :debug => false)
+    http = Http2.new(:host => "localhost", :port => 80, :encoding_gzip => false, :debug => false) rescue nil
     
     $testmodes = [{
       :name => :standalone,
       :path_pre => "",
-      :http => Http2.new(:host => "localhost", :port => 1515)
-    },{
-      :name => :cgi,
-      :path_pre => "hayabusa_cgi_test/",
-      :http => http
-    },{
-      :name => :fcgi,
-      :path_pre => "hayabusa_fcgi_test/",
-      :http => http
+      :http => Http2.new(:host => "localhost", :port => 1515, :debug => false)
     }]
+    
+    if http
+      $testmodes += [{
+        :name => :cgi,
+        :path_pre => "hayabusa_cgi_test/",
+        :http => http
+      },{
+        :name => :fcgi,
+        :path_pre => "hayabusa_fcgi_test/",
+        :http => http
+      }]
+    end
+  end
+  
+  it "should be able to get multiple pictures" do
+    require "base64"
+    require "RMagick"
+    
+    # Symlink 'image.rhtml' first.
+    img_from_path = "#{Knj.knjrbfw_path}/webscripts/image.rhtml"
+    img_to_path = "#{File.realpath("#{File.dirname(__FILE__)}/../pages")}/image.rhtml"
+    
+    raise "Invalid from path: '#{img_from_path}'." unless File.exists?(img_from_path)
+    
+    File.unlink(img_to_path) if File.symlink?(img_to_path)
+    File.symlink(img_from_path, img_to_path)
+    
+    begin
+      $testmodes.each do |tdata|
+        5.times do
+          path = "#{File.dirname(__FILE__)}/../pages/testpic.jpeg"
+          
+          res = tdata[:http].get("#{tdata[:path_pre]}testpic.jpeg")
+          res.body.bytesize.should eql(File.size(path))
+          
+          res.body.bytes.to_a.should eql(File.read(path).bytes.to_a)
+          
+          res = tdata[:http].get("#{tdata[:path_pre]}image.rhtml?force=true&path64=#{Base64.encode64("testpic.jpeg").to_s.strip}")
+        end
+      end
+    ensure
+      File.unlink(img_to_path) if File.exists?(img_to_path)
+    end
   end
   
   #it "should be able to handle custom urls" do
@@ -128,8 +163,6 @@ describe "Hayabusa" do
     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")
@@ -356,8 +389,6 @@ describe "Hayabusa" do
     end
   end
   
-  end
-  
   it "should be able to stop." do
     $appserver.stop
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hayabusa
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 +02:00
-default_executable: 
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &23615180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23615180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &23614160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23614160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &23613380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23613380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: datet
-  requirement: &23612560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23612560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: http2
-  requirement: &23611880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23611880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tpool
-  requirement: &23611160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +101,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23611160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fcgi
-  requirement: &23610420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_process
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +133,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23610420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &23609720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23609720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23609120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +165,15 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *23609120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23606820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +181,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *23606820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23606100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +197,31 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *23606100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &23605540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +229,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23605540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A threadded web/app-server that focuses on threadding, shared ressources,
   speed and more.
 email: k@spernj.org
@@ -239,13 +330,13 @@ files:
 - pages/spec_vars_header.rhtml
 - pages/spec_vars_post.rhtml
 - pages/spec_vars_post_fileupload.rhtml
+- pages/testpic.jpeg
 - pages/tests.rhtml
 - pages/threadded_content_test.rhtml
 - spec/fcgi_multiple_processes_spec.rb
 - spec/hayabusa_spec.rb
 - spec/spec_helper.rb
 - spec/test_upload.xlsx
-has_rdoc: true
 homepage: http://github.com/kaspernj/hayabusa
 licenses:
 - MIT
@@ -261,7 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2750597640536201998
+      hash: 4203364333015306411
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -270,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A threadded web/app-server that supports stand-alone, CGI and FCGI-modes.