simon/tiny_httpd
1
0
Fork 0
mirror of https://github.com/c-cube/tiny_httpd.git synced 2025-12-06 11:15:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix multipart: no \r\n before boundary after all

Browse source
This commit is contained in:
Simon Cruanes 2024-12-02 15:48:52 -05:00
parent 8f0dac2dfe
commit 0b34c966f7
No known key found for this signature in database
GPG key ID: EBFFF6F283F3A2B4
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/multipart_form/tiny_httpd_multipart_form_data.ml
View file

@ -46,7 +46,7 @@ let create ?(buf_size = 64 * 1024) ?(out_buf_size = 8 * 1024) ~boundary ic : st
type chunk = Delim | Eof | Read of int type chunk = Delim | Eof | Read of int
let[@inline] min_len_ (self : st) : int = 4 + String.length self.boundary let[@inline] min_len_ (self : st) : int = 2 + String.length self.boundary
exception Found_boundary of int exception Found_boundary of int
@ -74,16 +74,14 @@ let rec read_chunk_ (self : st) buf i_buf len : chunk =
) else ( ) else (
try try
let i = ref 0 in let i = ref 0 in
let end_pos = min len self.buf.len - 4 - String.length self.boundary in let end_pos = min len self.buf.len - 2 - String.length self.boundary in
while !i <= end_pos do while !i <= end_pos do
if if
Bytes.unsafe_get self.buf.bs !i = '\r' Bytes.unsafe_get self.buf.bs !i = '-'
&& Bytes.unsafe_get self.buf.bs (!i + 1) = '\n' && Bytes.unsafe_get self.buf.bs (!i + 1) = '-'
&& Bytes.unsafe_get self.buf.bs (!i + 2) = '-'
&& Bytes.unsafe_get self.buf.bs (!i + 3) = '-'
&& Utils_.string_eq && Utils_.string_eq
~a:(Bytes.unsafe_to_string self.buf.bs) ~a:(Bytes.unsafe_to_string self.buf.bs)
~a_start:(!i + 4) ~b:self.boundary ~a_start:(!i + 2) ~b:self.boundary
~len:(String.length self.boundary) ~len:(String.length self.boundary)
then then
raise_notrace (Found_boundary !i); raise_notrace (Found_boundary !i);
@ -95,7 +93,7 @@ let rec read_chunk_ (self : st) buf i_buf len : chunk =
Read n_read Read n_read
with with
| Found_boundary 0 -> | Found_boundary 0 ->
shift_left_ self.buf (4 + String.length self.boundary); shift_left_ self.buf (2 + String.length self.boundary);
Delim Delim
| Found_boundary n -> | Found_boundary n ->
let n_read = min n len in let n_read = min n len in
@ -191,7 +189,6 @@ and parse_headers_rec (self : st) acc : Headers.t =
) )
| i -> | i ->
let line = Bytes.sub_string self.buf_out.bs 0 i in let line = Bytes.sub_string self.buf_out.bs 0 i in
Printf.eprintf "parse header line %S\n%!" line;
shift_left_ self.buf_out (i + 2); shift_left_ self.buf_out (i + 2);
if line = "" then if line = "" then
List.rev acc List.rev acc