knjappserver 0.0.16 → 0.0.17

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

data/bin/knjappserver_start.rb

@@ -1,16 +1,25 @@
 #!/usr/bin/env ruby
 
 require "#{File.dirname(__FILE__)}/../lib/knjappserver.rb"
-require "knjrbfw"
+
+knjrbfw_path = ""
 
 ARGV.each do |arg|
-   if arg == "--active_support"
-      ARGV.delete(arg)
-      require "active_support"
-      require "active_support/core_ext"
-   end
+  if arg == "--active_support"
+    ARGV.delete(arg)
+    require "active_support"
+    require "active_support/core_ext"
+  elsif match = arg.match(/--knjrbfw_path=(.+)/)
+    knjrbfw_path = match[1]
+    ARGV.delete(arg)
+  else
+    print "Unknown argument: '#{arg}'.\n"
+    exit
+  end
 end
 
+require "#{knjrbfw_path}knjrbfw"
+
 filepath = File.dirname(__FILE__) + "/../lib/"
 
 if File.exists?($0)
@@ -20,31 +29,14 @@ else
 end
 
 require "#{conf_path}conf/conf_vars"
-require "webrick"
 require "#{$knjappserver_config["knjrbfw"]}knj/autoload"
-require "#{$knjappserver_config["knjrbfw"]}knj/ext/webrick"
 
 $knjappserver = {
-	:path => Knj::Php.realpath(File.dirname(__FILE__))
+	:path => File.realpath(File.dirname(__FILE__))
 }
 
-Knj::Os.chdir_file(Knj::Php.realpath(__FILE__))
+Knj::Os.chdir_file(File.realpath(__FILE__))
 require "#{filepath}include/class_knjappserver.rb"
 
-#Lets hack the $stdout to make it possible to have many running threads that all uses print.
-require "#{filepath}include/class_customio.rb"
-cio = Knjappserver::CustomIO.new
-$stdout = cio
-
-Thread.new do
-	loop do
-		sleep 30
-		GC.enable if RUBY_ENGINE != "jruby"
-		GC.enable
-		GC.start
-		ObjectSpace.garbage_collect
-	end
-end
-
 print "Starting knjAppServer.\n"
 require "#{conf_path}conf/conf"

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.16"
+  s.version = "0.0.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2011-11-15}
+  s.date = %q{2012-02-21}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]
@@ -36,17 +36,18 @@ Gem::Specification.new do |s|
     "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",
@@ -68,13 +69,23 @@ Gem::Specification.new do |s|
     "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"
   ]
   s.homepage = %q{http://github.com/kaspernj/knjappserver}

data/lib/conf/conf_example.rb

@@ -1,4 +1,4 @@
-rpath = Knj::Php.realpath(File.dirname(__FILE__) + "/../include/class_erbhandler.rb")
+rpath = File.realpath(File.dirname(__FILE__) + "/../include/class_erbhandler.rb")
 require rpath
 erbhandler = Knjappserver::ERBHandler.new
 
@@ -38,7 +38,8 @@ begin
 		end
 	end.parse!
 rescue OptionParser::InvalidOption => e
-	Knj::Php.die(e.message + "\n")
+	print "#{e.message}\n"
+	exit
 end
 
 $knjappserver[:knjappserver] = Knjappserver.new(
@@ -52,7 +53,6 @@ $knjappserver[:knjappserver] = Knjappserver.new(
 	:doc_root => "[path to rhtml files]",
 	:hostname => false,
 	:default_filetype => "text/html",
-	:engine_webrick => true,
 	:error_report_emails => ["admin_email"],
 	:error_report_from => "robot_email",
 	:locales_root => "[path to locale files]",

data/lib/files/database_schema.rb

@@ -116,8 +116,7 @@ class Knjappserver
         ],
         "indexes_remove" => {
           "object_class" => true
-        },
-        "renames" => ["translations"]
+        }
       }
     }
   }

data/lib/include/class_customio.rb

@@ -1,35 +1,18 @@
 class Knjappserver::CustomIO < StringIO
 	def print(str)
