http_parser.rb 0.5.1-x86-mswin32-60 → 0.5.2-x86-mswin32-60

data/ext/ruby_http_parser/vendor/http-parser-java/test_permutations

@@ -1 +1 @@
-javac -d classes/ `find src -name '*.java'`  && java -cp classes http_parser.lolevel.TestLoaderNG tests.dumped
+javac -cp ext/primitives.jar -d classes/ `find src -name '*.java'`  && java -cp classes:ext/primitives.jar http_parser.lolevel.TestLoaderNG tests.dumped

data/ext/ruby_http_parser/vendor/http-parser-java/test_unit

@@ -1 +1 @@
-javac -d classes/ `find src -name '*.java'`  && java -cp classes http_parser.lolevel.UnitTest
+javac -cp ext/primitives.jar -d classes/ `find src -name '*.java'`  && java -cp classes:ext/primitives.jar http_parser.lolevel.UnitTest

data/ext/ruby_http_parser/vendor/http-parser-java/test_utf8

@@ -0,0 +1 @@
+javac -cp ext/primitives.jar -d classes/ `find src -name '*.java'`  && java -cp classes:ext/primitives.jar http_parser.lolevel.TestLoaderNG tests.utf8

data/ext/ruby_http_parser/vendor/http-parser-java/tests.dumped

@@ -304,12 +304,12 @@ http_major                :1
 http_minor                :1
 
 name  :connect request
-raw   :"CONNECT home.netscape.com:443 HTTP/1.0\r\nUser-agent: Mozilla/1.1N\r\nProxy-authorization: basic aGVsbG86d29ybGQ=\r\n\r\n"
+raw   :"CONNECT home0.netscape.com:443 HTTP/1.0\r\nUser-agent: Mozilla/1.1N\r\nProxy-authorization: basic aGVsbG86d29ybGQ=\r\n\r\n"
 type  :HTTP_REQUEST
 method: HTTP_CONNECT
 status_code :0
 request_path:
-request_url :home.netscape.com:443
+request_url :home0.netscape.com:443
 fragment    :
 query_string:
 body        :""
@@ -324,7 +324,7 @@ http_minor                :0
 name  :report request
 raw   :"REPORT /test HTTP/1.1\r\n\r\n"
 type  :HTTP_REQUEST
-method: REPORT
+method: HTTP_REPORT
 status_code :0
 request_path:/test
 request_url :/test
@@ -337,8 +337,108 @@ upgrade                   :0
 http_major                :1
 http_minor                :1
 
+name  :request with no http version
+raw   :"GET /\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:/
+request_url :/
+fragment    :
+query_string:
+body        :""
+body_size   :0
+should_keep_alive         :0
+upgrade                   :0
+http_major                :0
+http_minor                :9
+
+name  :m-search request
+raw   :"M-SEARCH * HTTP/1.1\r\nHOST: 239.255.255.250:1900\r\nMAN: \"ssdp:discover\"\r\nST: \"ssdp:all\"\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_MSEARCH
+status_code :0
+request_path:*
+request_url :*
+fragment    :
+query_string:
+body        :""
+body_size   :0
+header_0 :{ "HOST": "239.255.255.250:1900"}
+header_1 :{ "MAN": ""ssdp:discover""}
+header_2 :{ "ST": ""ssdp:all""}
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1
+
+name  :utf-8 path request
+raw   :"GET /δ¶/δt/pope?q=1#narf HTTP/1.1\r\nHost: github.com\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:/δ¶/δt/pope
+request_url :/δ¶/δt/pope?q=1#narf
+fragment    :narf
+query_string:q=1
+body        :""
+body_size   :0
+header_0 :{ "Host": "github.com"}
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1
+
+name  :host terminated by a query string
+raw   :"GET http://hypnotoad.org?hail=all HTTP/1.1\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:
+request_url :http://hypnotoad.org?hail=all
+fragment    :
+query_string:hail=all
+body        :""
+body_size   :0
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1
+
+name  :host:port terminated by a query string
+raw   :"GET http://hypnotoad.org:1234?hail=all HTTP/1.1\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:
+request_url :http://hypnotoad.org:1234?hail=all
+fragment    :
+query_string:hail=all
+body        :""
+body_size   :0
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1
+
+name  :host:port terminated by a space
+raw   :"GET http://hypnotoad.org:1234 HTTP/1.1\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:
+request_url :http://hypnotoad.org:1234
+fragment    :
+query_string:
+body        :""
+body_size   :0
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1
+
 name  :google 301
