watobo 0.9.21 → 0.9.23

data/lib/watobo/interceptor/transparent.rb

@@ -1,25 +1,23 @@
-#.
-# transparent.rb
-#.
-# Copyright 2014 by siberas, http://www.siberas.de
-# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
-# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
-# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 # @private 
-module Watobo#:nodoc: all
-  module Interceptor
-    module Transparent
-      @nfq_drb = nil
-      def self.start
-        DRb.start_service
-        @nfq_drb = DRbObject.new nil, "druby://127.0.0.1:9090"
-      end
-      
-      def self.info(data)
-        @nfq_drb.info(data)
-      end
-    end
-  end
-end
+module Watobo#:nodoc: all
+  module Interceptor
+    module Transparent
+      @nfq_drb = nil
+      def self.start
+        DRb.start_service
+        @nfq_drb = DRbObject.new nil, "druby://127.0.0.1:9090"
+      end
+      
+      def self.info(data)
+        nfo = nil
+        begin
+        nfo = @nfq_drb.info(data)
+        rescue => bang
+          puts "! could not query nfq_server"
+          puts bang
+        end
+        nfo
+      end
+    end
+  end
+end

data/lib/watobo/mixins.rb

@@ -1,21 +1,12 @@
-#.
-# mixins.rb
-#.
-# Copyright 2014 by siberas, http://www.siberas.de
-# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
-# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
-# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 # @private 
-module Watobo#:nodoc: all
-  module Mixins
-    mixins_path = File.expand_path(File.join(File.dirname(__FILE__), "mixins"))
-  # puts "* loading mixins #{mixins_path}"
-    Dir.glob("#{mixins_path}/*.rb").each do |cf|
-      puts "+ #{File.basename(cf)}" if $DEBUG
-      require File.join("watobo","mixins", File.basename(cf))
-
-    end
-  end
+module Watobo#:nodoc: all
+  module Mixins
+    mixins_path = File.expand_path(File.join(File.dirname(__FILE__), "mixins"))
+  # puts "* loading mixins #{mixins_path}"
+    Dir.glob("#{mixins_path}/*.rb").each do |cf|
+      puts "+ #{File.basename(cf)}" if $DEBUG
+      require File.join("watobo","mixins", File.basename(cf))
+
+    end
+  end
 end

data/lib/watobo/mixins/check_info.rb

@@ -1,38 +1,29 @@
-#.
-# check_info.rb
-#.
-# Copyright 2014 by siberas, http://www.siberas.de
-# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
-# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
-# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 # @private 
-module Watobo#:nodoc: all
-  module CheckInfoMixin
-    module InfoMethods
-      def check_name
-       
-        #puts self.methods.sort
-        info = instance_variable_get("@info")
-        return nil if info.nil?
-        return info[:check_name]
-      end
-      
-      def check_group
-        info = instance_variable_get("@info")
-        return nil if info.nil?
-        return info[:check_group]
-      end
-
-    end
-
-    extend InfoMethods
-
-    def self.included( other )
-      other.extend InfoMethods
-    end
-  #:name => "#{check.info[:check_group]}|#{check.info[:check_name]}",
-
-  end
+module Watobo#:nodoc: all
+  module CheckInfoMixin
+    module InfoMethods
+      def check_name
+       
+        #puts self.methods.sort
+        info = instance_variable_get("@info")
+        return nil if info.nil?
+        return info[:check_name]
+      end
+      
+      def check_group
+        info = instance_variable_get("@info")
+        return nil if info.nil?
+        return info[:check_group]
+      end
+
+    end
+
+    extend InfoMethods
+
+    def self.included( other )
+      other.extend InfoMethods
+    end
+  #:name => "#{check.info[:check_group]}|#{check.info[:check_name]}",
+
+  end
 end

data/lib/watobo/mixins/httpparser.rb

@@ -1,12 +1,3 @@
-#.
-# httpparser.rb
-#.
-# Copyright 2014 by siberas, http://www.siberas.de
-# This file is part of WATOBO (Web Application Tool Box) http://watobo.sourceforge.com
-# WATOBO is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation version 2 of the License.
-# WATOBO is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License along with WATOBO; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 # http://www.ietf.org/rfc/rfc2396.txt
 # http://en.wikipedia.org/wiki/URI_scheme
 
@@ -25,749 +16,734 @@
 # path_ext = "my/path/show.php?p=aaa&debug=true"
 
 # @private 
-module Watobo#:nodoc: all
+module Watobo #:nodoc: all
   module Mixin
-  module Parser
-    
-    module Parameters
-      def each(prefs, &block)
-        
-        
-      end  
-    end
-    
-    module Url
-      include Watobo::Constants
-      def file
-        #@file ||= nil
-        #return @file unless @file.nil?
-        if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}[^\?]*\/(.*) HTTP.*/
-          tmp = $1
-          end_of_file_index = tmp.index(/\?/)
-
-          if end_of_file_index.nil?
-            @file = tmp
-          elsif end_of_file_index == 0
-            @file = ""
-          else
-            @file = tmp[0..end_of_file_index-1]
-          end
+    module Parser
+
+      module Parameters
+        def each(prefs, &block)
+
 
-        else
-          @file = ""
         end
       end
 
