hayabusa 0.0.24 → 0.0.29

data/lib/hayabusa_ext/mailing.rb

@@ -7,8 +7,8 @@ class Hayabusa
     require "knj/autoload/ping"
     
     @mails_waiting = []
-    @mails_mutex = Monitor.new
-    @mails_queue_mutex = Monitor.new
+    @mails_mutex = ::Monitor.new
+    @mails_queue_mutex = ::Monitor.new
     @mails_timeout = self.timeout(:time => @config[:mailing_time], &self.method(:mail_flush))
   end
   
@@ -60,7 +60,8 @@ 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
-      Ruby_process::Cproxy.run do |data|
+      require "ruby_process"
+      ::Ruby_process::Cproxy.run do |data|
         subproc = data[:subproc]
         subproc.static(:Object, :require, "rubygems")
         subproc.static(:Object, :require, "mail")
@@ -78,7 +79,7 @@ class Hayabusa
             #ignore - 
           rescue => e
             @mails_waiting.delete(mail)
-            self.handle_error(e, {:email => false})
+            self.handle_error(e, :email => false)
           end
           
           sleep 1 #sleep so we dont take up too much bandwidth.
@@ -122,13 +123,13 @@ class Hayabusa
       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 = ::Knj::Mailobj.new(@args[:hb].config[:smtp_args])
       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.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
       

data/lib/hayabusa_ext/web.rb

@@ -172,4 +172,9 @@ class Hayabusa
       raise "Could not figure out IP from meta-data."
     end
   end
+  
+  # Returns the currelt URL.
+  def current_url
+    return Knj::Web.url
+  end
 end

data/lib/hayabusa_fcgi.rb

@@ -13,6 +13,17 @@ class Hayabusa::Fcgi
     @debug = false
   end
   
+  def conf_path
+    #Parse the configuration-header and generate Hayabusa-config-hash.
+    if @cgi.env["HAYABUSA_FCGI_CONFIG"].to_s.length > 0
+      return @cgi.env["HAYABUSA_FCGI_CONFIG"]
+    elsif @cgi.env["HTTP_HAYABUSA_FCGI_CONFIG"].to_s.length > 0
+      return @cgi.env["HTTP_HAYABUSA_FCGI_CONFIG"]
+    else
+      raise "No HTTP_HAYABUSA_FCGI_CONFIG-header was given or HAYABUSA_FCGI_CONFIG environment variable."
+    end
+  end
+  
   #Evaluates if a new host-process should be started or we should proxy calls to an existing one.
   def evaluate_mode
     #If this is a FCGI-proxy-instance then the HTTP-connection should be checked if it is working.
@@ -25,9 +36,7 @@ class Hayabusa::Fcgi
     #Skip the actual check if Hayabusa is spawned or this is a working FCGI-proxy-instance.
     return nil if @hayabusa or @fcgi_proxy
     
-    #Parse the configuration-header and generate Hayabusa-config-hash.
-    raise "No HTTP_HAYABUSA_FCGI_CONFIG-header was given." if !@cgi.env["HTTP_HAYABUSA_FCGI_CONFIG"]
-    @hayabusa_fcgi_conf_path = @cgi.env["HTTP_HAYABUSA_FCGI_CONFIG"]
+    @hayabusa_fcgi_conf_path = conf_path
     require @hayabusa_fcgi_conf_path
     raise "No 'Hayabusa::FCGI_CONF'-constant was spawned by '#{@cgi.env["HTTP_HAYABUSA_FCGI_CONFIG"]}'." if !Hayabusa.const_defined?(:FCGI_CONF)
     conf = Hayabusa::FCGI_CONF
@@ -148,7 +157,7 @@ class Hayabusa::Fcgi
           end
           
           #Ensure the same FCGI-process isnt active for more than one website.
-          raise "Expected 'HTTP_HAYABUSA_FCGI_CONFIG' to be '#{@hayabusa_fcgi_conf_path}' but it wasnt: '#{cgi.env["HTTP_HAYABUSA_FCGI_CONFIG"]}'." if @hayabusa_fcgi_conf_path and @hayabusa_fcgi_conf_path != cgi.env["HTTP_HAYABUSA_FCGI_CONFIG"]
+          raise "Expected 'HTTP_HAYABUSA_FCGI_CONFIG' to be '#{@hayabusa_fcgi_conf_path}' but it wasnt: '#{conf_path}' #{@cgi.env}" if @hayabusa_fcgi_conf_path != conf_path
           
           #Proxy request to the host-FCGI-process.
           raise "No proxy spawned." unless @fcgi_proxy

data/lib/hayabusa_http_session.rb

