diff options
| author | Loïc Hoguin <[email protected]> | 2017-07-03 18:42:05 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2017-07-03 18:42:05 +0200 |
| commit | 93d68bcccc118ef1b72622efc95f9fde5252c3ff (patch) | |
| tree | 0bfa67de7a4164dc359078359d3a2b79c8dd36fc | |
| parent | 21bb4295eb380fd38123a1983559fe6c7d59fa27 (diff) | |
| download | cowlib-93d68bcccc118ef1b72622efc95f9fde5252c3ff.tar.gz cowlib-93d68bcccc118ef1b72622efc95f9fde5252c3ff.tar.bz2 cowlib-93d68bcccc118ef1b72622efc95f9fde5252c3ff.zip | |
Skip extra spaces and TE chunk extensions
| -rw-r--r-- | src/cow_http_te.erl | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/cow_http_te.erl b/src/cow_http_te.erl index 1e7b43f..e0e413d 100644 --- a/src/cow_http_te.erl +++ b/src/cow_http_te.erl @@ -192,6 +192,12 @@ chunked_len(<< $c, R/bits >>, S, A, Len) -> chunked_len(R, S, A, Len * 16 + 12); chunked_len(<< $d, R/bits >>, S, A, Len) -> chunked_len(R, S, A, Len * 16 + 13); chunked_len(<< $e, R/bits >>, S, A, Len) -> chunked_len(R, S, A, Len * 16 + 14); chunked_len(<< $f, R/bits >>, S, A, Len) -> chunked_len(R, S, A, Len * 16 + 15); +%% Chunk extensions. +%% +%% Note that we currently skip the first character we encounter here, +%% and not in the skip_chunk_ext function. If we latter implement +%% chunk extensions (unlikely) we will need to change this clause too. +chunked_len(<< C, R/bits >>, S, A, Len) when C =/= $\r -> skip_chunk_ext(R, S, A, Len); %% Final chunk. chunked_len(<< "\r\n\r\n", R/bits >>, S, <<>>, 0) -> {done, S, R}; chunked_len(<< "\r\n\r\n", R/bits >>, S, A, 0) -> {done, A, S, R}; @@ -203,6 +209,11 @@ chunked_len(<<"\r">>, S, A, _) -> {more, {0, S}, A}; chunked_len(<<>>, _, <<>>, _) -> more; chunked_len(<<>>, S, A, _) -> {more, {0, S}, A}. +%% @todo We should probably limit how much we skip. +skip_chunk_ext(R = << "\r", _/bits >>, S, A, Len) -> chunked_len(R, S, A, Len); +skip_chunk_ext(R = <<>>, S, A, Len) -> chunked_len(R, S, A, Len); +skip_chunk_ext(<< _, R/bits >>, S, A, Len) -> skip_chunk_ext(R, S, A, Len). + %% @doc Encode a chunk. -spec chunk(D) -> D when D::iodata(). @@ -239,6 +250,17 @@ stream_chunked_one_pass_test() -> " in\r\n\r\nchunks.\r\n" "0\r\n" "\r\n">>, {0, 0}), + %% Same but with extra spaces or chunk extensions. + {done, <<"Wikipedia in\r\n\r\nchunks.">>, 23, <<>>} + = stream_chunked(<< + "4 \r\n" + "Wiki\r\n" + "5 ; ext = abc\r\n" + "pedia\r\n" + "e;ext=abc\r\n" + " in\r\n\r\nchunks.\r\n" + "0;ext\r\n" + "\r\n">>, {0, 0}), ok. stream_chunked_n_passes_test() -> |