chunk_parser: handle trailer parsing and chunk processing

This should make life easier for us when integrating chunk
reading functionality

1 files changed, 25 insertions, 3 deletions

diff --git a/http_common.rl b/http_common.rl
index cb5bc8b..703017c 100644
--- a/http_common.rl
+++ b/http_common.rl
@@ -9,9 +9,9 @@
         LF = '\n' > { http->line_end = to_u16(fpc - buf); };
         eor = LWS*'\r'LF;
         CTL = (cntrl | 127);
-        header_name = [a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9];
-        header_value = (any -- CTL)*;
-        sep = LWS+|LWS*"\r\n"LWS+;
+        header_name = [a-zA-Z0-9\-]+;
+        header_value = (any -- (LWS|CTL))(any -- CTL)*;
+        sep = (LWS*)|(eor LWS+);
         b64_val = ([a-zA-Z0-9/+]{22}) > { http->tmp_tip = to_u16(fpc - buf); }
                   "=="
                   eor > {
@@ -28,4 +28,26 @@
                         http->has_expect_md5 = 1;
                   };
         content_md5 = "Content-MD5:"i sep b64_val;
+
+        ignored_trailer := header_name ':' sep header_value eor @ {
+                fgoto more_trailers;
+        };
+        trailer_line = ( content_md5 ) $!
+                {
+                        if (http->line_end > 0) {
+                                assert(buf[http->line_end] == '\n'
+                                       && "bad http->line_end");
+                                p = buf + http->line_end + 1;
+                        } else {
+                                p = buf;
+                        }
+                        assert(p <= pe && "overflow");
+                        fgoto ignored_trailer;
+                };
+        trailers = trailer_line* '\r''\n' > {
+                http->chunk_state = MOG_CHUNK_STATE_DONE;
+                really_done = 1;
+                fbreak;
+        };
+        more_trailers := trailers;
 }%%