-      def file_ext
-        #@file_ext ||= nil
-        #return @file_ext unless @file_ext.nil?
-        if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}[^\?]*\/(.*) HTTP.*/
-          @file_ext = $1
-        else
-          @file_ext = ''
+      module Url
+        include Watobo::Constants
+
+        def file
+          #@file ||= nil
+          #return @file unless @file.nil?
+          if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}[^\?]*\/(.*) HTTP.*/
+            tmp = $1
+            end_of_file_index = tmp.index(/\?/)
+
+            if end_of_file_index.nil?
+              @file = tmp
+            elsif end_of_file_index == 0
+              @file = ""
+            else
+              @file = tmp[0..end_of_file_index-1]
+            end
+
+          else
+            @file = ""
+          end
         end
-      end
 
-      # returns a string containing all urlparms
-      # e.g. "parm1=first&parm2=second"
-      def urlparms
-        begin
-          off = self.first.index('?')
-          return nil if off.nil?
-          eop = self.first.index(' HTTP/')
-          return nil if eop.nil?
-          parms = self.first[off+1..eop-1]
-          return parms
-        rescue => bang
-          puts bang
-          puts bang.backtrace if $DEBUG
-        end
-        return nil
-      end
+        def file_ext
+          #@file_ext ||= nil
+          #return @file_ext unless @file_ext.nil?
+          if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}[^\?]*\/(.*) HTTP.*/
+            @file_ext = $1
+          else
+            @file_ext = ''
+          end
+        end
 
-      def method
-        if self.first =~ /(^[^[:space:]]{1,}) /i then
-          return $1
-        else
+        # returns a string containing all urlparms
+        # e.g. "parm1=first&parm2=second"
+        def urlparms
+          begin
+            off = self.first.index('?')
+            return nil if off.nil?
+            eop = self.first.index(' HTTP/')
+            return nil if eop.nil?
+            parms = self.first[off+1..eop-1]
+            return parms
+          rescue => bang
+            puts bang
+            puts bang.backtrace if $DEBUG
+          end
           return nil
         end
-      end
-      
-      def method_get?
-        return false if method.nil?
-        return true if method =~ /^get$/i
-        return false
-      end
-      
-       def method_post?
-        return false if method.nil?
-        return true if method =~ /^post$/i
-        return false
-      end
 
-      #The path may consist of a sequence of path segments separated by a
-      #single slash "/" character.  Within a path segment, the characters
-      #"/", ";", "=", and "?" are reserved.  Each path segment may include a
-      #sequence of parameters, indicated by the semicolon ";" character.
-      #The parameters are not significant to the parsing of relative
-      #references.
-
-      #
-      # http://www.mysite.com:80/my/path/show.php?p=aaa&debug=true
-      # path = "my/path/show.php"
-      def path
-        if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}\/([^\?]*).* HTTP/i then
-          return $1
-        else
-          return ""
+        def method
+          if self.first =~ /(^[^[:space:]]{1,}) /i then
+            return $1
+          else
+            return nil
+          end
         end
-      end
 
-      # path_ext = "my/path/show.php?p=aaa&debug=true"
-      def path_ext
-        if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}\/(.*) HTTP\//i then
-          return $1
-        else
-          return ""
+        def method_get?
+          return false if method.nil?
+          return true if method =~ /^get$/i
+          return false
         end
-      end
 
-      def dir
-        if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}\/([^\?]*)\/.* HTTP/i then
-          return $1
-        else
-          return ""
+        def method_post?
+          return false if method.nil?
+          return true if method =~ /^post$/i
+          return false
         end
-      end
 
-      def query
-        begin
-          q = nil
-          if self.first =~ /^[^[:space:]]{1,} (.*) HTTP.*/ then
-            uri = $1
+        #The path may consist of a sequence of path segments separated by a
+        #single slash "/" character.  Within a path segment, the characters
+        #"/", ";", "=", and "?" are reserved.  Each path segment may include a
+        #sequence of parameters, indicated by the semicolon ";" character.
+        #The parameters are not significant to the parsing of relative
+        #references.
+
+        #
+        # http://www.mysite.com:80/my/path/show.php?p=aaa&debug=true
+        # path = "my/path/show.php"
+        def path
+          if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}\/([^\?]*).* HTTP/i then
+            return $1
+          else
+            return ""
           end
-          off = uri.index('?')
-          #parts.shift
-          # puts "HTTPParser.query: #{parts.join('?')}"
-          return "" if off.nil?
-          return uri[off+1..-1]
-        rescue => bang
-          puts "!!! Could not parse query !!!"
-          puts bang
-          puts bang.backtrace if $DEBUG
         end
-        return ''
 
-      end
+        # path_ext = "my/path/show.php?p=aaa&debug=true"
+        def path_ext
+          if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}\/(.*) HTTP\//i then
+            return $1
+          else
+            return ""
+          end
+        end
 
-      def element
-        cl = self.first.gsub(/\?+/,"?")
-        cl.gsub!(/ HTTP.*/, '')
-        dummy = cl.split('?').first
-        if dummy =~ /^[^[:space:]]{1,} ([a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}).*\/(.*)/i then
-          return $2
-        else
-          return ""
+        def dir
+          if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}\/([^\?]*)\/.* HTTP/i then
+            return $1
+          else
+            return ""
+          end
         end