-		thread = Thread.current
 		str = str.to_s
+		appsrv = Thread.current[:knjappserver]
 		
-    if thread and thread[:knjappserver] and thread[:knjappserver][:contentgroup]
-      httpsession = thread[:knjappserver][:httpsession]
-      
-      if httpsession
-        wsize = httpsession.written_size
-        wsize += str.size
-        
-        if wsize >= httpsession.size_send
-          httpsession.cgroup.write_output
-        end
-      end
-      
-      thread[:knjappserver][:contentgroup].write(str)
+    if appsrv and cgroup = appsrv[:contentgroup] and httpsession = appsrv[:httpsession]
+      httpsession.add_size(str.size)
+      cgroup.write(str)
 		else
 			STDOUT.print(str) if !STDOUT.closed?
 		end
 	end
 	
-	def <<(str)
-		self.print(str)
-	end
-	
-	def write(str)
-		self.print(str)
-	end
-	
-	def p(str)
-    self.print(str)
-	end
+	alias << print
+	alias write print
+	alias p print
+	alias puts print
 end

data/lib/include/class_erbhandler.rb

@@ -14,6 +14,12 @@ class Knjappserver::ERBHandler
 			@connected[eruby.__id__] = true
 		end
 		
-		eruby.import(httpsess.page_path)
+		if !File.exists?(httpsess.page_path)
+      eruby.import("#{File.dirname(__FILE__)}/../pages/error_notfound.rhtml")
+    else
+      eruby.import(httpsess.page_path)
+    end
+    
+    httpsess.resp.status = 500 if eruby.error
 	end
 end

data/lib/include/class_httpserver.rb

@@ -5,45 +5,58 @@ class Knjappserver::Httpserver
 	def initialize(kas)
 		@kas = kas
 		@debug = @kas.config[:debug]
+		@mutex_count = Mutex.new
 	end
 	
 	def start
     @http_sessions = []
     @working_count = 0
     
-    raise "No host was given." if !@kas.config.has_key?(:host)
-    raise "No port was given." if !@kas.config.has_key?(:port)
+    raise "No host was given." if @kas and !@kas.config.has_key?(:host)
+    raise "No port was given." if @kas and !@kas.config.has_key?(:port)
 		@server = TCPServer.new(@kas.config[:host], @kas.config[:port])
 		
-		@thread_accept = Knj::Thread.new do
-			loop do
-				if !@server or @server.closed?
-					sleep 1
-					next
-				end
-				
-				begin
-					self.spawn_httpsession(@server.accept)
-					STDOUT.print "Starting new HTTP-request.\n" if @debug
-				rescue => e
-					STDOUT.puts e.inspect
-					STDOUT.puts e.backtrace
-					STDOUT.print "\n"
-					STDOUT.print "Could not accept HTTP-request - waiting 1 sec and then trying again.\n"
-					sleep 1
-				end
-			end
+		@thread_accept = Thread.new do
+      begin
+        loop do
+          if !@server or @server.closed?
+            sleep 1
+            next
+          end
+          
+          begin
+            self.spawn_httpsession(@server.accept)
+            STDOUT.print "Starting new HTTP-request.\n" if @debug
+          rescue => e
+            STDOUT.puts e.inspect
+            STDOUT.puts e.backtrace
+            STDOUT.print "\n"
+            STDOUT.print "Could not accept HTTP-request - waiting 1 sec and then trying again.\n"
+            sleep 1
+          end
+        end
+      rescue => e
+        STDOUT.print Knj::Errors.error_str(e)
+      end
 		end
 		