-raw   :"HTTP/1.1 301 Moved Permanently\r\nLocation: http://www.google.com/\r\nContent-Type: text/html; charset=UTF-8\r\nDate: Sun, 26 Apr 2009 11:11:49 GMT\r\nExpires: Tue, 26 May 2009 11:11:49 GMT\r\nCache-Control: public, max-age=2592000\r\nServer: gws\r\nContent-Length: 219\r\n\r\n<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n<TITLE>301 Moved</TITLE></HEAD><BODY>\n<H1>301 Moved</H1>\nThe document has moved\n<A HREF=\"http://www.google.com/\">here</A>.\r\n</BODY></HTML>\r\n"
+raw   :"HTTP/1.1 301 Moved Permanently\r\nLocation: http://www.google.com/\r\nContent-Type: text/html; charset=UTF-8\r\nDate: Sun, 26 Apr 2009 11:11:49 GMT\r\nExpires: Tue, 26 May 2009 11:11:49 GMT\r\nX-$PrototypeBI-Version: 1.6.0.3\r\nCache-Control: public, max-age=2592000\r\nServer: gws\r\nContent-Length:  219  \r\n\r\n<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n<TITLE>301 Moved</TITLE></HEAD><BODY>\n<H1>301 Moved</H1>\nThe document has moved\n<A HREF=\"http://www.google.com/\">here</A>.\r\n</BODY></HTML>\r\n"
 type  :HTTP_RESPONSE
 method: HTTP_DELETE
 status_code :301
@@ -352,9 +452,10 @@ header_0 :{ "Location": "http://www.google.com/"}
 header_1 :{ "Content-Type": "text/html; charset=UTF-8"}
 header_2 :{ "Date": "Sun, 26 Apr 2009 11:11:49 GMT"}
 header_3 :{ "Expires": "Tue, 26 May 2009 11:11:49 GMT"}
-header_4 :{ "Cache-Control": "public, max-age=2592000"}
-header_5 :{ "Server": "gws"}
-header_6 :{ "Content-Length": "219"}
+header_4 :{ "X-$PrototypeBI-Version": "1.6.0.3"}
+header_5 :{ "Cache-Control": "public, max-age=2592000"}
+header_6 :{ "Server": "gws"}
+header_7 :{ "Content-Length": "219  "}
 should_keep_alive         :1
 upgrade                   :0
 http_major                :1
@@ -537,3 +638,49 @@ upgrade                   :0
 http_major                :1
 http_minor                :1
 
+name  :field underscore
+raw   :"HTTP/1.1 200 OK\r\nDate: Tue, 28 Sep 2010 01:14:13 GMT\r\nServer: Apache\r\nCache-Control: no-cache, must-revalidate\r\nExpires: Mon, 26 Jul 1997 05:00:00 GMT\r\n.et-Cookie: PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com\r\nVary: Accept-Encoding\r\n_eep-Alive: timeout=45\r\n_onnection: Keep-Alive\r\nTransfer-Encoding: chunked\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n0\r\n\r\n"
+type  :HTTP_RESPONSE
+method: HTTP_DELETE
+status_code :200
+request_path:
+request_url :
+fragment    :
+query_string:
+body        :""
+body_size   :0
+header_0 :{ "Date": "Tue, 28 Sep 2010 01:14:13 GMT"}
+header_1 :{ "Server": "Apache"}
+header_2 :{ "Cache-Control": "no-cache, must-revalidate"}
+header_3 :{ "Expires": "Mon, 26 Jul 1997 05:00:00 GMT"}
+header_4 :{ ".et-Cookie": "PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com"}
+header_5 :{ "Vary": "Accept-Encoding"}
+header_6 :{ "_eep-Alive": "timeout=45"}
+header_7 :{ "_onnection": "Keep-Alive"}
+header_8 :{ "Transfer-Encoding": "chunked"}
+header_9 :{ "Content-Type": "text/html"}
+header_10 :{ "Connection": "close"}
+should_keep_alive         :0
+upgrade                   :0
+http_major                :1
+http_minor                :1
+
+name  :non-ASCII in status line
+raw   :"HTTP/1.1 500 Oriëntatieprobleem\r\nDate: Fri, 5 Nov 2010 23:07:12 GMT+2\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
+type  :HTTP_RESPONSE
+method: HTTP_DELETE
+status_code :500
+request_path:
+request_url :
+fragment    :
+query_string:
+body        :""
+body_size   :0
+header_0 :{ "Date": "Fri, 5 Nov 2010 23:07:12 GMT+2"}
+header_1 :{ "Content-Length": "0"}
+header_2 :{ "Connection": "close"}
+should_keep_alive         :0
+upgrade                   :0
+http_major                :1
+http_minor                :1
+

