diff options
| author | Erlang/OTP <[email protected]> | 2017-11-02 08:22:34 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-11-02 08:22:34 +0100 |
| commit | d8f7b40f0d8ea8ede5bf1538a1bdc4928e9989f1 (patch) | |
| tree | 7e9b456cba610151fcffe934023094dfe28dec9a /lib/inets/src/http_server/httpd_request.erl | |
| parent | a98379d0519c28f9bc9b673ed2c09fb1ad52456e (diff) | |
| parent | 25112441ccfb14040a977042d6333e42df7d234f (diff) | |
| download | otp-d8f7b40f0d8ea8ede5bf1538a1bdc4928e9989f1.tar.gz otp-d8f7b40f0d8ea8ede5bf1538a1bdc4928e9989f1.tar.bz2 otp-d8f7b40f0d8ea8ede5bf1538a1bdc4928e9989f1.zip | |
Merge branch 'ingela/inets/maint/httpd-location-chunk-and-close/OTP-14716/OTP-14656/OTP-14696' into maint-20
* ingela/inets/maint/httpd-location-chunk-and-close/OTP-14716/OTP-14656/OTP-14696:
inets: Prepare for release
inets: httpd - Fix broken handling of POST requests
inets: Make sure httpd:stop_service is synchronous
inets: httpd - do not hardcode 302 status for location
Diffstat (limited to 'lib/inets/src/http_server/httpd_request.erl')
| -rw-r--r-- | lib/inets/src/http_server/httpd_request.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/httpd_request.erl b/lib/inets/src/http_server/httpd_request.erl index 0eaf073255..007d272323 100644 --- a/lib/inets/src/http_server/httpd_request.erl +++ b/lib/inets/src/http_server/httpd_request.erl @@ -306,10 +306,10 @@ add_chunk([<<>>, Body, Length, MaxChunk]) -> add_chunk([More, Body, Length, MaxChunk]) -> body_chunk(<<Body/binary, More/binary>>, Length, MaxChunk). -body_chunk(<<>> = Body, Length, MaxChunk) -> - {ok, {continue, ?MODULE, add_chunk, [Body, Length, MaxChunk]}}; body_chunk(Body, Length, nolimit) -> whole_body(Body, Length); +body_chunk(<<>> = Body, Length, MaxChunk) -> + {ok, {continue, ?MODULE, add_chunk, [Body, Length, MaxChunk]}}; body_chunk(Body, Length, MaxChunk) when Length > MaxChunk -> case size(Body) >= MaxChunk of |