RubyGems - waitress-core - Versions diffs - 0.2.2 → 0.2.3 - Mend

waitress-core 0.2.2 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

checksums.yaml +4 -4
data/Gemfile +4 -4
data/LICENSE +21 -21
data/Rakefile +13 -13
data/bin/waitress +22 -22
data/ext/Thanks.md +1 -1
data/ext/waitress_http11/ext_help.h +15 -15
data/ext/waitress_http11/extconf.rb +6 -6
data/ext/waitress_http11/http11.c +532 -532
data/ext/waitress_http11/http11_parser.c +1216 -1216
data/ext/waitress_http11/http11_parser.h +49 -49
data/ext/waitress_http11/http11_parser.java.rl +171 -171
data/ext/waitress_http11/http11_parser.rl +165 -165
data/ext/waitress_http11/http11_parser_common.rl +55 -55
data/ext/waitress_http11/http11_wrb_parser.h +91 -91
data/lib/waitress/chef.rb +113 -113
data/lib/waitress/configure.rb +121 -121
data/lib/waitress/evalbind.rb +9 -9
data/lib/waitress/handlers/dirhandler.rb +39 -39
data/lib/waitress/handlers/handler.rb +57 -57
data/lib/waitress/handlers/handler404.rb +25 -25
data/lib/waitress/handlers/libhandler.rb +58 -58
data/lib/waitress/kernel.rb +182 -182
data/lib/waitress/parse/query.rb +60 -60
data/lib/waitress/request.rb +45 -45
data/lib/waitress/resources/default_config.rb +52 -52
data/lib/waitress/resources/http/404.html +18 -18
data/lib/waitress/resources/http/css/hack.css +37 -37
data/lib/waitress/resources/http/css/waitress.css +57 -57
data/lib/waitress/resources/http/fonts/svg/latin/hack-bold-latin-webfont.svg +240 -240
data/lib/waitress/resources/http/fonts/svg/latin/hack-bolditalic-latin-webfont.svg +240 -240
data/lib/waitress/resources/http/fonts/svg/latin/hack-italic-latin-webfont.svg +240 -240
data/lib/waitress/resources/http/fonts/svg/latin/hack-regular-latin-webfont.svg +240 -240
data/lib/waitress/resources/http/index.html +15 -15
data/lib/waitress/response.rb +105 -105
data/lib/waitress/server.rb +160 -161
data/lib/waitress/util.rb +707 -707
data/lib/waitress/version.rb +3 -3
data/lib/waitress/vhost.rb +217 -217
data/lib/waitress.rb +99 -106
data/lib/waitress_http11.bundle +0 -0
data/waitress-core.gemspec +29 -29
metadata +4 -4
data/lib/waitress_http11.so +0 -0

data/lib/waitress/resources/http/index.html CHANGED Viewed

@@ -1,15 +1,15 @@
-<html>
-  <head>
-    <title> Welcome to Waitress </title>
-    <link rel="stylesheet" href="css/hack.css">
-    <link rel="stylesheet" href="css/waitress.css">
-  </head>
-  <body>
-    <div id="maincontainer">
-      <div class="titlecontainer">
-        <h1> Waitress </h1>
-        <h2> Please take a seat and let me take your order </h2>
-      </div>
-    </div>
-  </body>
-</html>
+<html>
+  <head>
+    <title> Welcome to Waitress </title>
+    <link rel="stylesheet" href="css/hack.css">
+    <link rel="stylesheet" href="css/waitress.css">
+  </head>
+  <body>
+    <div id="maincontainer">
+      <div class="titlecontainer">
+        <h1> Waitress </h1>
+        <h2> Please take a seat and let me take your order </h2>
+      </div>
+    </div>
+  </body>
+</html>

data/lib/waitress/response.rb CHANGED Viewed