-		@thread_restart = Knj::Thread.new do
-      loop do
-        sleep 10
-        break if @kas.should_restart and @kas.should_restart_done
-        
-        if !@kas.should_restart and (!@server or @server.closed?)
-          STDOUT.print "Socket does not exist or is closed - restarting HTTP-server!\n"
-          @server = TCPServer.new(@kas.config[:host], @kas.config[:port])
-          STDOUT.print "Done.\n"
+		@thread_restart = Thread.new do
+      begin
+        loop do
+          sleep 10
+          break if @kas.should_restart and @kas.should_restart_done
+          
+          if !@kas.should_restart and (!@server or @server.closed?)
+            STDOUT.print "Socket does not exist or is closed - restarting HTTP-server!\n"
+            @server = TCPServer.new(@kas.config[:host], @kas.config[:port])
+            STDOUT.print "Done.\n"
+          end
+        end
+      rescue => e
+        if @kas
+          @kas.handle_error(e)
+        else
+          STDOUT.print Knj::Errors.error_str(e)
         end
       end
     end
@@ -93,11 +106,14 @@ class Knjappserver::Httpserver
     @http_sessions << Knjappserver::Httpsession.new(self, socket)
 	end
 	
-	def handle_request(&block)
-    @working_count += 1 if @working_count
-    begin
-      block.call
-    ensure
+	def count_add
+    @mutex_count.synchronize do
+      @working_count += 1 if @working_count
+    end
+	end
+	
+	def count_remove
+    @mutex_count.synchronize do
       @working_count -= 1 if @working_count
     end
 	end

data/lib/include/class_httpsession.rb

@@ -1,8 +1,13 @@
-require "digest"
-
 class Knjappserver::Httpsession
-  attr_accessor :data, :size_send, :alert_sent
-  attr_reader :session, :session_id, :session_hash, :kas, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :cgroup, :written_size
+  attr_accessor :data, :alert_sent
+  attr_reader :session, :session_id, :session_hash, :kas, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :cgroup, :meta, :httpsession_var, :handler, :working
+  
+  dir = File.dirname(__FILE__)
+  
+  autoload :Contentgroup, "#{dir}/class_httpsession_contentgroup.rb"
+  autoload :Http_request, "#{dir}/class_httpsession_http_request.rb"
+  autoload :Http_response, "#{dir}/class_httpsession_http_response.rb"
+  autoload :Post_multipart, "#{dir}/class_httpsession_post_multipart.rb"
   
   def initialize(httpserver, socket)
     @data = {}
@@ -14,33 +19,48 @@ class Knjappserver::Httpsession
     @active = true
     @eruby = Knj::Eruby.new(:cache_hash => @kas.eruby_cache)
     @debug = @kas.debug
+    @handlers_cache = @config[:handlers_cache]
+    @httpsession_var = {}
+    
+    #Set socket stuff.
+    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
+    
+    @socket_meta = {
+      "REMOTE_ADDR" => addr[2],
+      "REMOTE_PORT" => addr[1],
+      "SERVER_ADDR" => addr_peer[2],
+      "SERVER_PORT" => addr_peer[1]
+    }
+    
+    @resp = Knjappserver::Httpsession::Http_response.new(:socket => @socket)
+    @handler = Knjappserver::Httpsession::Http_request.new(:kas => @kas, :httpsession => self)
     
     @cgroup = Knjappserver::Httpsession::Contentgroup.new(
       :socket => @socket,
-      :restart_proc => proc{
-        begin
-          @resp.write(@socket) if @meta["METHOD"] != "HEAD"
-        rescue Errno::ECONNRESET, Errno::ENOTCONN, Errno::EPIPE, Timeout::Error
-          #Ignore - the user probaly left.
-        end
-      }
+      :kas => @kas,
+      :resp => @resp,
+      :httpsession => self
     )
-    
-    @resp = Knjappserver::Httpresp.new(:cgroup => @cgroup)
-    
-    require "#{File.dirname(__FILE__)}/class_httpsession_knjengine"
-    @handler = Knjappserver::Httpsession::Knjengine.new(:kas => @kas)
+    @resp.cgroup = @cgroup
     
     Dir.chdir(@config[:doc_root])
     ObjectSpace.define_finalizer(self, self.class.method(:finalize).to_proc) if @debug
     STDOUT.print "New httpsession #{self.__id__} (total: #{@httpserver.http_sessions.count}).\n" if @debug
     
-    @thread_request = Knj::Thread.new do
+    @thread_request = Thread.new do
       Thread.current[:knjappserver] = {} if !Thread.current[:knjappserver]
       