@@ -179,6 +179,8 @@ class Hayabusa::Http_session < Hayabusa::Client_session
     end
     
     @page_path = @handler.page_path
+    @hb.log_puts "Hayabusa: Page path: #{@page_path}" if @debug
+    
     @ext = File.extname(@page_path).downcase[1..-1].to_s
     
     @ctype = @types[@ext.to_sym] if @ext.length > 0 and @types.key?(@ext.to_sym)

data/lib/hayabusa_http_session_contentgroup.rb

@@ -79,8 +79,14 @@ class Hayabusa::Http_session::Contentgroup
   end
   
   def write(cont)
+    return if cont.empty?
+    
     @mutex.synchronize do
-      @cur_data[:str] << cont
+      unless @cur_data[:str].is_a?(String)
+        raise "Couldnt add to string with a length of #{cont.length} to str, because str was a #{@cur_data[:str].class.name}. Cont: #{cont}"
+      else
+        @cur_data[:str] << cont
+      end
     end
   end
   

data/lib/hayabusa_http_session_request.rb

@@ -1,4 +1,5 @@
 require "tempfile"
+require "uri"
 
 #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"
@@ -70,9 +71,14 @@ class Hayabusa::Http_session::Request
     uri_raw = match[2]
     uri_raw = "index.rhtml" if uri_raw == ""
     
-    uri = Knj::Web.parse_uri(match[2]) rescue {:path => match[2], :query => ""}
+    if uri = URI.parse(match[2]) rescue nil
+      uri = {:path => uri.path.slice(1, 999), :query => uri.query}
+    else
+      uri = {:path => match[2], :query => ""}
+    end
     
     page_filepath = Knj::Web.urldec(uri[:path])
+    
     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

data/lib/hayabusa_http_session_response.rb

@@ -3,7 +3,7 @@ require "time"
 #This object writes headers, trailing headers, status headers and more for HTTP-sessions.
 class Hayabusa::Http_session::Response
   attr_accessor :chunked, :cgroup, :nl, :status, :http_version, :headers, :headers_trailing, :headers_sent, :socket
-  
+
   STATUS_CODES = {
     100 => "Continue",
     200 => "OK",
@@ -22,16 +22,17 @@ class Hayabusa::Http_session::Response
     403 => "Forbidden",
     404 => "Not Found",
     408 => "Request Timeout",
+    415 => "Unsupported media type",
     500 => "Internal Server Error"
   }
   NL = "\r\n"
-  
+
   def initialize(args)
     @chunked = false
     @socket = args[:socket]
     @hb = args[:hb]
   end
-  
+
   def reset(args)
     @status = 200
     @http_version = args[:http_version]
@@ -45,20 +46,20 @@ class Hayabusa::Http_session::Response
     @headers_trailing = {}
     @mode = args[:mode]
     @cookies = []
-    
+
     @headers = {
       "date" => ["Date", Time.now.httpdate]
     }
-    
+
     if args[:mode] != :cgi and (!args.key?(:chunked) or args[:chunked])
       @chunked = true
     end
   end
-  
+
   def header(key, val)
     lines = val.to_s.count("\n") + 1
     raise "Value contains more lines than 1 (#{lines})." if lines > 1
-    
+
     if !@headers_sent
       @headers[key.to_s.downcase.strip] = [key, val]
     else
@@ -66,32 +67,32 @@ class Hayabusa::Http_session::Response
       @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")
@@ -99,9 +100,9 @@ class Hayabusa::Http_session::Response
     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
@@ -110,67 +111,67 @@ class Hayabusa::Http_session::Response
       else
         res = "HTTP/1.1 #{@status}"
       end
-      
+
       code = STATUS_CODES[@status]
       res << " #{code}" if code
       res << NL
     end
-    
+
     # The status header is used to make CGI or FCGI use the correct status-code.
     self.header("Status", "#{@status} #{STATUS_CODES[@status]}")
-    
+
     @headers.each do |key, val|
       res << "#{val[0]}: #{val[1]}#{NL}"
     end
-    
+
     if @http_version == "1.1"
       @trailers.each do |trailer|
         res << "Trailer: #{trailer}#{NL}"
       end
     end
-    
+
     @cookies.each do |cookie|
       res << "Set-Cookie: #{Knj::Web.cookie_str(cookie)}#{NL}"
     end
-    
+
     res << NL
-    
+
     return res
   end
-  
+
   def write
     # 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 @chunked
       @cgroup.write_to_socket
       @socket.write("0#{NL}")
-      
+
       @headers_trailing.each do |header_id_str, header|
         @socket.write("#{header[0]}: #{header[1]}#{NL}")
       end
-      
+
       @socket.write(NL)
     else
       @cgroup.write_to_socket
     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("Hauabusa: Closing socket.")