release: 2.2.1

Author: indutny

include/llhttp.h

@@ -1,8 +1,8 @@
 #ifndef INCLUDE_LLHTTP_H_
 #define INCLUDE_LLHTTP_H_
 
-#define LLHTTP_VERSION_MAJOR 3
-#define LLHTTP_VERSION_MINOR 0
+#define LLHTTP_VERSION_MAJOR 2
+#define LLHTTP_VERSION_MINOR 2
 #define LLHTTP_VERSION_PATCH 1
 
 #ifndef LLHTTP_STRICT_MODE
@@ -33,11 +33,10 @@ struct llhttp__internal_s {
   uint8_t http_major;
   uint8_t http_minor;
   uint8_t header_state;
-  uint8_t lenient_flags;
-  uint8_t upgrade;
-  uint8_t finish;
   uint16_t flags;
+  uint8_t upgrade;
   uint16_t status_code;
+  uint8_t finish;
   void* settings;
 };
 
@@ -92,16 +91,11 @@ enum llhttp_flags {
   F_CONTENT_LENGTH = 0x20,
   F_SKIPBODY = 0x40,
   F_TRAILING = 0x80,
+  F_LENIENT = 0x100,
   F_TRANSFER_ENCODING = 0x200
 };
 typedef enum llhttp_flags llhttp_flags_t;
 
-enum llhttp_lenient_flags {
-  LENIENT_HEADERS = 0x1,
-  LENIENT_CHUNKED_LENGTH = 0x2
-};
-typedef enum llhttp_lenient_flags llhttp_lenient_flags_t;
-
 enum llhttp_type {
   HTTP_BOTH = 0,
   HTTP_REQUEST = 1,
@@ -292,11 +286,6 @@ struct llhttp_settings_s {
    */
   llhttp_cb      on_chunk_header;
   llhttp_cb      on_chunk_complete;
-
-  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.
@@ -411,20 +400,7 @@ const char* llhttp_method_name(llhttp_method_t method);
  *
  * **(USE AT YOUR OWN RISK)**
  */
-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)**
- */
-void llhttp_set_lenient_chunked_length(llhttp_t* parser, int enabled);
+void llhttp_set_lenient(llhttp_t* parser, int enabled);
 
 #ifdef __cplusplus
 }  /* extern "C" */

src/api.c

@@ -127,19 +127,11 @@ const char* llhttp_method_name(llhttp_method_t method) {
 }
 
 
-void llhttp_set_lenient_headers(llhttp_t* parser, int enabled) {
+void llhttp_set_lenient(llhttp_t* parser, int enabled) {
   if (enabled) {
-    parser->lenient_flags |= LENIENT_HEADERS;
+    parser->flags |= F_LENIENT;
   } else {
-    parser->lenient_flags &= ~LENIENT_HEADERS;
-  }
-}
-
-void llhttp_set_lenient_chunked_length(llhttp_t* parser, int enabled) {
-  if (enabled) {
-    parser->lenient_flags |= LENIENT_CHUNKED_LENGTH;
-  } else {
-    parser->lenient_flags &= ~LENIENT_CHUNKED_LENGTH;
+    parser->flags &= ~F_LENIENT;
   }
 }
 
@@ -161,55 +153,27 @@ int llhttp__on_url(llhttp_t* s, const char* p, const char* endp) {
 }
 
 
-int llhttp__on_url_complete(llhttp_t* s, const char* p, const char* endp) {
-  int err;
-  CALLBACK_MAYBE(s, on_url_complete, s);
-  return err;
-}
-
-
 int llhttp__on_status(llhttp_t* s, const char* p, const char* endp) {
   int err;
   CALLBACK_MAYBE(s, on_status, s, p, endp - p);
   return err;
 }
 
 
-int llhttp__on_status_complete(llhttp_t* s, const char* p, const char* endp) {
-  int err;
-  CALLBACK_MAYBE(s, on_status_complete, s);
-  return err;
-}
-
-
 int llhttp__on_header_field(llhttp_t* s, const char* p, const char* endp) {
   int err;
   CALLBACK_MAYBE(s, on_header_field, s, p, endp - p);
   return err;
 }
 
 
-int llhttp__on_header_field_complete(llhttp_t* s, const char* p, const char* endp) {
-  int err;
-  CALLBACK_MAYBE(s, on_header_field_complete, s);
-  return err;
-}
-
-
 int llhttp__on_header_value(llhttp_t* s, const char* p, const char* endp) {
   int err;
   CALLBACK_MAYBE(s, on_header_value, s, p, endp - p);
   return err;
 }
 
 
-int llhttp__on_header_value_complete(llhttp_t* s, const char* p, const char* endp) {
-  int err;
-  CALLBACK_MAYBE(s, on_header_value_complete, s);
-  return err;
-}
-
-
 int llhttp__on_headers_complete(llhttp_t* s, const char* p, const char* endp) {
   int err;
   CALLBACK_MAYBE(s, on_headers_complete, s);

src/http.c

@@ -51,8 +51,7 @@ int llhttp__after_headers_complete(llhttp_t* parser, const char* p,
     /* chunked encoding - ignore Content-Length header, prepare for a chunk */
     return 2;
   } else if (parser->flags & F_TRANSFER_ENCODING) {
-    if (parser->type == HTTP_REQUEST &&
-        (parser->lenient_flags & LENIENT_CHUNKED_LENGTH) == 0) {
+    if (parser->type == HTTP_REQUEST && (parser->flags & F_LENIENT) == 0) {
       /* RFC 7230 3.3.3 */
 
       /* If a Transfer-Encoding header field
@@ -98,7 +97,9 @@ int llhttp__after_message_complete(llhttp_t* parser, const char* p,
 
   should_keep_alive = llhttp_should_keep_alive(parser);
   parser->finish = HTTP_FINISH_SAFE;
-  parser->flags = 0;
+
+  /* Keep `F_LENIENT` flag between messages, but reset every other flag */
+  parser->flags &= F_LENIENT;
 
   /* NOTE: this is ignored in loose parsing mode */
   return should_keep_alive;