waitress-core 0.2.4 → 0.3.0

data/ext/waitress_http11/http11_parser_common.rl

@@ -1,55 +1,55 @@
-%%{
-
-  machine http_parser_common;
-
-#### HTTP PROTOCOL GRAMMAR
-# line endings
-  CRLF = "\r\n";
-
-# character types
-  CTL = (cntrl | 127);
-  safe = ("$" | "-" | "_" | ".");
-  extra = ("!" | "*" | "'" | "(" | ")" | ",");
-  reserved = (";" | "/" | "?" | ":" | "@" | "&" | "=" | "+");
-  sorta_safe = ("\"" | "<" | ">");
-  unsafe = (CTL | " " | "#" | "%" | sorta_safe);
-  national = any -- (alpha | digit | reserved | extra | safe | unsafe);
-  unreserved = (alpha | digit | safe | extra | national);
-  escape = ("%" xdigit xdigit);
-  uchar = (unreserved | escape | sorta_safe);
-  pchar = (uchar | ":" | "@" | "&" | "=" | "+");
-  tspecials = ("(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\\" | "\"" | "/" | "[" | "]" | "?" | "=" | "{" | "}" | " " | "\t");
-
-# elements
-  token = (ascii -- (CTL | tspecials));
-
-# URI schemes and absolute paths
-  scheme = ( alpha | digit | "+" | "-" | "." )* ;
-  absolute_uri = (scheme ":" (uchar | reserved )*);
-
-  path = ( pchar+ ( "/" pchar* )* ) ;
-  query = ( uchar | reserved )* %query_string ;
-  param = ( pchar | "/" )* ;
-  params = ( param ( ";" param )* ) ;
-  rel_path = ( path? %request_path (";" params)? ) ("?" %start_query query)?;
-  absolute_path = ( "/"+ rel_path );
-
-  Request_URI = ( "*" | absolute_uri | absolute_path ) >mark %request_uri;
-  Fragment = ( uchar | reserved )* >mark %fragment;
-  Method = ( upper | digit | safe ){1,20} >mark %request_method;
-
-  http_number = ( digit+ "." digit+ ) ;
-  HTTP_Version = ( "HTTP/" http_number ) >mark %http_version ;
-  Request_Line = ( Method " " Request_URI ("#" Fragment){0,1} " " HTTP_Version CRLF ) ;
-
-  field_name = ( token -- ":" )+ >start_field $snake_upcase_field %write_field;
-
-  field_value = any* >start_value %write_value;
-
-  message_header = field_name ":" " "* field_value :> CRLF;
-
-  Request = Request_Line ( message_header )* ( CRLF @done );
-
-main := Request;
-
-}%%
+%%{
+
+  machine http_parser_common;
+
+#### HTTP PROTOCOL GRAMMAR
+# line endings
+  CRLF = "\r\n";
+
+# character types
+  CTL = (cntrl | 127);
+  safe = ("$" | "-" | "_" | ".");
+  extra = ("!" | "*" | "'" | "(" | ")" | ",");
+  reserved = (";" | "/" | "?" | ":" | "@" | "&" | "=" | "+");
+  sorta_safe = ("\"" | "<" | ">");
+  unsafe = (CTL | " " | "#" | "%" | sorta_safe);
+  national = any -- (alpha | digit | reserved | extra | safe | unsafe);
+  unreserved = (alpha | digit | safe | extra | national);
+  escape = ("%" xdigit xdigit);
+  uchar = (unreserved | escape | sorta_safe);
+  pchar = (uchar | ":" | "@" | "&" | "=" | "+");
+  tspecials = ("(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\\" | "\"" | "/" | "[" | "]" | "?" | "=" | "{" | "}" | " " | "\t");
+
+# elements
+  token = (ascii -- (CTL | tspecials));
+
+# URI schemes and absolute paths
+  scheme = ( alpha | digit | "+" | "-" | "." )* ;
+  absolute_uri = (scheme ":" (uchar | reserved )*);
+
+  path = ( pchar+ ( "/" pchar* )* ) ;
+  query = ( uchar | reserved )* %query_string ;
+  param = ( pchar | "/" )* ;
+  params = ( param ( ";" param )* ) ;
+  rel_path = ( path? %request_path (";" params)? ) ("?" %start_query query)?;
+  absolute_path = ( "/"+ rel_path );
+
+  Request_URI = ( "*" | absolute_uri | absolute_path ) >mark %request_uri;
+  Fragment = ( uchar | reserved )* >mark %fragment;
+  Method = ( upper | digit | safe ){1,20} >mark %request_method;
+
+  http_number = ( digit+ "." digit+ ) ;
+  HTTP_Version = ( "HTTP/" http_number ) >mark %http_version ;
+  Request_Line = ( Method " " Request_URI ("#" Fragment){0,1} " " HTTP_Version CRLF ) ;
+
+  field_name = ( token -- ":" )+ >start_field $snake_upcase_field %write_field;
+
+  field_value = any* >start_value %write_value;
+
+  message_header = field_name ":" " "* field_value :> CRLF;
+
+  Request = Request_Line ( message_header )* ( CRLF @done );
+
+main := Request;
+
+}%%