data/ext/ruby_http_parser/vendor/http-parser-java/tests.utf8

@@ -0,0 +1,17 @@
+name  :utf-8 path request
+raw   :"GET /δ¶/δt/pope?q=1#narf HTTP/1.1\r\nHost: github.com\r\n\r\n"
+type  :HTTP_REQUEST
+method: HTTP_GET
+status_code :0
+request_path:/δ¶/δt/pope
+request_url :/δ¶/δt/pope?q=1#narf
+fragment    :narf
+query_string:q=1
+body        :""
+body_size   :0
+header_0 :{ "Host": "github.com"}
+should_keep_alive         :1
+upgrade                   :0
+http_major                :1
+http_minor                :1
+

data/ext/ruby_http_parser/vendor/http-parser/LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright 2009,2010 Ryan Dahl <ry@tinyclouds.org>
+Copyright Joyent, Inc. and other Node contributors. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/ext/ruby_http_parser/vendor/http-parser/http_parser.c

@@ -1,4 +1,4 @@
-/* Copyright 2009,2010 Ryan Dahl <ry@tinyclouds.org>
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -186,7 +186,28 @@ static const uint8_t normal_url_char[256] = {
 /* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
         1,       1,       1,       1,       1,       1,       1,       1,
 /* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
-        1,       1,       1,       1,       1,       1,       1,       0 };
+        1,       1,       1,       1,       1,       1,       1,       0,
+
+/* Remainder of non-ASCII range are accepted as-is to support implicitly UTF-8
+   encoded paths. This is out of spec, but clients generate this and most other
+   HTTP servers support it. We should, too. */
+
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1,
+        1,       1,       1,       1,       1,       1,       1,       1 };
 
 
 enum state
@@ -240,15 +261,17 @@ enum state
 
   , s_header_almost_done
 
+  , s_chunk_size_start
+  , s_chunk_size
+  , s_chunk_parameters
+  , s_chunk_size_almost_done
+  
   , s_headers_almost_done
   /* Important: 's_headers_almost_done' must be the last 'header' state. All
    * states beyond this must be 'body' states. It is used for overflow
    * checking. See the PARSING_HEADER() macro.
    */
-  , s_chunk_size_start
-  , s_chunk_size
-  , s_chunk_size_almost_done
-  , s_chunk_parameters
+
   , s_chunk_data
   , s_chunk_data_almost_done
   , s_chunk_data_done
@@ -258,7 +281,7 @@ enum state
   };
 
 
-#define PARSING_HEADER(state) (state <= s_headers_almost_done && 0 == (parser->flags & F_TRAILING))
+#define PARSING_HEADER(state) (state <= s_headers_almost_done)
 
 
 enum header_states
