llhttp 0.0.3 → 0.4.0

data/ext/llhttp/llhttp.h

@@ -24,9 +24,13 @@
 #ifndef INCLUDE_LLHTTP_H_
 #define INCLUDE_LLHTTP_H_
 
-#define LLHTTP_VERSION_MAJOR 1
-#define LLHTTP_VERSION_MINOR 1
-#define LLHTTP_VERSION_PATCH 1
+#define LLHTTP_VERSION_MAJOR 6
+#define LLHTTP_VERSION_MINOR 0
+#define LLHTTP_VERSION_PATCH 5
+
+#ifndef LLHTTP_STRICT_MODE
+# define LLHTTP_STRICT_MODE 0
+#endif
 
 #ifndef INCLUDE_LLHTTP_ITSELF_H_
 #define INCLUDE_LLHTTP_ITSELF_H_
@@ -52,10 +56,11 @@ struct llhttp__internal_s {
   uint8_t http_major;
   uint8_t http_minor;
   uint8_t header_state;
-  uint8_t flags;
+  uint8_t lenient_flags;
   uint8_t upgrade;
-  uint16_t status_code;
   uint8_t finish;
+  uint16_t flags;
+  uint16_t status_code;
   void* settings;
 };
 
@@ -89,14 +94,16 @@ enum llhttp_errno {
   HPE_INVALID_CHUNK_SIZE = 12,
   HPE_INVALID_STATUS = 13,
   HPE_INVALID_EOF_STATE = 14,
-  HPE_CB_MESSAGE_BEGIN = 15,
-  HPE_CB_HEADERS_COMPLETE = 16,
-  HPE_CB_MESSAGE_COMPLETE = 17,
-  HPE_CB_CHUNK_HEADER = 18,
-  HPE_CB_CHUNK_COMPLETE = 19,
-  HPE_PAUSED = 20,
-  HPE_PAUSED_UPGRADE = 21,
-  HPE_USER = 22
+  HPE_INVALID_TRANSFER_ENCODING = 15,
+  HPE_CB_MESSAGE_BEGIN = 16,
+  HPE_CB_HEADERS_COMPLETE = 17,
+  HPE_CB_MESSAGE_COMPLETE = 18,
+  HPE_CB_CHUNK_HEADER = 19,
+  HPE_CB_CHUNK_COMPLETE = 20,
+  HPE_PAUSED = 21,
+  HPE_PAUSED_UPGRADE = 22,
+  HPE_PAUSED_H2_UPGRADE = 23,
+  HPE_USER = 24
 };
 typedef enum llhttp_errno llhttp_errno_t;
 
@@ -108,10 +115,18 @@ enum llhttp_flags {
   F_UPGRADE = 0x10,
   F_CONTENT_LENGTH = 0x20,
   F_SKIPBODY = 0x40,
-  F_TRAILING = 0x80
+  F_TRAILING = 0x80,
+  F_TRANSFER_ENCODING = 0x200
 };
 typedef enum llhttp_flags llhttp_flags_t;
 