data/ext/waitress_http11/http11_wrb_parser.h

@@ -1,91 +1,91 @@
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-
-char *substr(const char *buff, int start, int len) {
-    char subbuff[len + 1];
-    memcpy(subbuff, &buff[start], len);
-    subbuff[len] = '\0';
-    return strdup(subbuff);
-}
-
-int mat(char *str1, char *str2) {
-    return strcmp(str1, str2) == 0;
-}
-
-VALUE WRB_Parse(VALUE self, VALUE string, VALUE buffer) {
-  char *sptr = RSTRING_PTR(string);
-  long slen = RSTRING_LEN(string);
-
-  char *tar = "<?ruby";
-  char tarlen = 6;
-  char *end = "?>";
-  char endlen = 2;
-
-  int i = 0;
-  char pc = NULL;
-  int line_cur = 1;
-  int line = 1;
-
-  while (i < slen) {
-    char c = sptr[i];
-    if (c == '\n') line_cur += 1;
-
-    int open_e = i + tarlen;
-    char *open_s = substr(sptr, i, tarlen);
-
-    if (mat(open_s, tar) && pc != '\\') {
-      line = line_cur;
-      int j = open_e;
-      int search = 1;
-      int q1 = 0; int q2 = 0;
-      while (j < slen && search) {
-        char cc = sptr[j];
-        if (cc == '\n') line_cur += 1;
-
-        int close_e = j + endlen;
-        char *close_s = substr(sptr, j, endlen);
-
-        if (sptr[j-1] != '\\') {
-          if (cc == '\"') q1 = (q1 == 0 ? 1 : 0);
-          if (cc == '\'') q2 = (q2 == 0 ? 1 : 0);
-          if (mat(close_s, end) && !q1 && !q2) {
-            i = close_e - 1;
-            search = 0;
-            char *rb_ev = substr(sptr, open_e, j - open_e);
-            rb_yield_values(2, rb_str_new2(rb_ev), INT2NUM(line));
-          }
-        }
-
-        j+=1;
-      }
-
-      if (j == slen && search) {
-        char *rb_ev = substr(sptr, open_e, j);
-        i = slen;
-        rb_eval_string(rb_ev);
-      }
-    } else if (c == '\\') {
-      if (!mat(substr(sptr, i+1, tarlen), tar)) {
-        char strbuf[2] = "\0";
-        strbuf[0] = c;
-        rb_funcall(buffer, rb_intern("write"), 1, rb_str_new2(strbuf));
-      }
-    } else {
-      char strbuf[2] = "\0";
-      strbuf[0] = c;
-      rb_funcall(buffer, rb_intern("write"), 1, rb_str_new2(strbuf));
-    }
-
-    pc = c;
-    i += 1;
-  }
-}
-
-void init_parse(VALUE rubyModule) {
-  VALUE cWaParse = rb_define_class_under(rubyModule, "WRBParser", rb_cObject);
-  rb_define_module_function(cWaParse, "parse!", WRB_Parse, 2);
-}
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
+char *substr(const char *buff, int start, int len) {
+    char subbuff[len + 1];
+    memcpy(subbuff, &buff[start], len);
+    subbuff[len] = '\0';
+    return strdup(subbuff);
+}
+
+int mat(char *str1, char *str2) {
+    return strcmp(str1, str2) == 0;
+}
+
+VALUE WRB_Parse(VALUE self, VALUE string, VALUE buffer) {
+  char *sptr = RSTRING_PTR(string);
+  long slen = RSTRING_LEN(string);
+
+  char *tar = "<?ruby";
+  char tarlen = 6;
+  char *end = "?>";
+  char endlen = 2;
+
+  int i = 0;
+  char pc = NULL;
+  int line_cur = 1;
+  int line = 1;
+
+  while (i < slen) {
+    char c = sptr[i];
+    if (c == '\n') line_cur += 1;
+
+    int open_e = i + tarlen;
+    char *open_s = substr(sptr, i, tarlen);
+
+    if (mat(open_s, tar) && pc != '\\') {
+      line = line_cur;
+      int j = open_e;
+      int search = 1;
+      int q1 = 0; int q2 = 0;
+      while (j < slen && search) {
+        char cc = sptr[j];
+        if (cc == '\n') line_cur += 1;
+
+        int close_e = j + endlen;
+        char *close_s = substr(sptr, j, endlen);
+
+        if (sptr[j-1] != '\\') {
+          if (cc == '\"') q1 = (q1 == 0 ? 1 : 0);
+          if (cc == '\'') q2 = (q2 == 0 ? 1 : 0);
+          if (mat(close_s, end) && !q1 && !q2) {
+            i = close_e - 1;
+            search = 0;
+            char *rb_ev = substr(sptr, open_e, j - open_e);
+            rb_yield_values(2, rb_str_new2(rb_ev), INT2NUM(line));
+          }
+        }
+
+        j+=1;
+      }
+
+      if (j == slen && search) {
+        char *rb_ev = substr(sptr, open_e, j);
+        i = slen;
+        rb_eval_string(rb_ev);
+      }
+    } else if (c == '\\') {
+      if (!mat(substr(sptr, i+1, tarlen), tar)) {
+        char strbuf[2] = "\0";
+        strbuf[0] = c;
+        rb_funcall(buffer, rb_intern("write"), 1, rb_str_new2(strbuf));
+      }
+    } else {
+      char strbuf[2] = "\0";
+      strbuf[0] = c;
+      rb_funcall(buffer, rb_intern("write"), 1, rb_str_new2(strbuf));
+    }
+
+    pc = c;
+    i += 1;
+  }
+}
+
+void init_parse(VALUE rubyModule) {
+  VALUE cWaParse = rb_define_class_under(rubyModule, "WRBParser", rb_cObject);
+  rb_define_module_function(cWaParse, "parse!", WRB_Parse, 2);
+}

