http_parser.rb 0.6.0.beta.1 → 0.6.0.beta.2

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

@@ -24,11 +24,13 @@
 extern "C" {
 #endif
 
-#define HTTP_PARSER_VERSION_MAJOR 1
+#define HTTP_PARSER_VERSION_MAJOR 2
 #define HTTP_PARSER_VERSION_MINOR 0
 
 #include <sys/types.h>
 #if defined(_WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<1600)
+#include <BaseTsd.h>
+#include <stddef.h>
 typedef __int8 int8_t;
 typedef unsigned __int8 uint8_t;
 typedef __int16 int16_t;
@@ -37,9 +39,6 @@ typedef __int32 int32_t;
 typedef unsigned __int32 uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
-
-typedef unsigned int size_t;
-typedef int ssize_t;
 #else
 #include <stdint.h>
 #endif
@@ -51,14 +50,6 @@ typedef int ssize_t;
 # define HTTP_PARSER_STRICT 1
 #endif
 
-/* Compile with -DHTTP_PARSER_DEBUG=1 to add extra debugging information to
- * the error reporting facility.
- */
-#ifndef HTTP_PARSER_DEBUG
-# define HTTP_PARSER_DEBUG 0
-#endif
-
-
 /* Maximium header size allowed */
 #define HTTP_MAX_HEADER_SIZE (80*1024)
 
@@ -77,7 +68,7 @@ typedef struct http_parser_settings http_parser_settings;
  * chunked' headers that indicate the presence of a body.
  *
  * http_data_cb does not return data chunks. It will be call arbitrarally
- * many times for each string. E.G. you might get 10 callbacks for "on_path"
+ * many times for each string. E.G. you might get 10 callbacks for "on_url"
  * each providing just a few characters more data.
  */
 typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
@@ -85,43 +76,44 @@ typedef int (*http_cb) (http_parser*);
 
 
 /* Request Methods */
-#define HTTP_METHOD_MAP(XX) \
-  XX(0, DELETE) \
-  XX(1, GET) \
-  XX(2, HEAD) \
-  XX(3, POST) \
-  XX(4, PUT) \
-  /* pathological */ \
-  XX(5, CONNECT) \
-  XX(6, OPTIONS) \
-  XX(7, TRACE) \
-  /* webdav */ \
-  XX(8, COPY) \
-  XX(9, LOCK) \
-  XX(10, MKCOL) \
-  XX(11, MOVE) \
-  XX(12, PROPFIND) \
-  XX(13, PROPPATCH) \
-  XX(14, UNLOCK) \
-  /* subversion */ \
-  XX(15, REPORT) \
-  XX(16, MKACTIVITY) \
-  XX(17, CHECKOUT) \
-  XX(18, MERGE) \
-  /* upnp */ \
-  XX(19, MSEARCH) \
-  XX(20, NOTIFY) \
-  XX(21, SUBSCRIBE) \
-  XX(22, UNSUBSCRIBE) \
-  /* RFC-5789 */ \
-  XX(23, PATCH) \
-  XX(24, PURGE) \
+#define HTTP_METHOD_MAP(XX)         \
+  XX(0,  DELETE,      DELETE)       \
+  XX(1,  GET,         GET)          \
+  XX(2,  HEAD,        HEAD)         \
+  XX(3,  POST,        POST)         \
+  XX(4,  PUT,         PUT)          \
+  /* pathological */                \
+  XX(5,  CONNECT,     CONNECT)      \
+  XX(6,  OPTIONS,     OPTIONS)      \
+  XX(7,  TRACE,       TRACE)        \
+  /* webdav */                      \
+  XX(8,  COPY,        COPY)         \
+  XX(9,  LOCK,        LOCK)         \
+  XX(10, MKCOL,       MKCOL)        \
+  XX(11, MOVE,        MOVE)         \
+  XX(12, PROPFIND,    PROPFIND)     \
+  XX(13, PROPPATCH,   PROPPATCH)    \
+  XX(14, SEARCH,      SEARCH)       \
+  XX(15, UNLOCK,      UNLOCK)       \
+  /* subversion */                  \
+  XX(16, REPORT,      REPORT)       \
+  XX(17, MKACTIVITY,  MKACTIVITY)   \
+  XX(18, CHECKOUT,    CHECKOUT)     \
+  XX(19, MERGE,       MERGE)        \
+  /* upnp */                        \
+  XX(20, MSEARCH,     M-SEARCH)     \
+  XX(21, NOTIFY,      NOTIFY)       \
+  XX(22, SUBSCRIBE,   SUBSCRIBE)    \
+  XX(23, UNSUBSCRIBE, UNSUBSCRIBE)  \
+  /* RFC-5789 */                    \
+  XX(24, PATCH,       PATCH)        \
+  XX(25, PURGE,       PURGE)        \
 
 enum http_method
   {
-#define XX(num, name) HTTP_##name = num,
+#define XX(num, name, string) HTTP_##name = num,
   HTTP_METHOD_MAP(XX)
-#undef X
+#undef XX
   };
 
 
@@ -140,7 +132,7 @@ enum flags
 
 
 /* Map for errno-related constants
- * 
+ *
  * The provided argument should be a macro that takes 2 arguments.
  */
 #define HTTP_ERRNO_MAP(XX)                                           \
@@ -149,6 +141,7 @@ enum flags
                                                                      \
   /* Callback-related errors */                                      \
   XX(CB_message_begin, "the on_message_begin callback failed")       \
+  XX(CB_status_complete, "the on_status_complete callback failed")   \
   XX(CB_url, "the on_url callback failed")                           \
   XX(CB_header_field, "the on_header_field callback failed")         \
   XX(CB_header_value, "the on_header_value callback failed")         \
@@ -195,13 +188,6 @@ enum http_errno {
 /* Get an http_errno value from an http_parser */
 #define HTTP_PARSER_ERRNO(p)            ((enum http_errno) (p)->http_errno)
 
-/* Get the line number that generated the current error */
-#if HTTP_PARSER_DEBUG
-#define HTTP_PARSER_ERRNO_LINE(p)       ((p)->error_lineno)
-#else
-#define HTTP_PARSER_ERRNO_LINE(p)       0
-#endif
-
 
 struct http_parser {
   /** PRIVATE **/
@@ -228,10 +214,6 @@ struct http_parser {
    */
   unsigned char upgrade : 1;
 
-#if HTTP_PARSER_DEBUG
-  uint32_t error_lineno;
-#endif
-
   /** PUBLIC **/
   void *data; /* A pointer to get hook to the "connection" or "socket" object */
 };
@@ -240,6 +222,7 @@ struct http_parser {
 struct http_parser_settings {
   http_cb      on_message_begin;
   http_data_cb on_url;
+  http_cb      on_status_complete;
   http_data_cb on_header_field;
   http_data_cb on_header_value;
   http_cb      on_headers_complete;
@@ -255,7 +238,8 @@ enum http_parser_url_fields
   , UF_PATH             = 3
   , UF_QUERY            = 4
   , UF_FRAGMENT         = 5
-  , UF_MAX              = 6
+  , UF_USERINFO         = 6
+  , UF_MAX              = 7
   };
 
 
@@ -287,12 +271,12 @@ size_t http_parser_execute(http_parser *parser,
 
 
 /* If http_should_keep_alive() in the on_headers_complete or
- * on_message_complete callback returns true, then this will be should be
+ * on_message_complete callback returns 0, then this should be
  * the last message on the connection.
  * If you are the server, respond with the "Connection: close" header.
  * If you are the client, close the connection.
  */
-int http_should_keep_alive(http_parser *parser);
+int http_should_keep_alive(const http_parser *parser);
 
 /* Returns a string version of the HTTP method. */
 const char *http_method_str(enum http_method m);
@@ -311,6 +295,9 @@ int http_parser_parse_url(const char *buf, size_t buflen,
 /* Pause or un-pause the parser; a nonzero value pauses */
 void http_parser_pause(http_parser *parser, int paused);
 
+/* Checks if this is the final chunk of the body. */
+int http_body_is_final(const http_parser *parser);
+
 #ifdef __cplusplus
 }
 #endif

data/ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/HTTPMethod.java

@@ -8,6 +8,7 @@ public enum HTTPMethod {
   , HTTP_HEAD("HEAD")
   , HTTP_POST("POST")
   , HTTP_PUT("PUT")
+  , HTTP_PATCH("PATCH")
   /* pathological */
   , HTTP_CONNECT("CONNECT")
   , HTTP_OPTIONS("OPTIONS")
@@ -28,7 +29,6 @@ public enum HTTPMethod {
   , HTTP_NOTIFY("NOTIFY")
   , HTTP_SUBSCRIBE("SUBSCRIBE")
   , HTTP_UNSUBSCRIBE("UNSUBSCRIBE")
-  , HTTP_PATCH("PATCH")
   , HTTP_PURGE("PURGE")
   ;
 
@@ -39,7 +39,7 @@ public enum HTTPMethod {
   public byte[] bytes;
 
   HTTPMethod(String name) {
-    // good grief, Charlie Brown, the following is necessary because 
+    // good grief, Charlie Brown, the following is necessary because
     // java is retarded:
     // illegal reference to static field from initializer
     //            this.bytes = name.getBytes(ASCII);
@@ -58,6 +58,8 @@ public enum HTTPMethod {
     else if ("POST".equalsIgnoreCase(s))         {return HTTP_POST;}
     else if ("HTTP_PUT".equalsIgnoreCase(s))     {return HTTP_PUT;}
     else if ("PUT".equalsIgnoreCase(s))          {return HTTP_PUT;}
+    else if ("HTTP_PATCH".equalsIgnoreCase(s))   {return HTTP_PATCH;}
+    else if ("PATCH".equalsIgnoreCase(s))        {return HTTP_PATCH;}
     else if ("HTTP_CONNECT".equalsIgnoreCase(s)) {return HTTP_CONNECT;}
     else if ("CONNECT".equalsIgnoreCase(s))      {return HTTP_CONNECT;}
     else if ("HTTP_OPTIONS".equalsIgnoreCase(s)) {return HTTP_OPTIONS;}
@@ -97,7 +99,7 @@ public enum HTTPMethod {
     else if ("PATCH".equalsIgnoreCase(s))            {return HTTP_PATCH;}
     else if ("PURGE".equalsIgnoreCase(s))            {return HTTP_PURGE;}
 	  else                                             {return null;}
-	}	
+	}
   void init (String name) {
     ASCII = null == ASCII ? Charset.forName("US-ASCII") : ASCII;
     this.bytes = name.getBytes(ASCII);

data/ext/ruby_http_parser/vendor/http-parser-java/src/impl/http_parser/ParserSettings.java

@@ -5,45 +5,47 @@ package http_parser;
 import primitive.collection.ByteList;
 
 public class ParserSettings extends http_parser.lolevel.ParserSettings {
-  
+
   public HTTPCallback       on_message_begin;
   public HTTPDataCallback   on_path;
   public HTTPDataCallback   on_query_string;
   public HTTPDataCallback   on_url;
   public HTTPDataCallback   on_fragment;
+  public HTTPCallback       on_status_complete;
   public HTTPDataCallback   on_header_field;
   public HTTPDataCallback   on_header_value;
- 
+
   public HTTPCallback       on_headers_complete;
   public HTTPDataCallback   on_body;
   public HTTPCallback       on_message_complete;
-  
+
   public HTTPErrorCallback  on_error;
-  
+
   private HTTPCallback      _on_message_begin;
   private HTTPDataCallback  _on_path;
   private HTTPDataCallback  _on_query_string;
   private HTTPDataCallback  _on_url;
   private HTTPDataCallback  _on_fragment;
+  private HTTPCallback      _on_status_complete;
   private HTTPDataCallback  _on_header_field;
   private HTTPDataCallback  _on_header_value;
-  private HTTPHeadersCompleteCallback      _on_headers_complete;
+  private HTTPCallback      _on_headers_complete;
   private HTTPDataCallback  _on_body;
   private HTTPCallback      _on_message_complete;
   private HTTPErrorCallback _on_error;
-  
+
   private http_parser.lolevel.ParserSettings settings;
-  
+
   protected ByteList field = new ByteList();
   protected ByteList value = new ByteList();
   protected ByteList body  = new ByteList();
-  
+
   public ParserSettings() {
     this.settings = new http_parser.lolevel.ParserSettings();
     createMirrorCallbacks();
     attachCallbacks();
   }
-  
+
   protected http_parser.lolevel.ParserSettings getLoLevelSettings() {
     return this.settings;
   }
@@ -93,7 +95,16 @@ public class ParserSettings extends http_parser.lolevel.ParserSettings {
         return 0;
       }
     };
-    this._on_error = new HTTPErrorCallback() {    
+    this._on_status_complete = new HTTPCallback() {
+      @Override
+      public int cb(HTTPParser p) {
+        if (null != ParserSettings.this.on_status_complete) {
+          return ParserSettings.this.on_status_complete.cb(p);
+        }
+        return 0;
+      }
+    };
+    this._on_error = new HTTPErrorCallback() {
       @Override
       public void cb(HTTPParser parser, String error) {
         if (null != ParserSettings.this.on_error) {
@@ -101,11 +112,11 @@ public class ParserSettings extends http_parser.lolevel.ParserSettings {
         } else {
           throw new HTTPException(error);
         }
-        
+
       }
     };
-      
-      
+
+
 
 //    (on_header_field and on_header_value shortened to on_h_*)
 //    ------------------------ ------------ --------------------------------------------
@@ -142,19 +153,19 @@ public class ParserSettings extends http_parser.lolevel.ParserSettings {
             ParserSettings.this.value.clear();
           }
         }
-        
+
         if (null == ParserSettings.this.on_header_field) {
           return 0;
         }
-        
+
         ParserSettings.this.field.addAll(by);
         return 0;
       }
     };
-    this._on_header_value = new HTTPDataCallback() {    
+    this._on_header_value = new HTTPDataCallback() {
       @Override
       public int cb(HTTPParser p, byte[] by, int pos, int len) {
-        
+
         // previous field complete, call on_field with full field value, reset field.
         if (0 != ParserSettings.this.field.size()) {
           // check we're even interested...
@@ -167,7 +178,7 @@ public class ParserSettings extends http_parser.lolevel.ParserSettings {
             ParserSettings.this.field.clear();
           }
         }
-        
+
         if (null == ParserSettings.this.on_header_value) {
           return 0;
         }
@@ -175,7 +186,7 @@ public class ParserSettings extends http_parser.lolevel.ParserSettings {
         return 0;
       }
     };
-    this._on_headers_complete = new HTTPHeadersCompleteCallback() {
+    this._on_headers_complete = new HTTPCallback() {
       @Override
       public int cb(HTTPParser parser) {
         // is there an uncompleted value ... ?
@@ -195,9 +206,9 @@ public class ParserSettings extends http_parser.lolevel.ParserSettings {
         }
         return 0;
       }
-      
+
     };
-    this._on_body = new HTTPDataCallback() {    
+    this._on_body = new HTTPDataCallback() {
       @Override
       public int cb(HTTPParser p, byte[] by, int pos, int len) {
         if (null != ParserSettings.this.on_body) {
@@ -206,8 +217,8 @@ public class ParserSettings extends http_parser.lolevel.ParserSettings {
         return 0;
       }
     };
-    
-    this._on_message_complete = new HTTPCallback() {     
+
+    this._on_message_complete = new HTTPCallback() {
       @Override
       public int cb(HTTPParser parser) {
         if (null != ParserSettings.this.on_body) {
@@ -224,7 +235,7 @@ public class ParserSettings extends http_parser.lolevel.ParserSettings {
         return 0;
       }
     };
-    
+
   }
 
   private void attachCallbacks() {
@@ -234,90 +245,12 @@ public class ParserSettings extends http_parser.lolevel.ParserSettings {
     this.settings.on_query_string     = this._on_query_string;
     this.settings.on_url              = this._on_url;
     this.settings.on_fragment         = this._on_fragment;
+    this.settings.on_status_complete  = this._on_status_complete;
     this.settings.on_header_field     = this._on_header_field;
-    this.settings.on_header_value     = this._on_header_value; 
+    this.settings.on_header_value     = this._on_header_value;
     this.settings.on_headers_complete = this._on_headers_complete;
     this.settings.on_body             = this._on_body;
     this.settings.on_message_complete = this._on_message_complete;
     this.settings.on_error            = this._on_error;
   }
 }
-//import http_parser.HTTPException;
-//public class ParserSettings extends http_parser.lolevel.ParserSettings{
-//	
-//  
-//  
-//  
-//  public HTTPCallback       on_message_begin;
-//  public HTTPDataCallback 	on_path;
-//  public HTTPDataCallback 	on_query_string;
-//  public HTTPDataCallback 	on_url;
-//  public HTTPDataCallback 	on_fragment;
-//  public HTTPDataCallback 	on_header_field;
-//  public HTTPDataCallback 	on_header_value;
-//  public HTTPCallback       on_headers_complete;
-//  public HTTPDataCallback 	on_body;
-//  public HTTPCallback       on_message_complete;
-//  public HTTPErrorCallback  on_error;
-//
-//	void call_on_message_begin (HTTPParser p) {
-//		call_on(on_message_begin, p);
-//	}
-//
-//	void call_on_message_complete (HTTPParser p) {
-//		call_on(on_message_complete, p);
-//	}
-//  
-//  // this one is a little bit different:
-//  // the current `position` of the buffer is the location of the
-//  // error, `ini_pos` indicates where the position of
-//  // the buffer when it was passed to the `execute` method of the parser, i.e.
-//  // using this information and `limit` we'll know all the valid data
-//  // in the buffer around the error we can use to print pretty error
-//  // messages.
-//  void call_on_error (HTTPParser p, String mes, ByteBuffer buf, int ini_pos) {
-//    if (null != on_error) {
-//      on_error.cb(p, mes, buf, ini_pos);
-//    }
-//    // if on_error gets called it MUST throw an exception, else the parser 
-//    // will attempt to continue parsing, which it can't because it's
-//    // in an invalid state.
-//    throw new HTTPException(mes);
-//	}
-//
-//	void call_on_header_field (HTTPParser p, ByteBuffer buf, int pos, int len) {
-//		call_on(on_header_field, p, buf, pos, len);
-//	}
-//	void call_on_query_string (HTTPParser p, ByteBuffer buf, int pos, int len) {
-//		call_on(on_query_string, p, buf, pos, len);
-//	}
-//	void call_on_fragment (HTTPParser p, ByteBuffer buf, int pos, int len) {
-//		call_on(on_fragment, p, buf, pos, len);
-//	}
-//	void call_on_path (HTTPParser p, ByteBuffer buf, int pos, int len) {
-//		call_on(on_path, p, buf, pos, len);
-//	}
-//	void call_on_header_value (HTTPParser p, ByteBuffer buf, int pos, int len) {
-//		call_on(on_header_value, p, buf, pos, len);
-//	}
-//	void call_on_url (HTTPParser p, ByteBuffer buf, int pos, int len) {
-//		call_on(on_url, p, buf, pos, len);
-//	}
-//	void call_on_body(HTTPParser p, ByteBuffer buf, int pos, int len) {
-//		call_on(on_body, p, buf, pos, len);
-//	}
-//	void call_on_headers_complete(HTTPParser p) {
-//		call_on(on_headers_complete, p);
-//	} 
-//	void call_on (HTTPCallback cb, HTTPParser p) {
-//		// cf. CALLBACK2 macro
-//		if (null != cb) {
-//			cb.cb(p);
-//		}
-//	}
-//	void call_on (HTTPDataCallback cb, HTTPParser p, ByteBuffer buf, int pos, int len) {
-//		if (null != cb && -1 != pos) {
-//			cb.cb(p,buf,pos,len);
-//		}
-//	}
-//}