-      end
 
-      def doctype
-        /.*\/.*?\.(\w{2,4})(\?| )/.match(self.first)
-        #   puts $1
-        return $1 unless $1.nil?
-        return ''
-        #dummy = self.first.gsub(/\?+/,"?")
-        #parts = dummy.split('?')
-        #parts[0].gsub!(/ HTTP\/(.*)/i,"")
-        #if parts[0] =~ /(.*\.)(\w{2,3})$/i then
-        #  return $2
-        #else
-        #  return ''
-        #end
-      end
+        def query
+          begin
+            q = nil
+            if self.first =~ /^[^[:space:]]{1,} (.*) HTTP.*/ then
+              uri = $1
+            end
+            off = uri.index('?')
+            #parts.shift
+            # puts "HTTPParser.query: #{parts.join('?')}"
+            return "" if off.nil?
+            return uri[off+1..-1]
+          rescue => bang
+            puts "!!! Could not parse query !!!"
+            puts bang
+            puts bang.backtrace if $DEBUG
+          end
+          return ''
 
-      def proto
-        proto = "unknown"
-        if self.first =~ /^[^[:space:]]{1,} ([a-zA-Z]+):\/\//i
-          proto = $1
         end
-        proto
-      end
 
-      def is_ssl?
-        return true if self.first =~ /^[^[:space:]]{1,} https/i
-        return false
-      end
-
-      def is_chunked?
-        self.each do |h|
-          return true if h =~ /^Transfer-Encoding.*chunked/i
-          break if h.strip.empty?
+        def element
+          cl = self.first.gsub(/\?+/, "?")
+          cl.gsub!(/ HTTP.*/, '')
+          dummy = cl.split('?').first
+          if dummy =~ /^[^[:space:]]{1,} ([a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}).*\/(.*)/i then
+            return $2
+          else
+            return ""
+          end
         end
-        return false
-      end
 
-      def url_string
-        url = ''        
-        #return @url unless @url.nil?
-        if self.first =~ /^[^[:space:]]{1,} ([a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}.*) HTTP\//i then
-          url = $1
+        def doctype
+          /.*\/.*?\.(\w{2,4})(\?| )/.match(self.first)
+          #   puts $1
+          return $1 unless $1.nil?
+          return ''
+          #dummy = self.first.gsub(/\?+/,"?")
+          #parts = dummy.split('?')
+          #parts[0].gsub!(/ HTTP\/(.*)/i,"")
+          #if parts[0] =~ /(.*\.)(\w{2,3})$/i then
+          #  return $2
+          #else
+          #  return ''
+          #end
+        end
+
+        def proto
+          proto = "unknown"
+          if self.first =~ /^[^[:space:]]{1,} ([a-zA-Z]+):\/\//i
+            proto = $1
+          end
+          proto
         end
-        url
-      end
-    #  alias :url :url_string
-
-      def site
-        #@site ||= nil
-        #return @site unless @site.nil?
-        if self.first =~ /^[^[:space:]]{1,} ([a-zA-Z]+):\/\/([\-0-9a-zA-Z.]*)([:0-9]{0,6})/i then
-          host = $2
-          port_extension = $3
-          proto = $1
-          s = host + port_extension
-          if port_extension == ''
-            s = host + ":" + DEFAULT_PORT_HTTPS.to_s if  proto =~ /^https$/i
-            s = host + ":" + DEFAULT_PORT_HTTP.to_s if  proto =~ /^http$/i
-          end
-          @site = s
-        else
-          @site = nil
-        end
-        @site
-      end
 
-      def host
-        #@host ||= nil
-        #return @host unless @host.nil?
-        #if self.first =~ /^[^[:space:]]{1,} https?:\/\/([\-0-9a-zA-Z.]*)[:0-9]{0,6}/i then
-        if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/([\-0-9a-zA-Z.]*)[:0-9]{0,6}/i then
-          @host = $1
-        else
-          @host = ''
+        def is_ssl?
+          return true if self.first =~ /^[^[:space:]]{1,} https/i
+          return false
         end
-        @host
-      end
 
-      # returns all subdir combinations
-      # www.company.com/this/is/my/path.php
-      # returns:
-      # [ "/this", "/this/is", "/this/is/my" ]
-      def subDirs
-        sub_dirs = self.dir.split(/\//)
-        dir = ""
-        sub_dirs.map! do |d| dir += "/" + d ; end
-        return sub_dirs
-      end
+        def is_chunked?
+          self.each do |h|
+            return true if h =~ /^Transfer-Encoding.*chunked/i
+            break if h.strip.empty?
+          end
+          return false
+        end
 
-      def port
-        return nil if self.first.nil?
-        dummy = self.first
-        portnum = nil
-        parts = dummy.split('?')
+        def url_string
+          url = ''
+          #return @url unless @url.nil?
+          if self.first =~ /^[^[:space:]]{1,} ([a-zA-Z]+:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}.*) HTTP\//i then
+            url = $1
+          end
+          url
+        end
+
+        #  alias :url :url_string
+
+        def site
+          #@site ||= nil
+          #return @site unless @site.nil?
+          if self.first =~ /^[^[:space:]]{1,} ([a-zA-Z]+):\/\/([\-0-9a-zA-Z.]*)([:0-9]{0,6})/i then
+            host = $2
+            port_extension = $3
+            proto = $1
+            s = host + port_extension
+            if port_extension == ''
+              s = host + ":" + DEFAULT_PORT_HTTPS.to_s if proto =~ /^https$/i
+              s = host + ":" + DEFAULT_PORT_HTTP.to_s if proto =~ /^http$/i
+            end
+            @site = s
+          else
+            @site = nil
+          end
+          @site
+        end
 