@@ -1,105 +1,105 @@
-module Waitress
-  # The response class is used to cook responses to be served to the client.
-  # This class contains things like response headers, status codes and the response
-  # body itself
-  class Response
-    def initialize
-      @headers = {}
-      status 200
-      default_headers
-      @isdone = false
-    end
-    # Returns true if the response has already been sent to the client
-    def done?
-      @isdone
-    end
-    # Mark the response as done (already sent to the client)
-    def done state=true
-      @isdone = state
-    end
-    # Apply the default headers to this response
-    def default_headers
-      header "Server", "Waitress #{Waitress::VERSION} (#{RUBY_PLATFORM})"
-    end
-    # Apply the given Status code to the response, such as 200, 404, 500 or
-    # any other code listed in the HTTP protocol specification
-    def status status_code
-      @status = status_code
-      @status_msg = Waitress::Util.status @status
-      header "Status", "#{@status} #{@status_msg}"
-    end
-    # Set the mimetype (Content-Type header) of this response to the one matching
-    # the given file extension as matched by the +Waitress::Util+ class
-    # +filext+:: The file extension to match, e.g. .html, .css, .js
-    def mime filext
-      m = Waitress::Util.mime filext
-      header "Content-Type", m
-    end
-    # Set the mimetype (Content-Type header) of this response to the one given.
-    # +type+:: The mime type to use, e.g. application/json, text/html,
-    # application/scon
-    def mime_raw type
-      header "Content-Type", type
-    end
-    # Set a header for the response. This header will be encoded to the http
-    # response
-    # Params:
-    # +header+:: The name of the header. e.g. "Content-Type"
-    # +data+:: The data to be encoded into the header. e.g. "text/html"
-    def header header, data
-      @headers[header] = data
-    end
-    # Set the Body IO object for the response. This IO object will be read from
-    # when the webpage is served, so usually this is a File reference or a StringIO
-    # +io+:: The io object to use. Not required if you just want to get the IO object
-    def body_io io=:get
-      @io = io unless io == :get
-      @io
-    end
-    # Append something to the Body IO. If the Body IO is a StringIO, this will usually be
-    # a String. This is mostly used for the 'echo' function
-    def append obj
-      @io.write obj
-    end
-    # Set the body to be a String. This will replace the BodyIO with a StringIO
-    # containing the string
-    # +str+:: The new string to replace the BodyIO with
-    def body str
-      body_io StringIO.new(str)
-    end
-    # Serve the response to the given socket. This will write the Headers, Response
-    # Code and Body.
-    def serve sock
-      unless done?
-        sock.write "HTTP/1.1 #{@status} #{@status_msg}\r\n"
-        @headers.each do |k, v|
-          sock.write "#{k}: #{v}\r\n"
-        end
-        sock.write "\r\n"
-        unless @io.nil?
-          @io.pos = 0
-          until @io.eof?
-            s = @io.read(4096)
-            sock.write s
-          end
-        end
-        done
-        sock.close rescue nil
-        @io.close rescue nil
-      end
-    end
-  end
-end
+module Waitress
+  # The response class is used to cook responses to be served to the client.
+  # This class contains things like response headers, status codes and the response
+  # body itself
+  class Response
+    def initialize
+      @headers = {}
+      status 200
+      default_headers
+      @isdone = false
+    end
+    # Returns true if the response has already been sent to the client
+    def done?
+      @isdone
+    end
+    # Mark the response as done (already sent to the client)
+    def done state=true
+      @isdone = state
+    end
+    # Apply the default headers to this response
+    def default_headers
+      header "Server", "Waitress #{Waitress::VERSION} (#{RUBY_PLATFORM})"
+    end
+    # Apply the given Status code to the response, such as 200, 404, 500 or
+    # any other code listed in the HTTP protocol specification
+    def status status_code
+      @status = status_code
+      @status_msg = Waitress::Util.status @status
+      header "Status", "#{@status} #{@status_msg}"
+    end
+    # Set the mimetype (Content-Type header) of this response to the one matching
+    # the given file extension as matched by the +Waitress::Util+ class
+    # +filext+:: The file extension to match, e.g. .html, .css, .js
+    def mime filext
+      m = Waitress::Util.mime filext
+      header "Content-Type", m
+    end
+    # Set the mimetype (Content-Type header) of this response to the one given.
+    # +type+:: The mime type to use, e.g. application/json, text/html,
+    # application/scon
+    def mime_raw type
+      header "Content-Type", type
+    end
+    # Set a header for the response. This header will be encoded to the http
+    # response
+    # Params:
+    # +header+:: The name of the header. e.g. "Content-Type"
+    # +data+:: The data to be encoded into the header. e.g. "text/html"
+    def header header, data
+      @headers[header] = data
+    end
+    # Set the Body IO object for the response. This IO object will be read from
+    # when the webpage is served, so usually this is a File reference or a StringIO
+    # +io+:: The io object to use. Not required if you just want to get the IO object
+    def body_io io=:get
+      @io = io unless io == :get
+      @io
+    end
+    # Append something to the Body IO. If the Body IO is a StringIO, this will usually be
+    # a String. This is mostly used for the 'echo' function
+    def append obj
+      @io.write obj
+    end
+    # Set the body to be a String. This will replace the BodyIO with a StringIO
+    # containing the string
+    # +str+:: The new string to replace the BodyIO with
+    def body str
+      body_io StringIO.new(str)
+    end
+    # Serve the response to the given socket. This will write the Headers, Response
+    # Code and Body.
+    def serve sock
+      unless done?
+        sock.write "HTTP/1.1 #{@status} #{@status_msg}\r\n"
+        @headers.each do |k, v|
+          sock.write "#{k}: #{v}\r\n"
+        end
+        sock.write "\r\n"
+        unless @io.nil?
+          @io.pos = 0
+          until @io.eof?
+            s = @io.read(4096)
+            sock.write s
+          end
+        end
+        done
+        sock.close rescue nil
+        @io.close rescue nil
+      end
+    end
+  end
+end

