waitress-core 0.2.1 → 0.2.2

data/ext/waitress_http11/http11_parser.rl

@@ -1,165 +1,165 @@
-/**
- * Copyright (c) 2005 Zed A. Shaw
- * You can redistribute it and/or modify it under the same terms as Ruby.
- */
-#include "http11_parser.h"
-#include <stdio.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
-/*
- * capitalizes all lower-case ASCII characters,
- * converts dashes to underscores.
- */
-static void snake_upcase_char(char *c)
-{
-    if (*c >= 'a' && *c <= 'z')
-      *c &= ~0x20;
-    else if (*c == '-')
-      *c = '_';
-}
-
-#define LEN(AT, FPC) (FPC - buffer - parser->AT)
-#define MARK(M,FPC) (parser->M = (FPC) - buffer)
-#define PTR_TO(F) (buffer + parser->F)
-
-/** Machine **/
-
-%%{
-
-  machine http_parser;
-
-  action mark {MARK(mark, fpc); }
-
-
-  action start_field { MARK(field_start, fpc); }
-  action snake_upcase_field { snake_upcase_char((char *)fpc); }
-  action write_field {
-    parser->field_len = LEN(field_start, fpc);
-  }
-
-  action start_value { MARK(mark, fpc); }
-  action write_value {
-    if(parser->http_field != NULL) {
-      parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, fpc));
-    }
-  }
-  action request_method {
-    if(parser->request_method != NULL)
-      parser->request_method(parser->data, PTR_TO(mark), LEN(mark, fpc));
-  }
-  action request_uri {
-    if(parser->request_uri != NULL)
-      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, fpc));
-  }
-  action fragment {
-    if(parser->fragment != NULL)
-      parser->fragment(parser->data, PTR_TO(mark), LEN(mark, fpc));
-  }
-
-  action start_query {MARK(query_start, fpc); }
-  action query_string {
-    if(parser->query_string != NULL)
-      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, fpc));
-  }
-
-  action http_version {
-    if(parser->http_version != NULL)
-      parser->http_version(parser->data, PTR_TO(mark), LEN(mark, fpc));
-  }
-
-  action request_path {
-    if(parser->request_path != NULL)
-      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,fpc));
-  }
-
-  action done {
-    parser->body_start = fpc - buffer + 1;
-    if(parser->header_done != NULL)
-      parser->header_done(parser->data, fpc + 1, pe - fpc - 1);
-    fbreak;
-  }
-
-  include http_parser_common "http11_parser_common.rl";
-
-}%%
-
-/** Data **/
-%% write data;
-
-int http_parser_init(http_parser *parser)  {
-  int cs = 0;
-  %% write init;
-  parser->cs = cs;
-  parser->body_start = 0;
-  parser->content_len = 0;
-  parser->mark = 0;
-  parser->nread = 0;
-  parser->field_len = 0;
-  parser->field_start = 0;
-
-  return(1);
-}
-
-
-/** exec **/
-size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len, size_t off)  {
-  const char *p, *pe;
-  int cs = parser->cs;
-
-  assert(off <= len && "offset past end of buffer");
-
-  p = buffer+off;
-  pe = buffer+len;
-
-  assert(*pe == '\0' && "pointer does not end on NUL");
-  assert(pe - p == len - off && "pointers aren't same distance");
-
-
-  %% write exec;
-
-  parser->cs = cs;
-  parser->nread += p - (buffer + off);
-
-  assert(p <= pe && "buffer overflow after parsing execute");
-  assert(parser->nread <= len && "nread longer than length");
-  assert(parser->body_start <= len && "body starts after buffer end");
-  assert(parser->mark < len && "mark is after buffer end");
-  assert(parser->field_len <= len && "field has length longer than whole buffer");
-  assert(parser->field_start < len && "field starts after buffer end");
-
-  if(parser->body_start) {
-    /* final \r\n combo encountered so stop right here */
-    %%write eof;
-    parser->nread++;
-  }
-
-  return(parser->nread);
-}
-
-int http_parser_finish(http_parser *parser)
-{
-  int cs = parser->cs;
-
-  %%write eof;
-
-  parser->cs = cs;
-
-  if (http_parser_has_error(parser) ) {
-    return -1;
-  } else if (http_parser_is_finished(parser) ) {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-int http_parser_has_error(http_parser *parser) {
-  return parser->cs == http_parser_error;
-}
-
-int http_parser_is_finished(http_parser *parser) {
-  return parser->cs == http_parser_first_final;
-}
+/**
+ * Copyright (c) 2005 Zed A. Shaw
+ * You can redistribute it and/or modify it under the same terms as Ruby.
+ */
+#include "http11_parser.h"
+#include <stdio.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+
+/*
+ * capitalizes all lower-case ASCII characters,
+ * converts dashes to underscores.
+ */
+static void snake_upcase_char(char *c)
+{
+    if (*c >= 'a' && *c <= 'z')
+      *c &= ~0x20;
+    else if (*c == '-')
+      *c = '_';
+}
+
+#define LEN(AT, FPC) (FPC - buffer - parser->AT)
+#define MARK(M,FPC) (parser->M = (FPC) - buffer)
+#define PTR_TO(F) (buffer + parser->F)
+
+/** Machine **/
+
+%%{
+
+  machine http_parser;
+
+  action mark {MARK(mark, fpc); }
+
+
+  action start_field { MARK(field_start, fpc); }
+  action snake_upcase_field { snake_upcase_char((char *)fpc); }
+  action write_field {
+    parser->field_len = LEN(field_start, fpc);
+  }
+
+  action start_value { MARK(mark, fpc); }
+  action write_value {
+    if(parser->http_field != NULL) {
+      parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, fpc));
+    }
+  }
+  action request_method {
+    if(parser->request_method != NULL)
+      parser->request_method(parser->data, PTR_TO(mark), LEN(mark, fpc));
+  }
+  action request_uri {
+    if(parser->request_uri != NULL)
+      parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, fpc));
+  }
+  action fragment {
+    if(parser->fragment != NULL)
+      parser->fragment(parser->data, PTR_TO(mark), LEN(mark, fpc));
+  }
+
+  action start_query {MARK(query_start, fpc); }
+  action query_string {
+    if(parser->query_string != NULL)
+      parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, fpc));
+  }
+
+  action http_version {
+    if(parser->http_version != NULL)
+      parser->http_version(parser->data, PTR_TO(mark), LEN(mark, fpc));
+  }
+
+  action request_path {
+    if(parser->request_path != NULL)
+      parser->request_path(parser->data, PTR_TO(mark), LEN(mark,fpc));
+  }
+
+  action done {
+    parser->body_start = fpc - buffer + 1;
+    if(parser->header_done != NULL)
+      parser->header_done(parser->data, fpc + 1, pe - fpc - 1);
+    fbreak;
+  }
+
+  include http_parser_common "http11_parser_common.rl";
+
+}%%
+
+/** Data **/
+%% write data;
+
+int http_parser_init(http_parser *parser)  {
+  int cs = 0;
+  %% write init;
+  parser->cs = cs;
+  parser->body_start = 0;
+  parser->content_len = 0;
+  parser->mark = 0;
+  parser->nread = 0;
+  parser->field_len = 0;
+  parser->field_start = 0;
+
+  return(1);
+}
+
+
+/** exec **/
+size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len, size_t off)  {
+  const char *p, *pe;
+  int cs = parser->cs;
+
+  assert(off <= len && "offset past end of buffer");
+
+  p = buffer+off;
+  pe = buffer+len;
+
+  assert(*pe == '\0' && "pointer does not end on NUL");
+  assert(pe - p == len - off && "pointers aren't same distance");
+
+
+  %% write exec;
+
+  parser->cs = cs;
+  parser->nread += p - (buffer + off);
+
+  assert(p <= pe && "buffer overflow after parsing execute");
+  assert(parser->nread <= len && "nread longer than length");
+  assert(parser->body_start <= len && "body starts after buffer end");
+  assert(parser->mark < len && "mark is after buffer end");
+  assert(parser->field_len <= len && "field has length longer than whole buffer");
+  assert(parser->field_start < len && "field starts after buffer end");
+
+  if(parser->body_start) {
+    /* final \r\n combo encountered so stop right here */
+    %%write eof;
+    parser->nread++;
+  }
+
+  return(parser->nread);
+}
+
+int http_parser_finish(http_parser *parser)
+{
+  int cs = parser->cs;
+
+  %%write eof;
+
+  parser->cs = cs;
+
+  if (http_parser_has_error(parser) ) {
+    return -1;
+  } else if (http_parser_is_finished(parser) ) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+int http_parser_has_error(http_parser *parser) {
+  return parser->cs == http_parser_error;
+}
+
+int http_parser_is_finished(http_parser *parser) {
+  return parser->cs == http_parser_first_final;
+}

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);
+}