-      @kas.db_handler.get_and_register_thread if @kas.db_handler.opts[:threadsafe]
-      @kas.ob.db.get_and_register_thread if @kas.ob.db.opts[:threadsafe]
-      
       begin
         while @active
           begin
@@ -48,8 +68,9 @@ class Knjappserver::Httpsession
             @written_size = 0
             @size_send = @config[:size_send]
             @alert_sent = false
+            @working = false
             
-            Timeout.timeout(30) do
+            Timeout.timeout(1500) do
               @handler.socket_parse(@socket)
             end
             
@@ -58,18 +79,31 @@ class Knjappserver::Httpsession
               sleep 0.1
             end
             
+            break if @kas.should_restart
+            
             if @config.key?(:max_requests_working)
-              while @httpserver.working_count >= @config[:max_requests_working]
+              while @httpserver and @config and @httpserver.working_count.to_i >= @config[:max_requests_working].to_i
                 STDOUT.print "Maximum amounts of requests are working (#{@httpserver.working_count}, #{@config[:max_requests_working]}) - sleeping.\n" if @debug
                 sleep 0.1
               end
             end
             
-            @httpserver.handle_request do
-              self.serve
-            end
+            #Reserve database connections.
+            @kas.db_handler.get_and_register_thread if @kas.db_handler.opts[:threadsafe]
+            @kas.ob.db.get_and_register_thread if @kas.ob.db.opts[:threadsafe]
+            
+            @httpserver.count_add
+            @working = true
+            STDOUT.print "Serving.\n" if @debug
+            self.serve
           ensure
+            @httpserver.count_remove
             @kas.served += 1 if @kas
+            @working = false
+            
+            #Free reserved database-connections.
+            @kas.db_handler.free_thread if @kas and @kas.db_handler.opts[:threadsafe]
+            @kas.ob.db.free_thread if @kas and @kas.ob.db.opts[:threadsafe]
           end
         end
       rescue Errno::ECONNRESET, Errno::ENOTCONN, Errno::EPIPE, Timeout::Error => e
@@ -78,25 +112,29 @@ class Knjappserver::Httpsession
         #STDOUT.puts e.backtrace
       rescue SystemExit, Interrupt => e
         raise e
-      rescue RuntimeError, Exception => e
+      rescue Exception => e
         STDOUT.puts e.inspect
         STDOUT.puts e.backtrace
       ensure
-        @kas.db_handler.free_thread if @kas and @kas.db_handler.opts[:threadsafe]
-        @kas.ob.db.free_thread if @kas and @kas.ob.db.opts[:threadsafe]
         self.destruct
       end
     end
   end
   
+  #Is called when content is added and begings to write the output if it goes above the limit.
+  def add_size(size)
+    @written_size += size
+    @cgroup.write_output if @written_size >= @size_send
+  end
+  
   def threadded_content(block)
     raise "No block was given." if !block
-    cgroup_data = Thread.current[:knjappserver][:contentgroup].new_thread
+    cgroup = Thread.current[:knjappserver][:contentgroup].new_thread
     
-    cgroup_data[:thread] = Thread.new(Thread.current[:knjappserver].clone) do |data|
+    Thread.new do
       begin
         self.init_thread
-        cgroup_data[:cgroup].register_thread
+        cgroup.register_thread
         
         @kas.db_handler.get_and_register_thread if @kas and @kas.db_handler.opts[:threadsafe]
         @kas.ob.db.get_and_register_thread if @kas and @kas.ob.db.opts[:threadsafe]
@@ -132,7 +170,7 @@ class Knjappserver::Httpsession
     STDOUT.print "Httpsession destruct (#{@httpserver.http_sessions.length})\n" if @debug and @httpserver and @httpserver.http_sessions
     
     begin
-      @socket.close if @socket and !@socket.closed?
+      @socket.close if !@socket.closed?
     rescue => e
       STDOUT.puts e.inspect
       STDOUT.puts e.backtrace