data/lib/waitress/server.rb CHANGED Viewed

@@ -1,161 +1,160 @@
-require 'socket'
-require 'thread'
-module Waitress
-  # The Waitress HTTPServer. This class is responsible for handling traffic from
-  # clients and delegating it to the correct Virtual Host to further handle.
-  # New threads and Processes are spawned for each connection to the server
-  class HttpServer < Array
-    class HttpParams < Hash
-      attr_accessor :http_body
-    end
-    attr_accessor :processes
-    # Create a new Server instance with the given ports. If no ports are given,
-    # port 80 will be used as a default
-    def initialize(*ports)
-      Waitress::SERVERS << self
-      ports << 80 if ports.length == 0
-      @ports = ports
-      @processes = 5
-      @processes = ENV["WAITRESS_PROCESSES"].to_i if ENV.include? "WAITRESS_PROCESSES"
-      @running_processes = []
-    end
-    # Set the amount of concurrent Waitress Processes to run on this Server, per Port
-    def set_processes count
-      @processes = count
-    end
-    # Set or Get the ports for this server. If arguments are provided, the ports
-    # for this server will be replaced with the ones listed. If no arguments are provided,
-    # this method simply returns the ports
-    def ports *ports
-      @ports = *ports unless ports.length == 0
-      @ports
-    end
-    # Start the server. If arguments are provided, it will run with the ports
-    # declared in the arguments, otherwise, it will use the ports it already has
-    # set (or 80 for the default)
-    def run *ports
-      @ports = ports unless ports.length == 0
-      self.each do |vhost|
-        vhost.on_server_start self
-      end
-      @running_processes = @ports.map do |port|
-        launch_port(port)
-      end
-      @running_processes.flatten!
-      self
-    end
-    # Killall running processes
-    def killall
-      @running_processes.each { |x| x.kill rescue nil }
-    end
-    # Join the server, blocking the current thread in order to keep the server alive.
-    def join
-      @running_processes.each { |x| x.wait }
-    end
-    # Handle a client based on an IO stream, if you plan to serve on a non-socket
-    # connection
-    def read_io io
-      handle_client io
-    end
-  :private
-    def launch_port port
-      serv = TCPServer.new port
-      processes = []
-      @processes.times do
-        processes << gofork {
-          while true
-            begin
-              client = serv.accept
-              gofork do               # Makes sure requires etc don't get triggered across requests
-                handle_client client
-              end.wait
-              client.close rescue nil
-            rescue => e
-              puts "Server Error: #{e} (Fix This!)"
-              puts e.backtrace
-              client.close rescue nil
-            end
-          end
-        }
-      end
-      processes.each do |pr|
-        Process.detach(pr.pid)
-      end
-      processes
-    end
-    def handle_client client_socket
-      # pro = gofork do
-      begin
-        data = client_socket.readpartial(8192)
-        nparsed = 0
-        parser = Waitress::HttpParser.new
-        params = HttpParams.new
-        while nparsed < data.length
-          nparsed = parser.execute(params, data, nparsed)
-          if parser.finished?
-            build_request params, client_socket
-          else
-            ch = client.readpartial(8192)
-            break if !ch or ch.length == 0
-            data << ch
-          end
-        end
-      rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, Errno::EINVAL, Errno::EBADF
-        client_socket.close rescue nil
-      rescue => e
-        puts "Client Error: #{e}"
-        puts e.backtrace
-      end
-      # end
-      client_socket.close rescue nil
-      # pro.wait
-    end
-    def build_request headers, client_socket
-      request_headers = {}
-      headers.each do |k,v|
-        if k.start_with? "HTTP_HEAD_"
-          request_headers[k.sub(/HTTP_HEAD_/, "")] = v
-        end
-      end
-      request = Waitress::Request.new(
-        headers["REQUEST_METHOD"], headers["REQUEST_PATH"], headers["REQUEST_URI"],
-        headers["QUERY_STRING"], headers["HTTP_VERSION"], headers.http_body, request_headers
-      )
-      handle_request request, client_socket
-    end
-    def handle_request request, client
-      match, pri = self[0], nil
-      self.each do |vhost|
-        if (request.headers['Host'].to_s =~ vhost.domain) != nil
-          match = vhost if pri.nil? || vhost.priority > pri
-        end
-      end
-      if match.nil?
-        # Subdomain not found (or default)
-      else
-        match.handle_request request, client
-      end
-    end
-  end
-end
+require 'socket'
+require 'thread'
+module Waitress
+  # The Waitress HTTPServer. This class is responsible for handling traffic from
+  # clients and delegating it to the correct Virtual Host to further handle.
+  # New threads and Processes are spawned for each connection to the server
+  class HttpServer < Array
+    class HttpParams < Hash
+      attr_accessor :http_body
+    end
+    attr_accessor :processes
+    # Create a new Server instance with the given ports. If no ports are given,
+    # port 80 will be used as a default
+    def initialize(*ports)
+      ports << 80 if ports.length == 0
+      @ports = ports
+      @processes = 5
+      @processes = ENV["WAITRESS_PROCESSES"].to_i if ENV.include? "WAITRESS_PROCESSES"
+      @running_processes = []
+    end
+    # Set the amount of concurrent Waitress Processes to run on this Server, per Port
+    def set_processes count
+      @processes = count
+    end
+    # Set or Get the ports for this server. If arguments are provided, the ports
+    # for this server will be replaced with the ones listed. If no arguments are provided,
+    # this method simply returns the ports
+    def ports *ports
+      @ports = *ports unless ports.length == 0
+      @ports
+    end
+    # Start the server. If arguments are provided, it will run with the ports
+    # declared in the arguments, otherwise, it will use the ports it already has
+    # set (or 80 for the default)
+    def run *ports
+      @ports = ports unless ports.length == 0
+      self.each do |vhost|
+        vhost.on_server_start self
+      end
+      @running_processes = @ports.map do |port|
+        launch_port(port)
+      end
+      @running_processes.flatten!
+      self
+    end
+    # Killall running processes
+    def killall
+      @running_processes.each { |x| x.kill rescue nil }
+    end
+    # Join the server, blocking the current thread in order to keep the server alive.
+    def join
+      @running_processes.each { |x| x.wait }
+    end
+    # Handle a client based on an IO stream, if you plan to serve on a non-socket
+    # connection
+    def read_io io
+      handle_client io
+    end
+  :private
+    def launch_port port
+      serv = TCPServer.new port
+      processes = []
+      @processes.times do
+        processes << gofork {
+          while true
+            begin
+              client = serv.accept
+              gofork do               # Makes sure requires etc don't get triggered across requests
+                handle_client client
+              end.wait
+              client.close rescue nil
+            rescue => e
+              puts "Server Error: #{e} (Fix This!)"
+              puts e.backtrace
+              client.close rescue nil
+            end
+          end
+        }
+      end
+      processes.each do |pr|
+        Process.detach(pr.pid)
+      end
+      processes
+    end
+    def handle_client client_socket
+      # pro = gofork do
+      begin
+        data = client_socket.readpartial(8192)
+        nparsed = 0
+        parser = Waitress::HttpParser.new
+        params = HttpParams.new
+        while nparsed < data.length
+          nparsed = parser.execute(params, data, nparsed)
+          if parser.finished?
+            build_request params, client_socket
+          else
+            ch = client.readpartial(8192)
+            break if !ch or ch.length == 0
+            data << ch
+          end
+        end
+      rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, Errno::EINVAL, Errno::EBADF
+        client_socket.close rescue nil
+      rescue => e
+        puts "Client Error: #{e}"
+        puts e.backtrace
+      end
+      # end
+      client_socket.close rescue nil
+      # pro.wait
+    end
+    def build_request headers, client_socket
+      request_headers = {}
+      headers.each do |k,v|
+        if k.start_with? "HTTP_HEAD_"
+          request_headers[k.sub(/HTTP_HEAD_/, "")] = v
+        end
+      end
+      request = Waitress::Request.new(
+        headers["REQUEST_METHOD"], headers["REQUEST_PATH"], headers["REQUEST_URI"],
+        headers["QUERY_STRING"], headers["HTTP_VERSION"], headers.http_body, request_headers
+      )
+      handle_request request, client_socket
+    end
+    def handle_request request, client
+      match, pri = self[0], nil
+      self.each do |vhost|
+        if (request.headers['Host'].to_s =~ vhost.domain) != nil
+          match = vhost if pri.nil? || vhost.priority > pri
+        end
+      end
+      if match.nil?
+        # Subdomain not found (or default)
+      else
+        match.handle_request request, client
+      end
+    end
+  end
+end