+enum llhttp_lenient_flags {
+  LENIENT_HEADERS = 0x1,
+  LENIENT_CHUNKED_LENGTH = 0x2,
+  LENIENT_KEEP_ALIVE = 0x4
+};
+typedef enum llhttp_lenient_flags llhttp_lenient_flags_t;
+
 enum llhttp_type {
   HTTP_BOTH = 0,
   HTTP_REQUEST = 1,
@@ -160,7 +175,19 @@ enum llhttp_method {
   HTTP_MKCALENDAR = 30,
   HTTP_LINK = 31,
   HTTP_UNLINK = 32,
-  HTTP_SOURCE = 33
+  HTTP_SOURCE = 33,
+  HTTP_PRI = 34,
+  HTTP_DESCRIBE = 35,
+  HTTP_ANNOUNCE = 36,
+  HTTP_SETUP = 37,
+  HTTP_PLAY = 38,
+  HTTP_PAUSE = 39,
+  HTTP_TEARDOWN = 40,
+  HTTP_GET_PARAMETER = 41,
+  HTTP_SET_PARAMETER = 42,
+  HTTP_REDIRECT = 43,
+  HTTP_RECORD = 44,
+  HTTP_FLUSH = 45
 };
 typedef enum llhttp_method llhttp_method_t;
 
@@ -180,14 +207,16 @@ typedef enum llhttp_method llhttp_method_t;
   XX(12, INVALID_CHUNK_SIZE, INVALID_CHUNK_SIZE) \
   XX(13, INVALID_STATUS, INVALID_STATUS) \
   XX(14, INVALID_EOF_STATE, INVALID_EOF_STATE) \
-  XX(15, CB_MESSAGE_BEGIN, CB_MESSAGE_BEGIN) \
-  XX(16, CB_HEADERS_COMPLETE, CB_HEADERS_COMPLETE) \
-  XX(17, CB_MESSAGE_COMPLETE, CB_MESSAGE_COMPLETE) \
-  XX(18, CB_CHUNK_HEADER, CB_CHUNK_HEADER) \
-  XX(19, CB_CHUNK_COMPLETE, CB_CHUNK_COMPLETE) \
-  XX(20, PAUSED, PAUSED) \
-  XX(21, PAUSED_UPGRADE, PAUSED_UPGRADE) \
-  XX(22, USER, USER) \
+  XX(15, INVALID_TRANSFER_ENCODING, INVALID_TRANSFER_ENCODING) \
+  XX(16, CB_MESSAGE_BEGIN, CB_MESSAGE_BEGIN) \
+  XX(17, CB_HEADERS_COMPLETE, CB_HEADERS_COMPLETE) \
+  XX(18, CB_MESSAGE_COMPLETE, CB_MESSAGE_COMPLETE) \
+  XX(19, CB_CHUNK_HEADER, CB_CHUNK_HEADER) \
+  XX(20, CB_CHUNK_COMPLETE, CB_CHUNK_COMPLETE) \
+  XX(21, PAUSED, PAUSED) \
+  XX(22, PAUSED_UPGRADE, PAUSED_UPGRADE) \
+  XX(23, PAUSED_H2_UPGRADE, PAUSED_H2_UPGRADE) \
+  XX(24, USER, USER) \
 
 
 #define HTTP_METHOD_MAP(XX) \
@@ -227,6 +256,71 @@ typedef enum llhttp_method llhttp_method_t;
   XX(33, SOURCE, SOURCE) \
 
 
+#define RTSP_METHOD_MAP(XX) \
+  XX(1, GET, GET) \
+  XX(3, POST, POST) \
+  XX(6, OPTIONS, OPTIONS) \
+  XX(35, DESCRIBE, DESCRIBE) \
+  XX(36, ANNOUNCE, ANNOUNCE) \
+  XX(37, SETUP, SETUP) \
+  XX(38, PLAY, PLAY) \
+  XX(39, PAUSE, PAUSE) \
+  XX(40, TEARDOWN, TEARDOWN) \
+  XX(41, GET_PARAMETER, GET_PARAMETER) \
+  XX(42, SET_PARAMETER, SET_PARAMETER) \
+  XX(43, REDIRECT, REDIRECT) \
+  XX(44, RECORD, RECORD) \
+  XX(45, FLUSH, FLUSH) \
+
+
+#define HTTP_ALL_METHOD_MAP(XX) \
+  XX(0, DELETE, DELETE) \
+  XX(1, GET, GET) \
+  XX(2, HEAD, HEAD) \
+  XX(3, POST, POST) \
+  XX(4, PUT, PUT) \
+  XX(5, CONNECT, CONNECT) \
+  XX(6, OPTIONS, OPTIONS) \
+  XX(7, TRACE, TRACE) \
+  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) \
+  XX(16, BIND, BIND) \
+  XX(17, REBIND, REBIND) \
+  XX(18, UNBIND, UNBIND) \
+  XX(19, ACL, ACL) \
+  XX(20, REPORT, REPORT) \
+  XX(21, MKACTIVITY, MKACTIVITY) \
+  XX(22, CHECKOUT, CHECKOUT) \
+  XX(23, MERGE, MERGE) \
+  XX(24, MSEARCH, M-SEARCH) \
+  XX(25, NOTIFY, NOTIFY) \
+  XX(26, SUBSCRIBE, SUBSCRIBE) \
+  XX(27, UNSUBSCRIBE, UNSUBSCRIBE) \
+  XX(28, PATCH, PATCH) \
+  XX(29, PURGE, PURGE) \
+  XX(30, MKCALENDAR, MKCALENDAR) \
+  XX(31, LINK, LINK) \
+  XX(32, UNLINK, UNLINK) \
+  XX(33, SOURCE, SOURCE) \
+  XX(34, PRI, PRI) \
+  XX(35, DESCRIBE, DESCRIBE) \
+  XX(36, ANNOUNCE, ANNOUNCE) \
+  XX(37, SETUP, SETUP) \
+  XX(38, PLAY, PLAY) \
+  XX(39, PAUSE, PAUSE) \
+  XX(40, TEARDOWN, TEARDOWN) \
+  XX(41, GET_PARAMETER, GET_PARAMETER) \
+  XX(42, SET_PARAMETER, SET_PARAMETER) \
+  XX(43, REDIRECT, REDIRECT) \
+  XX(44, RECORD, RECORD) \
+  XX(45, FLUSH, FLUSH) \
+
 
 #ifdef __cplusplus
 }  /* extern "C" */