@@ -140,31 +178,19 @@ class Knjappserver::Httpsession
     end
     
     @httpserver.http_sessions.delete(self) if @httpserver and @httpserver.http_sessions
-    @httpserver = nil
-    
-    @data = nil
-    @kas = nil
-    @active = nil
-    @session = nil
-    @session_id = nil
-    @session_hash = nil
-    @out = nil
-    @socket = nil
-    @browser = nil
-    @resp = nil
-    @cgroup = nil
-    @handler = nil
     
     @eruby.destroy if @eruby
-    @eruby = nil
-    
-    thread = @thread_request
-    @thread_request = nil
-    thread.kill if thread and thread.alive?
+    @thread_request.kill if @thread_request.alive?
+  end
+  
+  #Forces the content to be the input - nothing else can be added after calling this.
+  def force_content(newcont)
+    @cgroup.force_content(newcont)
   end
   
   def serve
-    @meta = @handler.meta
+    STDOUT.print "Generating meta, cookie, get, post and headers.\n" if @debug
+    @meta = @handler.meta.merge!(@socket_meta)
     @cookie = @handler.cookie
     @get = @handler.get
     @post = @handler.post
@@ -177,8 +203,10 @@ class Knjappserver::Httpsession
     )
     if @handler.http_version == "1.1"
       @cgroup.chunked = true
+      @resp.chunked = true
     else
       @cgroup.chunked = false
+      @resp.chunked = false
     end
     
     @page_path = @handler.page_path
@@ -198,21 +226,22 @@ class Knjappserver::Httpsession
       raise "Could not figure out the IP of the session."
     end
     
+    STDOUT.print "Figuring out session-ID, session-object and more.\n" if @debug
     if @cookie["KnjappserverSession"].to_s.length > 0
       @session_id = @cookie["KnjappserverSession"]
     elsif @browser["browser"] == "bot"
       @session_id = "bot"
     else
-      @session_id = @kas.session_generate_id(:meta => @meta)
+      @session_id = @kas.session_generate_id(@meta)
       send_cookie = true
     end
     
     begin
-      session = @kas.session_fromid(:idhash => @session_id, :ip => @ip, :meta => @meta)
+      @session, @session_hash = @kas.session_fromid(@ip, @session_id, @meta)
     rescue Knj::Errors::InvalidData => e
       #User should not have the session he asked for because of invalid user-agent or invalid IP.
-      @session_id = @kas.session_generate_id(:meta => meta)
-      session = @kas.session_fromid(:idhash => @session_id, :ip => @ip, :meta => meta)
+      @session_id = @kas.session_generate_id(@meta)
+      @session, @session_hash = @kas.session_fromid(@ip, @session_id, @meta)
       send_cookie = true
     end
     
@@ -225,10 +254,8 @@ class Knjappserver::Httpsession
       )
     end
     
-    @session = session[:dbobj]
-    @session_hash = session[:hash]
-    
     if @config.key?(:logging) and @config[:logging][:access_db]
+      STDOUT.print "Doing access-logging.\n" if @debug
       @ips = [@meta["REMOTE_ADDR"]]
       @ips << @meta["HTTP_X_FORWARDED_FOR"].split(",")[0].strip if @meta["HTTP_X_FORWARDED_FOR"]
       @kas.logs_access_pending << {
@@ -242,58 +269,68 @@ class Knjappserver::Httpsession
       }
     end
     
+    STDOUT.print "Initializing thread and content-group.\n" if @debug
     self.init_thread
     Thread.current[:knjappserver][:contentgroup] = @cgroup
     time_start = Time.now.to_f if @debug
