diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-11-10 15:38:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-11-10 15:38:03 +0100 |
| commit | 3fb3067d953f8be9fe66d3a6687a86be2e8d2f3f (patch) | |
| tree | 33825e3233f32dc1916aaf1504b6cdcca0cf33ca /lib/inets/src/http_server | |
| parent | cca58959662d473bb329e41a84b5b260bf96a26b (diff) | |
| parent | 84f29ab803e8f36ef058a47f4c2b224f4dd58220 (diff) | |
| download | otp-3fb3067d953f8be9fe66d3a6687a86be2e8d2f3f.tar.gz otp-3fb3067d953f8be9fe66d3a6687a86be2e8d2f3f.tar.bz2 otp-3fb3067d953f8be9fe66d3a6687a86be2e8d2f3f.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
inets: Prepare for release
inets: Add missing guard
Avoid WindowBits=8 as per the manual
Fix deflateParams on zlib 1.2.11
Ignore empty binaries in enif_inspect_iovec
Emasculate writable binaries on entering an iovec
Only apply EOS behaviors if there's pending data
Stop assuming that all schedulers are managed when updating msacc
Diffstat (limited to 'lib/inets/src/http_server')
| -rw-r--r-- | lib/inets/src/http_server/httpd_esi.erl | 2 | ||||
| -rw-r--r-- | lib/inets/src/http_server/httpd_example.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/httpd_esi.erl b/lib/inets/src/http_server/httpd_esi.erl index fd50934d00..f5493f6fad 100644 --- a/lib/inets/src/http_server/httpd_esi.erl +++ b/lib/inets/src/http_server/httpd_esi.erl @@ -86,7 +86,7 @@ handle_headers([], NewHeaders, StatusCode, _) -> handle_headers([Header | Headers], NewHeaders, StatusCode, NoESIStatus) -> {FieldName, FieldValue} = httpd_response:split_header(Header, []), case FieldName of - "location" -> + "location" when NoESIStatus == true -> handle_headers(Headers, [{FieldName, FieldValue} | NewHeaders], 302, NoESIStatus); diff --git a/lib/inets/src/http_server/httpd_example.erl b/lib/inets/src/http_server/httpd_example.erl index adbbf64685..47a8c48d01 100644 --- a/lib/inets/src/http_server/httpd_example.erl +++ b/lib/inets/src/http_server/httpd_example.erl @@ -91,7 +91,7 @@ yahoo(_Env,_Input) -> "Location: http://www.yahoo.com\r\n\r\n". new_status_and_location(_Env,_Input) -> - "status:201\r\n Location: http://www.yahoo.com\r\n\r\n". + "status:201 Created\r\n Location: http://www.yahoo.com\r\n\r\n". default(Env,Input) -> [header(), |