hayabusa 0.0.3 → 0.0.4

data/lib/hayabusa_http_session_request.rb

@@ -19,7 +19,16 @@ class Hayabusa::Http_session::Request
   #Reads content from the socket until the end of headers. Also does various error-checks.
   def read_socket(socket, cont)
     loop do
-      raise Errno::ECONNRESET, "Socket closed." if socket.closed?
+      if socket.closed?
+        if !cont.empty?
+          #This might just be the last allowed request...
+          break
+        else
+          #This should not have happened...
+          raise Errno::ECONNRESET, "Socket closed before trying to read."
+        end
+      end
+      
       read = socket.gets
       raise Errno::ECONNRESET, "Socket returned non-string: '#{read.class.name}'." if !read.is_a?(String)
       cont << read
@@ -58,15 +67,18 @@ class Hayabusa::Http_session::Request
     method = match[1]
     cont = cont.gsub(match[0], "")
     
+    uri_raw = match[2]
+    uri_raw = "index.rhtml" if uri_raw == ""
+    
     uri = Knj::Web.parse_uri(match[2])
     
     page_filepath = Knj::Web.urldec(uri[:path])
-    if page_filepath.length <= 0 or page_filepath == "/" or File.directory?("#{@hb.config[:doc_root]}/#{page_filepath}")
+    if page_filepath.empty? or page_filepath == "/" or File.directory?("#{@hb.config[:doc_root]}/#{page_filepath}")
       page_filepath = "#{page_filepath}/#{@hb.config[:default_page]}"
     end
     
     @page_path = "#{@hb.config[:doc_root]}/#{page_filepath}"
-    @get = Knj::Web.parse_urlquery(uri[:query], {:urldecode => true, :force_utf8 => true})
+    @get = Knj::Web.parse_urlquery(uri[:query], :urldecode => true, :force_utf8 => true)
     
     if @get["_hb_httpsession_id"]
       @hb.httpsessions_ids[@get["_hb_httpsession_id"]] = @args[:httpsession]

data/lib/hayabusa_http_session_response.rb

@@ -139,6 +139,9 @@ class Hayabusa::Http_session::Response
       end
     end
     
-    @socket.close if @close and @mode != :cgi
+    if @close and @mode != :cgi
+      _hb.log_puts("Closing socket.")
+      @socket.close
+    end
   end
 end

data/lib/kernel_ext/gettext_methods.rb

@@ -2,7 +2,7 @@
 
 def _(str)
   hb = _hb
-  session = _session
+  session = Thread.current[:hayabusa][:session].sess_data if Thread.current[:hayabusa] and Thread.current[:hayabusa][:session]
   locale = nil
   
   if Thread.current[:locale].to_s.length > 0

data/lib/kernel_ext/magic_methods.rb

@@ -20,7 +20,6 @@ end
 
 def _session
   return Thread.current[:hayabusa][:session].sess_data if Thread.current[:hayabusa] and Thread.current[:hayabusa][:session]
-  raise "Session was not registered on thread."
 end
 
 def _session_hash

metadata

@@ -2,7 +2,7 @@
 name: hayabusa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-17 00:00:00 +02:00
+date: 2012-08-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,19 +69,30 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: tpool
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,10 +100,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -100,10 +111,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,10 +122,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,7 +133,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 description: A threadded web/app-server that focuses on threadding, shared ressources, speed and more.
 email: k@spernj.org
 executables: 
@@ -172,6 +183,7 @@ files:
 - lib/hayabusa_ext/threadding_timeout.rb
 - lib/hayabusa_ext/translations.rb
 - lib/hayabusa_ext/web.rb
+- lib/hayabusa_fcgi.rb
 - lib/hayabusa_http_server.rb
 - lib/hayabusa_http_session.rb
 - lib/hayabusa_http_session_contentgroup.rb
@@ -237,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3172074389611406810
+      hash: -4467639254146667780
       segments: 
       - 0
       version: "0"