@@ -331,10 +354,20 @@ size_t http_parser_execute (http_parser *parser,
   uint64_t nread = parser->nread;
 
   if (len == 0) {
-    if (state == s_body_identity_eof) {
-      CALLBACK2(message_complete);
+    switch (state) {
+      case s_body_identity_eof:
+        CALLBACK2(message_complete);
+        return 0;
+
+      case s_dead:
+      case s_start_req_or_res:
+      case s_start_res:
+      case s_start_req:
+        return 0;
+
+      default:
+        return 1; // error
     }
-    return 0;
   }
 
   /* technically we could combine all of these (except for url_mark) into one
@@ -707,6 +740,9 @@ size_t http_parser_execute (http_parser *parser,
             CALLBACK(url);
             state = s_req_http_start;
             break;
+          case '?':
+            state = s_req_query_string_start;
+            break;
           default:
             goto error;
         }
@@ -729,6 +765,9 @@ size_t http_parser_execute (http_parser *parser,
             CALLBACK(url);
             state = s_req_http_start;
             break;
+          case '?':
+            state = s_req_query_string_start;
+            break;
           default:
             goto error;
         }
@@ -1448,6 +1487,7 @@ size_t http_parser_execute (http_parser *parser,
 
       case s_chunk_size_start:
       {
+        assert(nread == 1);
         assert(parser->flags & F_CHUNKED);
 
         c = unhex[(unsigned char)ch];
@@ -1497,6 +1537,8 @@ size_t http_parser_execute (http_parser *parser,
         assert(parser->flags & F_CHUNKED);
         STRICT_CHECK(ch != LF);
 
+        nread = 0;
+
         if (parser->content_length == 0) {
           parser->flags |= F_TRAILING;
           state = s_header_field_start;

data/ext/ruby_http_parser/vendor/http-parser/http_parser.h

@@ -1,4 +1,4 @@
-/* Copyright 2009,2010 Ryan Dahl <ry@tinyclouds.org>
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -24,6 +24,8 @@
 extern "C" {
 #endif
 
+#define HTTP_PARSER_VERSION_MAJOR 1
+#define HTTP_PARSER_VERSION_MINOR 0
 
 #include <sys/types.h>
 #if defined(_WIN32) && !defined(__MINGW32__)

data/ext/ruby_http_parser/vendor/http-parser/test.c

@@ -1,4 +1,4 @@
-/* Copyright 2009,2010 Ryan Dahl <ry@tinyclouds.org>
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -557,7 +557,7 @@ const struct message requests[] =
   ,.body= ""
   }
 
-#define MSEARCH_REQ 19
+#define MSEARCH_REQ 20
 , {.name= "m-search request"
   ,.type= HTTP_REQUEST
   ,.raw= "M-SEARCH * HTTP/1.1\r\n"
@@ -582,6 +582,84 @@ const struct message requests[] =
   ,.body= ""
   }
 
+#define UTF8_PATH_REQ 21
+, {.name= "utf-8 path request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /δ¶/δt/pope?q=1#narf HTTP/1.1\r\n"
+         "Host: github.com\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= "q=1"
+  ,.fragment= "narf"
+  ,.request_path= "/δ¶/δt/pope"
+  ,.request_url= "/δ¶/δt/pope?q=1#narf"
+  ,.num_headers= 1
+  ,.headers= { {"Host", "github.com" }
+             }
+  ,.body= ""
+  }
+
+#define QUERY_TERMINATED_HOST 22
+, {.name= "host terminated by a query string"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET http://hypnotoad.org?hail=all HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= "hail=all"
+  ,.fragment= ""
+  ,.request_path= ""
+  ,.request_url= "http://hypnotoad.org?hail=all"
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
+#define QUERY_TERMINATED_HOSTPORT 23
+, {.name= "host:port terminated by a query string"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET http://hypnotoad.org:1234?hail=all HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= "hail=all"
+  ,.fragment= ""
+  ,.request_path= ""
+  ,.request_url= "http://hypnotoad.org:1234?hail=all"
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
+#define SPACE_TERMINATED_HOSTPORT 24
+, {.name= "host:port terminated by a space"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET http://hypnotoad.org:1234 HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= ""
+  ,.request_url= "http://hypnotoad.org:1234"
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
 , {.name= NULL } /* sentinel */
 };
 
@@ -1735,14 +1813,22 @@ main (void)
 
   /// REQUESTS
 
-
   test_simple("hello world", 0);
   test_simple("GET / HTP/1.1\r\n\r\n", 0);
 
+
   test_simple("ASDF / HTTP/1.1\r\n\r\n", 0);
   test_simple("PROPPATCHA / HTTP/1.1\r\n\r\n", 0);
   test_simple("GETA / HTTP/1.1\r\n\r\n", 0);
 
+  // Well-formed but incomplete
+  test_simple("GET / HTTP/1.1\r\n"
+              "Content-Type: text/plain\r\n"
+              "Content-Length: 6\r\n"
+              "\r\n"
+              "fooba",
+              0);
+
   static const char *all_methods[] = {
     "DELETE",
     "GET",