@@ -240,6 +334,12 @@ extern "C" {
 #endif
 #include <stddef.h>
 
+#if defined(__wasm__)
+#define LLHTTP_EXPORT __attribute__((visibility("default")))
+#else
+#define LLHTTP_EXPORT
+#endif
+
 typedef llhttp__internal_t llhttp_t;
 typedef struct llhttp_settings_s llhttp_settings_t;
 
@@ -250,6 +350,7 @@ struct llhttp_settings_s {
   /* Possible return values 0, -1, `HPE_PAUSED` */
   llhttp_cb      on_message_begin;
 
+  /* Possible return values 0, -1, HPE_USER */
   llhttp_data_cb on_url;
   llhttp_data_cb on_status;
   llhttp_data_cb on_header_field;
@@ -266,6 +367,7 @@ struct llhttp_settings_s {
    */
   llhttp_cb      on_headers_complete;
 
+  /* Possible return values 0, -1, HPE_USER */
   llhttp_data_cb on_body;
 
   /* Possible return values 0, -1, `HPE_PAUSED` */
@@ -277,13 +379,60 @@ struct llhttp_settings_s {
    */
   llhttp_cb      on_chunk_header;
   llhttp_cb      on_chunk_complete;
+
+  /* Information-only callbacks, return value is ignored */
+  llhttp_cb      on_url_complete;
+  llhttp_cb      on_status_complete;
+  llhttp_cb      on_header_field_complete;
+  llhttp_cb      on_header_value_complete;
 };
 
-/* Initialize the parser with specific type and user settings */
+/* Initialize the parser with specific type and user settings.
+ *
+ * NOTE: lifetime of `settings` has to be at least the same as the lifetime of
+ * the `parser` here. In practice, `settings` has to be either a static
+ * variable or be allocated with `malloc`, `new`, etc.
+ */
+LLHTTP_EXPORT
 void llhttp_init(llhttp_t* parser, llhttp_type_t type,
                  const llhttp_settings_t* settings);
 
+#if defined(__wasm__)
+
+LLHTTP_EXPORT
+llhttp_t* llhttp_alloc(llhttp_type_t type);
+
+LLHTTP_EXPORT
+void llhttp_free(llhttp_t* parser);
+
+LLHTTP_EXPORT
+uint8_t llhttp_get_type(llhttp_t* parser);
+
+LLHTTP_EXPORT
+uint8_t llhttp_get_http_major(llhttp_t* parser);
+
+LLHTTP_EXPORT
+uint8_t llhttp_get_http_minor(llhttp_t* parser);
+
+LLHTTP_EXPORT
+uint8_t llhttp_get_method(llhttp_t* parser);
+
+LLHTTP_EXPORT
+int llhttp_get_status_code(llhttp_t* parser);
+
+LLHTTP_EXPORT
+uint8_t llhttp_get_upgrade(llhttp_t* parser);
+
+#endif  // defined(__wasm__)
+
+/* Reset an already initialized parser back to the start state, preserving the
+ * existing parser type, callback settings, user data, and lenient flags.
+ */
+LLHTTP_EXPORT
+void llhttp_reset(llhttp_t* parser);
+
 /* Initialize the settings object */
+LLHTTP_EXPORT
 void llhttp_settings_init(llhttp_settings_t* settings);
 
 /* Parse full or partial request/response, invoking user callbacks along the
@@ -300,8 +449,9 @@ void llhttp_settings_init(llhttp_settings_t* settings);
  *
  * NOTE: if this function ever returns a non-pause type error, it will continue
  * to return the same error upon each successive call up until `llhttp_init()`
- * call.
+ * is called.
  */
+LLHTTP_EXPORT
 llhttp_errno_t llhttp_execute(llhttp_t* parser, const char* data, size_t len);
 
 /* This method should be called when the other side has no further bytes to
@@ -312,16 +462,19 @@ llhttp_errno_t llhttp_execute(llhttp_t* parser, const char* data, size_t len);
  * connection. This method will invoke `on_message_complete()` callback if the
  * request was terminated safely. Otherwise a error code would be returned.
  */
+LLHTTP_EXPORT
 llhttp_errno_t llhttp_finish(llhttp_t* parser);
 
 /* Returns `1` if the incoming message is parsed until the last byte, and has
  * to be completed by calling `llhttp_finish()` on EOF
  */
+LLHTTP_EXPORT
 int llhttp_message_needs_eof(const llhttp_t* parser);
 
 /* Returns `1` if there might be any other messages following the last that was
- * successfuly parsed.
+ * successfully parsed.
  */
+LLHTTP_EXPORT
 int llhttp_should_keep_alive(const llhttp_t* parser);
 
 /* Make further calls of `llhttp_execute()` return `HPE_PAUSED` and set
@@ -330,6 +483,7 @@ int llhttp_should_keep_alive(const llhttp_t* parser);
  * Important: do not call this from user callbacks! User callbacks must return
  * `HPE_PAUSED` if pausing is required.
  */
+LLHTTP_EXPORT
 void llhttp_pause(llhttp_t* parser);
 
 /* Might be called to resume the execution after the pause in user's callback.
@@ -337,6 +491,7 @@ void llhttp_pause(llhttp_t* parser);
  *
  * Call this only if `llhttp_execute()` returns `HPE_PAUSED`.
  */
+LLHTTP_EXPORT
 void llhttp_resume(llhttp_t* parser);
 
 /* Might be called to resume the execution after the pause in user's callback.
@@ -344,9 +499,11 @@ void llhttp_resume(llhttp_t* parser);
  *
  * Call this only if `llhttp_execute()` returns `HPE_PAUSED_UPGRADE`
  */
+LLHTTP_EXPORT
 void llhttp_resume_after_upgrade(llhttp_t* parser);
 
 /* Returns the latest return error */
+LLHTTP_EXPORT
 llhttp_errno_t llhttp_get_errno(const llhttp_t* parser);
 
 /* Returns the verbal explanation of the latest returned error.
@@ -354,6 +511,7 @@ llhttp_errno_t llhttp_get_errno(const llhttp_t* parser);
  * Note: User callback should set error reason when returning the error. See
  * `llhttp_set_error_reason()` for details.
  */
+LLHTTP_EXPORT
 const char* llhttp_get_error_reason(const llhttp_t* parser);
 
 /* Assign verbal description to the returned error. Must be called in user
@@ -361,6 +519,7 @@ const char* llhttp_get_error_reason(const llhttp_t* parser);
  *
  * Note: `HPE_USER` error code might be useful in user callbacks.
  */
+LLHTTP_EXPORT
 void llhttp_set_error_reason(llhttp_t* parser, const char* reason);
 
 /* Returns the pointer to the last parsed byte before the returned error. The
@@ -368,14 +527,58 @@ void llhttp_set_error_reason(llhttp_t* parser, const char* reason);
  *
  * Note: this method might be useful for counting the number of parsed bytes.
  */
+LLHTTP_EXPORT
 const char* llhttp_get_error_pos(const llhttp_t* parser);
 
 /* Returns textual name of error code */
+LLHTTP_EXPORT
 const char* llhttp_errno_name(llhttp_errno_t err);
 
 /* Returns textual name of HTTP method */
+LLHTTP_EXPORT
 const char* llhttp_method_name(llhttp_method_t method);
 
+
+/* Enables/disables lenient header value parsing (disabled by default).
+ *
+ * Lenient parsing disables header value token checks, extending llhttp's
+ * protocol support to highly non-compliant clients/server. No
+ * `HPE_INVALID_HEADER_TOKEN` will be raised for incorrect header values when
+ * lenient parsing is "on".
+ *
+ * **(USE AT YOUR OWN RISK)**
+ */
+LLHTTP_EXPORT
+void llhttp_set_lenient_headers(llhttp_t* parser, int enabled);
+
+
+/* Enables/disables lenient handling of conflicting `Transfer-Encoding` and
+ * `Content-Length` headers (disabled by default).
+ *
+ * Normally `llhttp` would error when `Transfer-Encoding` is present in
+ * conjunction with `Content-Length`. This error is important to prevent HTTP
+ * request smuggling, but may be less desirable for small number of cases
+ * involving legacy servers.
+ *
+ * **(USE AT YOUR OWN RISK)**
+ */
+LLHTTP_EXPORT
+void llhttp_set_lenient_chunked_length(llhttp_t* parser, int enabled);
+
+
+/* Enables/disables lenient handling of `Connection: close` and HTTP/1.0
+ * requests responses.
+ *
+ * Normally `llhttp` would error on (in strict mode) or discard (in loose mode)
+ * the HTTP request/response after the request/response with `Connection: close`
+ * and `Content-Length`. This is important to prevent cache poisoning attacks,
+ * but might interact badly with outdated and insecure clients. With this flag
+ * the extra request/response will be parsed normally.
+ *
+ * **(USE AT YOUR OWN RISK)**
+ */
+void llhttp_set_lenient_keep_alive(llhttp_t* parser, int enabled);
+
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif

data/ext/llhttp/llhttp_ext.c

@@ -1,25 +1,8 @@
-// This software is licensed under the MIT License.
+/*
+  This software is licensed under the MPL-2.0 License.
 
-// Copyright Bryan Powell, 2020.
-
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
+  Copyright Bryan Powell, 2020.
+*/
 
 #include <ruby/ruby.h>
 
@@ -27,6 +10,21 @@
 
 static VALUE mLLHttp, cParser, eError;
 
+static ID rb_llhttp_callback_on_message_begin;
+static ID rb_llhttp_callback_on_url;
+static ID rb_llhttp_callback_on_status;
+static ID rb_llhttp_callback_on_header_field;
+static ID rb_llhttp_callback_on_header_value;
+static ID rb_llhttp_callback_on_headers_complete;
+static ID rb_llhttp_callback_on_body;
+static ID rb_llhttp_callback_on_message_complete;
+static ID rb_llhttp_callback_on_chunk_header;
+static ID rb_llhttp_callback_on_chunk_complete;
+static ID rb_llhttp_callback_on_url_complete;
+static ID rb_llhttp_callback_on_status_complete;
+static ID rb_llhttp_callback_on_header_field_complete;
+static ID rb_llhttp_callback_on_header_value_complete;
+
 static void rb_llhttp_free(llhttp_t *parser) {
   if (parser) {
     free(parser->settings);
@@ -44,90 +42,86 @@ VALUE rb_llhttp_allocate(VALUE klass) {
   return Data_Wrap_Struct(klass, 0, rb_llhttp_free, parser);
 }
 
-void rb_llhttp_callback_call(VALUE delegate, const char *name) {
-  rb_funcall(delegate, rb_intern(name), 0);
+VALUE rb_llhttp_callback_call(VALUE delegate, ID method) {
+  return rb_funcall(delegate, method, 0);
 }
 
-void rb_llhttp_data_callback_call(VALUE delegate, const char *name, char *data, size_t length) {
-  rb_funcall(delegate, rb_intern(name), 1, rb_str_new(data, length));
+void rb_llhttp_data_callback_call(VALUE delegate, ID method, char *data, size_t length) {
+  rb_funcall(delegate, method, 1, rb_str_new(data, length));
 }
 
 int rb_llhttp_on_message_begin(llhttp_t *parser) {
-  VALUE delegate = (VALUE)parser->data;
+  return NUM2INT(rb_llhttp_callback_call((VALUE)parser->data, rb_llhttp_callback_on_message_begin));
+}
 
-  rb_llhttp_callback_call(delegate, "on_message_begin");
+int rb_llhttp_on_headers_complete(llhttp_t *parser) {
+  return NUM2INT(rb_llhttp_callback_call((VALUE)parser->data, rb_llhttp_callback_on_headers_complete));
+}
 
-  return 0;
+int rb_llhttp_on_message_complete(llhttp_t *parser) {
+  return NUM2INT(rb_llhttp_callback_call((VALUE)parser->data, rb_llhttp_callback_on_message_complete));
 }
 
-int rb_llhttp_on_url(llhttp_t *parser, char *data, size_t length) {
-  VALUE delegate = (VALUE)parser->data;
+int rb_llhttp_on_chunk_header(llhttp_t *parser) {
+  return NUM2INT(rb_llhttp_callback_call((VALUE)parser->data, rb_llhttp_callback_on_chunk_header));
+}
 
-  rb_llhttp_data_callback_call(delegate, "on_url", data, length);
+int rb_llhttp_on_url(llhttp_t *parser, char *data, size_t length) {
+  rb_llhttp_data_callback_call((VALUE)parser->data, rb_llhttp_callback_on_url, data, length);
 
   return 0;
 }
 
 int rb_llhttp_on_status(llhttp_t *parser, char *data, size_t length) {
-  VALUE delegate = (VALUE)parser->data;
-
-  rb_llhttp_data_callback_call(delegate, "on_status", data, length);
+  rb_llhttp_data_callback_call((VALUE)parser->data, rb_llhttp_callback_on_status, data, length);
 
   return 0;
 }
 
 int rb_llhttp_on_header_field(llhttp_t *parser, char *data, size_t length) {
-  VALUE delegate = (VALUE)parser->data;
-
-  rb_llhttp_data_callback_call(delegate, "on_header_field", data, length);
+  rb_llhttp_data_callback_call((VALUE)parser->data, rb_llhttp_callback_on_header_field, data, length);
 
   return 0;
 }
 
 int rb_llhttp_on_header_value(llhttp_t *parser, char *data, size_t length) {
-  VALUE delegate = (VALUE)parser->data;
-
-  rb_llhttp_data_callback_call(delegate, "on_header_value", data, length);
+  rb_llhttp_data_callback_call((VALUE)parser->data, rb_llhttp_callback_on_header_value, data, length);
 
   return 0;
 }
 
-int rb_llhttp_on_headers_complete(llhttp_t *parser) {
-  VALUE delegate = (VALUE)parser->data;
-
-  rb_llhttp_callback_call(delegate, "on_headers_complete");
+int rb_llhttp_on_body(llhttp_t *parser, char *data, size_t length) {
+  rb_llhttp_data_callback_call((VALUE)parser->data, rb_llhttp_callback_on_body, data, length);
 
   return 0;
 }
 
-int rb_llhttp_on_body(llhttp_t *parser, char *data, size_t length) {
-  VALUE delegate = (VALUE)parser->data;
-
-  rb_llhttp_data_callback_call(delegate, "on_body", data, length);
+int rb_llhttp_on_chunk_complete(llhttp_t *parser) {
+  rb_llhttp_callback_call((VALUE)parser->data, rb_llhttp_callback_on_chunk_complete);
 
   return 0;
 }
 
-int rb_llhttp_on_message_complete(llhttp_t *parser) {
-  VALUE delegate = (VALUE)parser->data;
-
-  rb_llhttp_callback_call(delegate, "on_message_complete");
+int rb_llhttp_on_url_complete(llhttp_t *parser) {
+  rb_llhttp_callback_call((VALUE)parser->data, rb_llhttp_callback_on_url_complete);
 
   return 0;
 }
 
-int rb_llhttp_on_chunk_header(llhttp_t *parser) {
-  VALUE delegate = (VALUE)parser->data;
-
-  rb_llhttp_callback_call(delegate, "on_chunk_header");
+int rb_llhttp_on_status_complete(llhttp_t *parser) {
+  rb_llhttp_callback_call((VALUE)parser->data, rb_llhttp_callback_on_status_complete);
 
   return 0;
 }
 
-int rb_llhttp_on_chunk_complete(llhttp_t *parser) {
-  VALUE delegate = (VALUE)parser->data;
+int rb_llhttp_on_header_field_complete(llhttp_t *parser) {
+  rb_llhttp_callback_call((VALUE)parser->data, rb_llhttp_callback_on_header_field_complete);
 
-  rb_llhttp_callback_call(delegate, "on_chunk_complete");
+  return 0;
+}
+
+int rb_llhttp_on_header_value_complete(llhttp_t *parser) {
+  rb_llhttp_callback_call((VALUE)parser->data, rb_llhttp_callback_on_header_value_complete);
 
   return 0;
 }
@@ -160,15 +154,27 @@ VALUE rb_llhttp_finish(VALUE self) {
   return Qtrue;
 }
 
+VALUE rb_llhttp_reset(VALUE self) {
+  llhttp_t *parser;
+
+  Data_Get_Struct(self, llhttp_t, parser);
+
+  llhttp_settings_t *settings = parser->settings;
+
+  llhttp_reset(parser);
+
+  return Qtrue;
+}
+
 VALUE rb_llhttp_content_length(VALUE self) {
   llhttp_t *parser;
 
   Data_Get_Struct(self, llhttp_t, parser);
 
-  return UINT2NUM(parser->content_length);
+  return ULL2NUM(parser->content_length);
 }
 
-VALUE rb_llhttp_method(VALUE self) {
+VALUE rb_llhttp_method_name(VALUE self) {
   llhttp_t *parser;
 
   Data_Get_Struct(self, llhttp_t, parser);
@@ -184,6 +190,22 @@ VALUE rb_llhttp_status_code(VALUE self) {
   return UINT2NUM(parser->status_code);
 }
 
+VALUE rb_llhttp_http_major(VALUE self) {
+  llhttp_t *parser;
+
+  Data_Get_Struct(self, llhttp_t, parser);
+
+  return UINT2NUM(parser->http_major);
+}
+
+VALUE rb_llhttp_http_minor(VALUE self) {
+  llhttp_t *parser;
+
+  Data_Get_Struct(self, llhttp_t, parser);
+
+  return UINT2NUM(parser->http_minor);
+}
+
 VALUE rb_llhttp_keep_alive(VALUE self) {
   llhttp_t *parser;
 
@@ -201,22 +223,81 @@ static VALUE rb_llhttp_init(VALUE self, VALUE type) {
 
   llhttp_settings_t *settings = parser->settings;
 
-  settings->on_message_begin = (llhttp_cb)rb_llhttp_on_message_begin;
-  settings->on_url = (llhttp_data_cb)rb_llhttp_on_url;
-  settings->on_status = (llhttp_data_cb)rb_llhttp_on_status;
-  settings->on_header_field = (llhttp_data_cb)rb_llhttp_on_header_field;
-  settings->on_header_value = (llhttp_data_cb)rb_llhttp_on_header_value;
-  settings->on_headers_complete = (llhttp_cb)rb_llhttp_on_headers_complete;
-  settings->on_body = (llhttp_data_cb)rb_llhttp_on_body;
-  settings->on_message_complete = (llhttp_cb)rb_llhttp_on_message_complete;
-  settings->on_chunk_header = (llhttp_cb)rb_llhttp_on_chunk_header;
-  settings->on_chunk_complete = (llhttp_cb)rb_llhttp_on_chunk_complete;
+  VALUE delegate = rb_iv_get(self, "@delegate");
+
+  rb_llhttp_callback_on_message_begin = rb_intern("internal_on_message_begin");
+  rb_llhttp_callback_on_headers_complete = rb_intern("internal_on_headers_complete");
+  rb_llhttp_callback_on_message_complete = rb_intern("internal_on_message_complete");
+  rb_llhttp_callback_on_chunk_header = rb_intern("internal_on_chunk_header");
+  rb_llhttp_callback_on_url = rb_intern("on_url");
+  rb_llhttp_callback_on_status = rb_intern("on_status");
+  rb_llhttp_callback_on_header_field = rb_intern("on_header_field");
+  rb_llhttp_callback_on_header_value = rb_intern("on_header_value");
+  rb_llhttp_callback_on_body = rb_intern("on_body");
+  rb_llhttp_callback_on_chunk_complete = rb_intern("on_chunk_complete");
+  rb_llhttp_callback_on_url_complete = rb_intern("on_url_complete");
+  rb_llhttp_callback_on_status_complete = rb_intern("on_status_complete");
+  rb_llhttp_callback_on_header_field_complete = rb_intern("on_header_field_complete");
+  rb_llhttp_callback_on_header_value_complete = rb_intern("on_header_value_complete");
+
+  if (rb_respond_to(delegate, rb_intern("on_message_begin"))) {
+    settings->on_message_begin = (llhttp_cb)rb_llhttp_on_message_begin;
+  }
+
+  if (rb_respond_to(delegate, rb_intern("on_headers_complete"))) {
+    settings->on_headers_complete = (llhttp_cb)rb_llhttp_on_headers_complete;
+  }
+
+  if (rb_respond_to(delegate, rb_intern("on_message_complete"))) {
+    settings->on_message_complete = (llhttp_cb)rb_llhttp_on_message_complete;
+  }
+
+  if (rb_respond_to(delegate, rb_intern("on_chunk_header"))) {
+    settings->on_chunk_header = (llhttp_cb)rb_llhttp_on_chunk_header;
+  }
+
+  if (rb_respond_to(delegate, rb_llhttp_callback_on_url)) {
+    settings->on_url = (llhttp_data_cb)rb_llhttp_on_url;
+  }
+
+  if (rb_respond_to(delegate, rb_llhttp_callback_on_status)) {
+    settings->on_status = (llhttp_data_cb)rb_llhttp_on_status;
+  }
+
+  if (rb_respond_to(delegate, rb_llhttp_callback_on_header_field)) {
+    settings->on_header_field = (llhttp_data_cb)rb_llhttp_on_header_field;
+  }
+
+  if (rb_respond_to(delegate, rb_llhttp_callback_on_header_value)) {
+    settings->on_header_value = (llhttp_data_cb)rb_llhttp_on_header_value;
+  }
+
+  if (rb_respond_to(delegate, rb_llhttp_callback_on_body)) {
+    settings->on_body = (llhttp_data_cb)rb_llhttp_on_body;
+  }
+
+  if (rb_respond_to(delegate, rb_llhttp_callback_on_chunk_complete)) {
+    settings->on_chunk_complete = (llhttp_cb)rb_llhttp_on_chunk_complete;
+  }
+
+  if (rb_respond_to(delegate, rb_llhttp_callback_on_url_complete)) {
+    settings->on_url_complete = (llhttp_cb)rb_llhttp_on_url_complete;
+  }
+
+  if (rb_respond_to(delegate, rb_llhttp_callback_on_status_complete)) {
+    settings->on_status_complete = (llhttp_cb)rb_llhttp_on_status_complete;
+  }
+
+  if (rb_respond_to(delegate, rb_llhttp_callback_on_header_field_complete)) {
+    settings->on_header_field_complete = (llhttp_cb)rb_llhttp_on_header_field_complete;
+  }
+
+  if (rb_respond_to(delegate, rb_llhttp_callback_on_header_value_complete)) {
+    settings->on_header_value_complete = (llhttp_cb)rb_llhttp_on_header_value_complete;
+  }
 
   llhttp_init(parser, FIX2INT(type), settings);
 
-  // Store a pointer to the delegate for lookup in callbacks.
-  //
-  VALUE delegate = rb_iv_get(self, "@delegate");
   parser->data = (void*)delegate;
 
   return Qtrue;
@@ -232,10 +313,13 @@ void Init_llhttp_ext(void) {
   rb_define_method(cParser, "<<", rb_llhttp_parse, 1);
   rb_define_method(cParser, "parse", rb_llhttp_parse, 1);
   rb_define_method(cParser, "finish", rb_llhttp_finish, 0);
+  rb_define_method(cParser, "reset", rb_llhttp_reset, 0);
 
   rb_define_method(cParser, "content_length", rb_llhttp_content_length, 0);
-  rb_define_method(cParser, "method", rb_llhttp_method, 0);
+  rb_define_method(cParser, "method_name", rb_llhttp_method_name, 0);
   rb_define_method(cParser, "status_code", rb_llhttp_status_code, 0);
+  rb_define_method(cParser, "http_major", rb_llhttp_http_major, 0);
+  rb_define_method(cParser, "http_minor", rb_llhttp_http_minor, 0);
 
   rb_define_method(cParser, "keep_alive?", rb_llhttp_keep_alive, 0);