data/lib/waitress.rb

@@ -1,99 +1,100 @@
-require 'waitress/version'
-require 'waitress/util'
-require 'waitress/kernel'
-require 'waitress/configure'
-require 'waitress/parse/query'
-
-require 'waitress/server'
-require 'waitress/request'
-require 'waitress/response'
-
-require 'waitress/vhost'
-require 'waitress/handlers/handler'
-require 'waitress/handlers/dirhandler'
-require 'waitress/handlers/handler404'
-require 'waitress/handlers/libhandler'
-require 'waitress/chef'
-require 'waitress/evalbind'
-
-require 'waitress_http11'
-
-require 'go'
-require 'configfile'
-require 'fileutils'
-
-# The Base module for the Waitress Web Server, containing all the required
-# classes and utilities created by Waitress
-module Waitress
-
-  # Create a new Waitress Server, or, in case of the Filesystem, create a Configuration
-  # for a set of Servers
-  # Params:
-  # +filesystem+:: True if waitress should be loaded from the Filesystem. Default: false
-  # +rootdir+:: The root directory to load waitress from, defaults to ~/.waitress
-  def self.serve! filesystem=false, rootdir=:default
-    waitress = Waitress.new
-    waitress.serve! filesystem, rootdir
-  end
-
-  # Create a configuration for a single Waitress Server instance. This should be called
-  # from the config.rb file and nowhere else.
-  # Params:
-  # +args+:: The arguments to configure with. This should be a variable amount of arguments
-  # representing what ports to run the server on. If no args are provided, port 80 will
-  # be used as a default
-  # +block+:: The block to call once the configuration has been created. Setup should be
-  # done in here
-  def self.configure! *args, &block
-    Waitress::Configure.configure! *args, &block
-  end
-
-  # Create a new Launch Instance, used to serve a simple Waitress Server from either the
-  # filesystem, or embedded.
-  def self.new *args
-    Waitress::Launcher.new *args
-  end
-
-  class Launcher
-
-    # Create a new launcher. This is responsible for creating Waitress server instances
-    # from either the Filesystem, or being embedded in an application
-    def initialize waitress_root="~/.waitress"
-      @waitress_root = File.expand_path waitress_root
-    end
-
-    # Serve a Waitress server from either the Filesystem or embedded in an application
-    def serve! filesystem=false, rootdir=:default
-      if filesystem
-        serve_filesystem rootdir
-      else
-        serve
-      end
-    end
-
-  :private
-    def config
-      ConfigFile.new File.join(@waitress_root, "config.yml"),
-        {"server_root" => File.join(@waitress_root, "www")}, :yaml
-    end
-
-    def serve_filesystem rootdir
-      if rootdir == :default
-        FileUtils.mkdir_p @waitress_root unless File.exist? @waitress_root
-        cfg = config
-        cfg.load
-        @root = File.expand_path cfg["server_root"]
-      else
-        @root = rootdir
-      end
-      # s = serve
-      # Waitress::Configure.new s, @root
-      # s
-      Waitress::Configure.new @root
-    end
-
-    def serve
-      Waitress::HttpServer.new
-    end
-  end
-end
+require 'waitress/version'
+require 'waitress/util/util'
+require 'waitress/util/less_watcher'
+require 'waitress/kernel'
+require 'waitress/configure'
+require 'waitress/parse/query'
+
+require 'waitress/server'
+require 'waitress/request'
+require 'waitress/response'
+
+require 'waitress/vhost'
+require 'waitress/handlers/handler'
+require 'waitress/handlers/dirhandler'
+require 'waitress/handlers/handler404'
+require 'waitress/handlers/libhandler'
+require 'waitress/chef'
+require 'waitress/evalbind'
+
+require 'waitress_http11'
+
+require 'go'
+require 'configfile'
+require 'fileutils'
+
+# The Base module for the Waitress Web Server, containing all the required
+# classes and utilities created by Waitress
+module Waitress
+
+  # Create a new Waitress Server, or, in case of the Filesystem, create a Configuration
+  # for a set of Servers
+  # Params:
+  # +filesystem+:: True if waitress should be loaded from the Filesystem. Default: false
+  # +rootdir+:: The root directory to load waitress from, defaults to ~/.waitress
+  def self.serve! filesystem=false, rootdir=:default
+    waitress = Waitress.new
+    waitress.serve! filesystem, rootdir
+  end
+
+  # Create a configuration for a single Waitress Server instance. This should be called
+  # from the config.rb file and nowhere else.
+  # Params:
+  # +args+:: The arguments to configure with. This should be a variable amount of arguments
+  # representing what ports to run the server on. If no args are provided, port 80 will
+  # be used as a default
+  # +block+:: The block to call once the configuration has been created. Setup should be
+  # done in here
+  def self.configure! *args, &block
+    Waitress::Configure.configure! *args, &block
+  end
+
+  # Create a new Launch Instance, used to serve a simple Waitress Server from either the
+  # filesystem, or embedded.
+  def self.new *args
+    Waitress::Launcher.new *args
+  end
+
+  class Launcher
+
+    # Create a new launcher. This is responsible for creating Waitress server instances
+    # from either the Filesystem, or being embedded in an application
+    def initialize waitress_root="~/.waitress"
+      @waitress_root = File.expand_path waitress_root
+    end
+
+    # Serve a Waitress server from either the Filesystem or embedded in an application
+    def serve! filesystem=false, rootdir=:default
+      if filesystem
+        serve_filesystem rootdir
+      else
+        serve
+      end
+    end
+
+  :private
+    def config
+      ConfigFile.new File.join(@waitress_root, "config.yml"),
+        {"server_root" => File.join(@waitress_root, "www")}, :yaml
+    end
+
+    def serve_filesystem rootdir
+      if rootdir == :default
+        FileUtils.mkdir_p @waitress_root unless File.exist? @waitress_root
+        cfg = config
+        cfg.load
+        @root = File.expand_path cfg["server_root"]
+      else
+        @root = rootdir
+      end
+      # s = serve
+      # Waitress::Configure.new s, @root
+      # s
+      Waitress::Configure.new @root
+    end
+
+    def serve
+      Waitress::HttpServer.new
+    end
+  end
+end