-    self.serve_real
-    @cgroup.mark_done
-    @cgroup.write_output
-    STDOUT.print "#{__id__} - Served '#{@meta["REQUEST_URI"]}' in #{Time.now.to_f - time_start} secs (#{@resp.status}).\n" if @debug
-    @cgroup.join
-  end
-  
-  def serve_real
-    #check if we should use a handler for this request.
-    @config[:handlers].each do |handler_info|
-      if handler_info.key?(:file_ext) and handler_info[:file_ext] == @ext
-        return handler_info[:callback].call(self)
-      elsif handler_info.key?(:path) and handler_info[:mount] and @meta["SCRIPT_NAME"].slice(0, handler_info[:path].length) == handler_info[:path]
-        @page_path = "#{handler_info[:mount]}#{@meta["SCRIPT_NAME"].slice(handler_info[:path].length, @meta["SCRIPT_NAME"].length)}"
-        break
-      end
-    end
-    
-    cache_control = {}
-    cache_use = true
     
-    if @headers["cache-control"] and @headers["cache-control"][0]
-      @headers["cache-control"][0].scan(/(.+)=(.+)/) do |match|
-        cache_control[match[1]] = match[2]
-      end
-    end
+    @kas.events.call(:request_begin, {
+      :httpsession => self
+    }) if @kas.events
     
-    cache_use = false if cache_control.key?("max-age") and cache_control["max-age"].to_i <= 0
-    
-    if !File.exists?(@page_path)
-      @resp.status = 404
-      @resp.header("Content-Type", "text/html")
-      @cgroup.write("File you are looking for was not found: '#{@meta["REQUEST_URI"]}'.")
+    if @handlers_cache.key?(@ext)
+      STDOUT.print "Calling handler.\n" if @debug
+      @handlers_cache[@ext].call(self)
     else
-      lastmod = File.mtime(@page_path)
-      
-      @resp.header("Last-Modified", lastmod.httpdate)
-      @resp.header("Expires", (Time.now + 86400).httpdate) #next day.
+      #check if we should use a handler for this request.
+      @config[:handlers].each do |handler_info|
+        if handler_info.key?(:file_ext) and handler_info[:file_ext] == @ext
+          return handler_info[:callback].call(self)
+        elsif handler_info.key?(:path) and handler_info[:mount] and @meta["SCRIPT_NAME"].slice(0, handler_info[:path].length) == handler_info[:path]
+          @page_path = "#{handler_info[:mount]}#{@meta["SCRIPT_NAME"].slice(handler_info[:path].length, @meta["SCRIPT_NAME"].length)}"
+          break
+        end
+      end
       
-      if cache_use and @headers["if-modified-since"] and @headers["if-modified-since"][0]
-        request_mod = Knj::Datet.parse(@headers["if-modified-since"][0]).time
+      if !File.exists?(@page_path)
+        @resp.status = 404
+        @resp.header("Content-Type", "text/html")
+        @cgroup.write("File you are looking for was not found: '#{@meta["REQUEST_URI"]}'.")
+      else
+        if @headers["cache-control"] and @headers["cache-control"][0]
+          cache_control = {}
+          @headers["cache-control"][0].scan(/(.+)=(.+)/) do |match|
+            cache_control[match[1]] = match[2]
+          end
+        end
+        
+        cache_dont = true if cache_control and cache_control.key?("max-age") and cache_control["max-age"].to_i <= 0
+        lastmod = File.mtime(@page_path)
         
-        if request_mod == lastmod
-          @resp.status = 304
-          return nil
+        @resp.header("Last-Modified", lastmod.httpdate)
+        @resp.header("Expires", (Time.now + 86400).httpdate) #next day.
+        
+        if !cache_dont and @headers["if-modified-since"] and @headers["if-modified-since"][0]
+          request_mod = Knj::Datet.parse(@headers["if-modified-since"][0]).time
+          
+          if request_mod == lastmod
+            @resp.status = 304
+            return nil
+          end
         end
+        
+        @cgroup.new_io(File.new(@page_path))
       end
-      
-      @cgroup.new_io(File.new(@page_path))
     end
+    
+    @cgroup.mark_done
+    @cgroup.write_output
+    STDOUT.print "#{__id__} - Served '#{@meta["REQUEST_URI"]}' in #{Time.now.to_f - time_start} secs (#{@resp.status}).\n" if @debug
+    @cgroup.join
+    
+    @kas.events.call(:request_done, {
+      :httpsession => self
+    }) if @kas.events
+    @httpsession_var = {}
   end
 end