aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/http_server/httpd_example.erl
diff options
context:
space:
mode:
authorPéter Dimitrov <[email protected]>2018-08-27 16:18:18 +0200
committerPéter Dimitrov <[email protected]>2018-08-27 16:18:18 +0200
commit7db7a1caeeee21682f37cfa95f9f026074e03ccf (patch)
treee47255259cece7ba59140f56dbe7aa2aee45bfaa /lib/inets/src/http_server/httpd_example.erl
parentb47fa83ff514feafa3debe841f2697c29fa2ca49 (diff)
parentab8faff46daf24db6f20dc2a307cf68d53034450 (diff)
downloadotp-7db7a1caeeee21682f37cfa95f9f026074e03ccf.tar.gz
otp-7db7a1caeeee21682f37cfa95f9f026074e03ccf.tar.bz2
otp-7db7a1caeeee21682f37cfa95f9f026074e03ccf.zip
Merge branch 'maint-20' into maint
* maint-20: inets: Prepare for release inets: Robust handling of 204, 304, 1xx responses inets: Do not use chunked encoding with 1xx, 204, 304 Change-Id: Ia88eb1d217b46fb01b1d7544d9ef34788c87abbd
Diffstat (limited to 'lib/inets/src/http_server/httpd_example.erl')
-rw-r--r--lib/inets/src/http_server/httpd_example.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/httpd_example.erl b/lib/inets/src/http_server/httpd_example.erl
index 52f5fa03a9..37e4f97bc0 100644
--- a/lib/inets/src/http_server/httpd_example.erl
+++ b/lib/inets/src/http_server/httpd_example.erl
@@ -22,7 +22,7 @@
-export([print/1]).
-export([get/2, put/2, post/2, yahoo/2, test1/2, get_bin/2, peer/2,new_status_and_location/2]).
--export([newformat/3, post_chunked/3]).
+-export([newformat/3, post_chunked/3, post_204/3]).
%% These are used by the inets test-suite
-export([delay/1, chunk_timeout/3]).
@@ -151,6 +151,12 @@ post_chunked(SessionID, _Env, {last, _Body, undefined} = _Bodychunk) ->
post_chunked(_, _, _Body) ->
exit(body_not_chunked).
+post_204(SessionID, _Env, _Input) ->
+ mod_esi:deliver(SessionID,
+ ["Status: 204 No Content" ++ "\r\n\r\n"]),
+ mod_esi:deliver(SessionID, []).
+
+
newformat(SessionID,_,_) ->
mod_esi:deliver(SessionID, "Content-Type:text/html\r\n\r\n"),
mod_esi:deliver(SessionID, top("new esi format test")),