-        if parts[0] =~ /^[^[:space:]]{1,} https:\/\//i then
-          portnum = 443
-        elsif parts[0] =~ /^[^[:space:]]{1,} http:\/\//i
-          portnum = 80
+        def host
+          #@host ||= nil
+          #return @host unless @host.nil?
+          #if self.first =~ /^[^[:space:]]{1,} https?:\/\/([\-0-9a-zA-Z.]*)[:0-9]{0,6}/i then
+          if self.first =~ /^[^[:space:]]{1,} [a-zA-Z]+:\/\/([\-0-9a-zA-Z.]*)[:0-9]{0,6}/i then
+            @host = $1
+          else
+            @host = ''
+          end
+          @host
+        end
+
+        # returns all subdir combinations
+        # www.company.com/this/is/my/path.php
+        # returns:
+        # [ "/this", "/this/is", "/this/is/my" ]
+        def subDirs
+          sub_dirs = self.dir.split(/\//)
+          dir = ""
+          sub_dirs.map! do |d|
+            dir += "/" + d;
+          end
+          return sub_dirs
         end
-        if parts[0] =~ /^[^[:space:]]{1,} https?:\/\/[\-0-9a-zA-Z.]*:([0-9]{0,6})/i then
-          portnum = $1
+
+        def port
+          return nil if self.first.nil?
+          dummy = self.first
+          portnum = nil
+          parts = dummy.split('?')
+
+          if parts[0] =~ /^[^[:space:]]{1,} https:\/\//i then
+            portnum = 443
+          elsif parts[0] =~ /^[^[:space:]]{1,} http:\/\//i
+            portnum = 80
+          end
+          if parts[0] =~ /^[^[:space:]]{1,} https?:\/\/[\-0-9a-zA-Z.]*:([0-9]{0,6})/i then
+            portnum = $1
+          end
+          return portnum
         end
-        return portnum
-      end
 
-      # get_parms returns an array of parm=value
-      def get_parms
-        begin
-          off = self.first.index('?')
-          return [] if off.nil?
-          eop = self.first.index(' HTTP/')
-          return [] if eop.nil?
-          parms = self.first[off+1..eop-1].split('&').select {|x| x =~ /=/ }
-          #   puts parms
-          return parms
-        rescue => bang
-          puts bang
-          puts bang.backtrace if $DEBUG
-        end
-        return []
-        #parmlist=[]
-        #if self.first =~ /^[^[:space:]]{1,} (https?:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}).*\/.*(\?.*=.*) HTTP/i then
-        #  dummy = $2.gsub!(/\?+/,"?").split('?')
-        # remove left part of ? from url
-        #  dummy.shift
-
-        #  parmlist=dummy.join.split(/\&/)
-        #end
-        #return parmlist
+        # get_parms returns an array of parm=value
+        def get_parms
+          begin
+            off = self.first.index('?')
+            return [] if off.nil?
+            eop = self.first.index(' HTTP/')
+            return [] if eop.nil?
+            parms = self.first[off+1..eop-1].split('&').select { |x| x =~ /=/ }
+            #   puts parms
+            return parms
+          rescue => bang
+            puts bang
+            puts bang.backtrace if $DEBUG
+          end
+          return []
+          #parmlist=[]
+          #if self.first =~ /^[^[:space:]]{1,} (https?:\/\/[\-0-9a-zA-Z.]*[:0-9]{0,6}).*\/.*(\?.*=.*) HTTP/i then
+          #  dummy = $2.gsub!(/\?+/,"?").split('?')
+          # remove left part of ? from url
+          #  dummy.shift
 
-      end
+          #  parmlist=dummy.join.split(/\&/)
+          #end
+          #return parmlist
 
-      #################### doubles
+        end
+
+        #################### doubles
 
-      def get_parm_names(&block)
+        def get_parm_names(&block)
 
-        parm_names=[]
-        parmlist=[]
-        parmlist.concat(get_parms)
+          parm_names=[]
+          parmlist=[]
+          parmlist.concat(get_parms)
 
-        parmlist.each do |p|
-          if p then
-            p.gsub!(/=.*/,'')
-            yield p if block_given?
-            parm_names.push p            
+          parmlist.each do |p|
+            if p then
+              p.gsub!(/=.*/, '')
+              yield p if block_given?
+              parm_names.push p
+            end
           end
-        end
 
-        return parm_names
+          return parm_names
 
-      end
+        end
 
-      def get_parm_value(parm_name)
-        parm_value = ""
-        self.get_parms.each do |parm|
-          if parm =~ /^#{Regexp.quote(parm_name)}=/i then
-            dummy = parm.split(/=/)
-            if dummy.length > 1 then
-              #  parm_value=dummy[1].gsub(/^[ ]*/,"")
-              parm_value=dummy[1].strip
+        def get_parm_value(parm_name)
+          parm_value = ""
+          self.get_parms.each do |parm|
+            if parm =~ /^#{Regexp.quote(parm_name)}=/i then
+              dummy = parm.split(/=/)
+              if dummy.length > 1 then
+                #  parm_value=dummy[1].gsub(/^[ ]*/,"")
+                parm_value=dummy[1].strip
+              end
             end
           end
+          return parm_value
+        end
+
+        def post_parm_value(parm_name)
+          parm_value=""
+          self.post_parms.each do |parm|
+            if parm =~ /#{Regexp.quote(parm_name)}/i then
+              dummy = parm.split(/=/)
+              if dummy.length > 1 then
+                parm_value = dummy[1].strip
+              else
+                # puts "Uhhhh ... need parameter value from '#{parm}''"
+              end
+            end
+          end
+          return parm_value
         end
-        return parm_value
+
       end
 
-      def post_parm_value(parm_name)
-        parm_value=""
-        self.post_parms.each do |parm|
-          if parm =~ /#{Regexp.quote(parm_name)}/i then
-            dummy = parm.split(/=/)
-            if dummy.length > 1 then
-              parm_value = dummy[1].strip
-            else
-              # puts "Uhhhh ... need parameter value from '#{parm}''"
+      module Web10
+        include Watobo::Constants
+
+        def post_parms
+          parmlist=[]
+          return parmlist unless has_body?
+          begin
+            if self.last =~ /\=.*\&?/i
+              parmlist = self.last.split(/\&/)
+              parmlist.map! { |p| x = p.strip.empty? ? nil : p }
+              parmlist.compact!
+            end
+          rescue => bang
+            # puts self.last.unpack("C*").pack("C*").gsub(/[^[:print:]]/,".")
+            if $DEBUG
+              puts bang
+              puts bang.backtrace
+
             end
           end
+          return parmlist
         end
-        return parm_value
-      end
 
-    end
+        def parms
+          parmlist=[]
+          parmlist.concat(get_parms)
+          parmlist.concat(post_parms)
 
-    module Web10
-      include Watobo::Constants
-      def post_parms
-        parmlist=[]
-        return parmlist unless has_body?
-        begin
-        if self.last =~ /\=.*\&?/i
-          parmlist = self.last.split(/\&/)
-          parmlist.map!{|p| x = p.strip.empty? ? nil : p }
-          parmlist.compact!
-        end
-        rescue => bang
-          # puts self.last.unpack("C*").pack("C*").gsub(/[^[:print:]]/,".")
-          if $DEBUG
-            puts bang
-          puts bang.backtrace 
-         
-          end
+          return parmlist
         end
-        return parmlist
-      end
 
-      def parms
-        parmlist=[]
-        parmlist.concat(get_parms)
-        parmlist.concat(post_parms)
+        def parm_names
+          parm_names=[]
+          parmlist=[]
+          parmlist.concat(get_parms)
+          parmlist.concat(post_parms)
+          parmlist.each do |p|
+            p.gsub!(/=.*/, '')
+            parm_names.push p
+          end
 
-        return parmlist
-      end
+          return parm_names
 
-      def parm_names
-        parm_names=[]
-        parmlist=[]
-        parmlist.concat(get_parms)
-        parmlist.concat(post_parms)
-        parmlist.each do |p|
-          p.gsub!(/=.*/,'')
-          parm_names.push p
         end
 
-        return parm_names
+        def post_parm_names(&block)
 
-      end
+          parm_names=[]
+          parmlist=[]
 
-      def post_parm_names(&block)
+          parmlist.concat(post_parms)
+          parmlist.each do |p|
+            if p then
+              p.gsub!(/=.*/, '')
+              p.strip!
+              yield p if block_given?
+              parm_names << p
+            end
+          end
 
-        parm_names=[]
-        parmlist=[]
+          return parm_names
 
-        parmlist.concat(post_parms)
-        parmlist.each do |p|
-          if p then
-            p.gsub!(/=.*/,'')
-            p.strip!
-            yield p if block_given?
-            parm_names << p
-          end
         end
 
-        return parm_names
 
-      end
+        def header_value(header_name)
+          header_values =[]
+          self.headers.each do |header|
+            begin
+              if header =~ /^#{header_name}/i then
+                vstart = header.index ':'
+                unless vstart.nil?
+                  header_values.push header[vstart+1..-1].strip
+                end
+              end
+            rescue => bang
+              puts bang
+              puts bang.backtrace if $DEBUG
+            end
+          end
+          return header_values
+        end
+
+        def content_type(default_ct='undefined')
+          ct = default_ct
+          self.each do |line|
+            begin
+              break if line.strip.empty?
+              #cl = line.encode('ASCII', :invalid => :replace, :undef => :replace)
+              cl = line.force_encoding('ASCII-8BIT')
+              if cl =~ /^Content-Type:([^;]*);?/i then
+                ct = $1
+                break
+              end
+            rescue => bang
+              puts "! could not parse content_type !"
+              puts bang
+              puts cl
+#            puts cl.gsub(/[^[:print:]]/, '.')
 
-    
-      def header_value(header_name)
-        header_values =[]
-        self.headers.each do |header|
-          begin
-          if header =~ /^#{header_name}/i then
-            vstart = header.index ':'
-            unless vstart.nil?
-              header_values.push header[vstart+1..-1].strip
             end
           end
-          rescue => bang
-            puts bang
-            puts bang.backtrace if $DEBUG
+          return ct.strip
+        end
+
+        def content_type_ex(default_ct='undefined')
+          ct = default_ct
+          self.each do |line|
+            break if line.strip.empty?
+            # cl = line.encode('ASCII', :invalid => :replace, :undef => :replace)
+            cl = line.force_encoding('ASCII-8BIT')
+            if cl =~ /^Content-Type:(.*)/i then
+              ct = $1.strip
+              break
+            end
+          end
+          return ct.strip
+        end
+
+        def content_length
+          # Note: Calculate Chunk-Encoded Content-Length
+          # this is only possible if the whole body is loaded???
+          ct = -1
+          self.each do |line|
+            break if line.strip.empty?
+            if line =~ /^Content-Length:(.*)/i then
+              ct = $1.strip.to_i
+              break
+            end
           end
+          return ct
+        end
+
+        def content_encoding
+          te = TE_NONE
+          self.each do |line|
+            break if line.strip.empty?
+            if line =~ /^Content-Encoding:(.*)/i then
+              dummy = $1.strip
+              #  puts "Content-Encoding => #{dummy}"
+              te = case dummy
+                     when /chunked/i
+                       TE_CHUNKED
+                     when /compress/i
+                       TE_COMPRESS
+                     when /zip/i
+                       TE_GZIP
+                     when /deflate/i
+                       TE_DEFLATE
+                     when /identity/i
+                       TE_IDENTITY
+                     else
+                       TE_NONE
+                   end
+              break
+            end
+          end
+          return te
+        end
+
+        def transferEncoding
+          te = TE_NONE
+          self.each do |line|
+            break if line.strip.empty?
+            if line =~ /^Transfer-Encoding:(.*)/i then
+              dummy = $1.strip
+              # puts dummy
+              te = case dummy
+                     when 'chunked'
+                       TE_CHUNKED
+                     when 'compress'
+                       TE_COMPRESS
+                     when 'zip'
+                       TE_GZIP
+                     when 'deflate'
+                       TE_DEFLATE
+                     when 'identity'
+                       TE_IDENTITY
+                     else
+                       TE_NONE
+                   end
+              break
+            end
+          end
+          return te
+        end
+
+        alias :transfer_encoding :transferEncoding
+
+        def contentMD5
+          b = self.body.nil? ? "" : self.body
+          hash = Digest::MD5.hexdigest(b)
+          return hash
+        end
+
+        #      def get_parm_value(parm_name)
+        #        parm_value = ""
+        #        self.get_parms.each do |parm|
+        #          if parm =~ /^#{Regexp.quote(parm_name)}=/i then
+        #            dummy = parm.split(/=/)
+        #            if dummy.length > 1 then
+        #              #  parm_value=dummy[1].gsub(/^[ ]*/,"")
+        #              parm_value=dummy[1].strip
+        #            end
+        #          end
+        #        end
+        #        return parm_value
+        #      end
+
+        def post_parm_value(parm_name)
+          parm_value=""
+          self.post_parms.each do |parm|
+            if parm =~ /#{Regexp.quote(parm_name)}/i then
+              dummy = parm.split(/=/)
+              if dummy.length > 1 then
+                parm_value = dummy[1].strip
+              else
+                # puts "Uhhhh ... need parameter value from '#{parm}''"
+              end
+            end
+          end
+          return parm_value
         end
-        return header_values
-      end
 
-      def content_type(default_ct='undefined')
-        ct = default_ct
-        self.each do |line|
-          begin
-          break if line.strip.empty?
-          #cl = line.encode('ASCII', :invalid => :replace, :undef => :replace)
-          cl = line.force_encoding('ASCII-8BIT')
-          if cl =~ /^Content-Type:([^;]*);?/i then
-            ct = $1
-            break
-          end
-          rescue => bang
-            puts "! could not parse content_type !"
-            puts bang
-            puts cl
-#            puts cl.gsub(/[^[:print:]]/, '.')
+        def has_body?
+          self.body.nil? ? false : true
+        end
 
+        def __connection_close?
+          headers("Connection") do |h|
+            return true if h =~ /close/i
           end
+          return false
         end
-        return ct.strip
-      end
-      
-      def content_type_ex(default_ct='undefined')
-        ct = default_ct
-        self.each do |line|
-          break if line.strip.empty?
-          # cl = line.encode('ASCII', :invalid => :replace, :undef => :replace)
-          cl = line.force_encoding('ASCII-8BIT')
-          if cl =~ /^Content-Type:(.*)/i then
-            ct = $1.strip
-            break
-          end
-        end
-        return ct.strip
-      end
 
-      def content_length
-        # Note: Calculate Chunk-Encoded Content-Length
-        # this is only possible if the whole body is loaded???
-        ct = -1
-        self.each do |line|
-          break if line.strip.empty?
-          if line =~ /^Content-Length:(.*)/i then
-            ct = $1.strip.to_i
-            break
+        def connection_close?
+          headers("Connection") do |h|
+            return false if h =~ /keep\-alive/i
           end
+          return true
         end
-        return ct
-      end
 
-def content_encoding
-        te = TE_NONE
-        self.each do |line|
-          break if line.strip.empty?
-          if line =~ /^Content-Encoding:(.*)/i then
-            dummy = $1.strip
-          #  puts "Content-Encoding => #{dummy}"
-            te = case dummy
-            when /chunked/i
-              TE_CHUNKED
-            when /compress/i
-              TE_COMPRESS
-            when /zip/i
-              TE_GZIP
-            when /deflate/i
-              TE_DEFLATE
-            when /identity/i
-              TE_IDENTITY
-            else
-              TE_NONE
-            end
-            break
+        def has_header?(name)
+          self.each do |l|
+            return false if l.strip.empty?
+            return true if l =~ /^#{name}:/i
           end
+          return false
         end
-        return te
-      end
-      
-      def transferEncoding
-        te = TE_NONE
-        self.each do |line|
-          break if line.strip.empty?
-          if line =~ /^Transfer-Encoding:(.*)/i then
-            dummy = $1.strip
-           # puts dummy
-            te = case dummy
-            when 'chunked'
-              TE_CHUNKED
-            when 'compress'
-              TE_COMPRESS
-            when 'zip'
-              TE_GZIP
-            when 'deflate'
-              TE_DEFLATE
-            when 'identity'
-              TE_IDENTITY
-            else
-              TE_NONE
-            end
-            break
+
+        def body
+          begin
+            return nil if self.nil? or self.length < 3
+            return "#{self.last}" if self[-2].strip.empty?
+          rescue
+            return nil
           end
+          nil
         end
-        return te
-      end
-      
-      alias :transfer_encoding :transferEncoding
 
-      def contentMD5
-        b = self.body.nil? ? "" : self.body
-        hash = Digest::MD5.hexdigest(b)
-        return hash
-      end
-
-      #      def get_parm_value(parm_name)
-      #        parm_value = ""
-      #        self.get_parms.each do |parm|
-      #          if parm =~ /^#{Regexp.quote(parm_name)}=/i then
-      #            dummy = parm.split(/=/)
-      #            if dummy.length > 1 then
-      #              #  parm_value=dummy[1].gsub(/^[ ]*/,"")
-      #              parm_value=dummy[1].strip
-      #            end
-      #          end
-      #        end
-      #        return parm_value
-      #      end
-
-      def post_parm_value(parm_name)
-        parm_value=""
-        self.post_parms.each do |parm|
-          if parm =~ /#{Regexp.quote(parm_name)}/i then
-            dummy = parm.split(/=/)
-            if dummy.length > 1 then
-              parm_value = dummy[1].strip
-            else
-              # puts "Uhhhh ... need parameter value from '#{parm}''"
-            end
+        def is_text?
+          ct = self.content_type(nil)
+          if ct.nil?
+            return true if self.body_encoded.ascii_only?
+            return false
+          else
+            return true if ct =~ /text/i
+            return false
           end
         end
-        return parm_value
-      end
 
-      def has_body?
-        self.body.nil? ? false : true
-      end
-      
-      def __connection_close?
-        headers("Connection") do |h|
-          return true if h =~ /close/i
-        end
-        return false
-      end
-      
-      def connection_close?
-        headers("Connection") do |h|
-          return false if h =~ /keep\-alive/i
+        def is_wwwform?
+          ct = self.content_type
+          return true if ct =~ /form/i
+          return false
         end
-        return true
-      end
 
-      def has_header?(name)
-        self.each do |l|
-          return false if l.strip.empty?
-          return true if l =~ /^#{name}:/i
+        def is_json?
+          ct = self.content_type
+          return true if ct =~ /\/json/i
+          return false
         end
-        return false
-      end
 
-      def body
-        begin
-          return nil if self.nil? or self.length < 3
-          return "#{self.last}" if self[-2].strip.empty?
-        rescue
-          return nil
-        end
-        nil
-      end
-      
-      def is_text?
-        ct = self.content_type(nil) 
-        if ct.nil?
-          return true if self.body_encoded.ascii_only?
-          return false
-        else
-          return true if ct =~ /text/i
+        def is_xml?
+          ct = self.content_type
+          return true if ct =~ /xml/i
           return false
         end
-      end
-      
-      def is_wwwform?
-        ct = self.content_type
-        return true if ct =~ /form/i
-        return false
-      end
-      
-      def is_json?
-        ct = self.content_type
-        return true if ct =~ /\/json/i
-        return false
-      end
-      
-      def is_xml?
-        ct = self.content_type
-        return true if ct =~ /xml/i
-        return false
-      end
-      
-      def is_multipart?
-        ct = self.content_type
-        return true if ct =~ /^multipart/i
-        return false
-      end
-      
-      def body_encoded
-        b = self.body
-        return nil if b.nil?
-        
-        cs = self.charset        
-        return b.unpack("C*").pack("C*") if cs.nil?
-        
-        begin
-          # not sure if this is a good idea???
-          #return  b.encode(cs, :invalid => :replace, :undef => :replace, :replace => '').unpack("C*").pack("C*")
-        rescue => bang
-          if $DEBUG
-             puts bang
-             puts bang.backtrace
-          end          
-        end
-        return b.unpack("C*").pack("C*")
-      end
 
-      def status_code
-        if self.first =~ /^HTTP\/... (\d+) /
-          return $1
-        else
-          return nil
+        def is_multipart?
+          ct = self.content_type
+          return true if ct =~ /^multipart/i
+          return false
         end
-      end
-      
-      alias :responseCode :status_code
-
-# returns array of new cookies 
-# Set-Cookie: mycookie=b41dc9e55d6163f78321996b10c940edcec1b4e55a76464c4e9d25e160ac0ec5b769806b; Path=/
-def new_cookies(&b)
-  nc = []
-  headers("Set-Cookie") do |h|
-    cookie = Watobo::Cookie.new(h)
-    yield cookie if block_given?
-    nc << cookie
-  end
-  nc
-end
 
-      def status
-        begin
-        # Filter bad utf-8 chars
-        dummy = self.first.unpack("C*").pack("C*")
+        def body_encoded
+          b = self.body
+          return nil if b.nil?
 
-        if dummy =~ /^HTTP\/1\.\d{1,2} (.*)/i then
-          return $1.chomp
-        else
-          return ''
+          cs = self.charset
+          return b.unpack("C*").pack("C*") if cs.nil?
+
+          begin
+            # not sure if this is a good idea???
+            #return  b.encode(cs, :invalid => :replace, :undef => :replace, :replace => '').unpack("C*").pack("C*")
+          rescue => bang
+            if $DEBUG
+              puts bang
+              puts bang.backtrace
+            end
+          end
+          return b.unpack("C*").pack("C*")
         end
-        rescue => bang
-          if $DEBUG
-          puts "! No Status Available !".upcase
-          puts bang
-          puts bang.backtrace
-          end 
-          return nil
+
+        def status_code
+          if self.first =~ /^HTTP\/... (\d+) /
+            return $1
+          else
+            return nil
+          end
         end
-      end
-      
-      def charset
-        cs = nil
-        self.each do |line|
-          break if line.strip.empty?
-          if line =~ /^Content-Type: .*charset=([^;]*)/i then
-            cs = $1.strip
-            break
+
+        alias :responseCode :status_code
+
+        # returns array of new cookies
+        # Set-Cookie: mycookie=b41dc9e55d6163f78321996b10c940edcec1b4e55a76464c4e9d25e160ac0ec5b769806b; Path=/
+        def new_cookies(&b)
+          nc = []
+          headers("Set-Cookie") do |h|
+            cookie = Watobo::Cookie.new(h)
+            yield cookie if block_given?
+            nc << cookie
           end
+          nc
         end
-        return cs
-      end
 
-      def headers(filter=nil, &b)
-        begin
-          filter = '.*' if filter.nil?
-        header_list=[]
-        self.each do |line|
-          cl = line.force_encoding('ASCII-8BIT')
-          return header_list if cl.strip.empty?
-          if cl =~ /#{filter}/
-            yield line if block_given?
-            header_list.push line
-          end          
-        end
-        return header_list
-        rescue => bang
-          puts bang
-          puts bang.backtrace
-          if $DEBUG
-            puts bang.backtrace
-            puts self.to_yaml
+        def status
+          begin
+            # Filter bad utf-8 chars
+            dummy = self.first.nil? ? '' : self.first.unpack("C*").pack("C*")
+
+            if dummy =~ /^HTTP\/1\.\d{1,2} (.*)/i then
+              return $1.chomp
+            else
+              return ''
+            end
+          rescue => bang
+            if $DEBUG
+              puts "! No Status Available !".upcase
+              puts bang
+              puts bang.backtrace
+            end
+            return nil
           end
-          return nil
         end
-      end
 
-      def cookies_UNUSED
-        cookie_list=[]
-        self.headers.each do |line|
-          if line =~ /Cookie2?: (.*)/i then
-            clist = $1.split(";")
-            clist.each do |c|
-              # c.gsub!(/^[ ]+/,"")
-              # c.chomp!
-              cookie_list.push c.strip
+        def charset
+          cs = nil
+          self.each do |line|
+            break if line.strip.empty?
+            if line =~ /^Content-Type: .*charset=([^;]*)/i then
+              cs = $1.strip
+              break
             end
           end
+          return cs
+        end
+
+        def headers(filter=nil, &b)
+          begin
+            filter = '.*' if filter.nil?
+            header_list=[]
+            self.each do |line|
+              cl = line.force_encoding('ASCII-8BIT')
+              return header_list if cl.strip.empty?
+              if cl =~ /#{filter}/
+                yield line if block_given?
+                header_list.push line
+              end
+            end
+            return header_list
+          rescue => bang
+            puts bang
+            puts bang.backtrace
+            if $DEBUG
+              puts bang.backtrace
+              puts self.to_yaml
+            end
+            return nil
+          end
         end
-        return cookie_list
-      end
 
-      def data_UNUSED
-        return self.last.strip if self.last =~ /\=.*\&?/i
-        return ""
       end
 
-    end
 
-   
     end
   end
 end