aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernard Duggan <[email protected]>2011-03-17 12:18:29 +1100
committerBernard Duggan <[email protected]>2011-03-17 12:18:29 +1100
commiteea0a7bdf77179c98e41f867398253c4c6f0811f (patch)
tree52ae5122d4618b7a52b2b3cc0b60101c460e6457
parent91b2e57ea0e3ab794d4b57a12ef10205383525a5 (diff)
downloadotp-eea0a7bdf77179c98e41f867398253c4c6f0811f.tar.gz
otp-eea0a7bdf77179c98e41f867398253c4c6f0811f.tar.bz2
otp-eea0a7bdf77179c98e41f867398253c4c6f0811f.zip
Fix timeout message generated by mod_esi
When a mod_esi request times out, the code to send a timeout response was incorrect and generated an internal server error as well as an invalid response line.
-rw-r--r--lib/inets/src/http_server/mod_esi.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl
index 929185a67a..a8e3b4ab47 100644
--- a/lib/inets/src/http_server/mod_esi.erl
+++ b/lib/inets/src/http_server/mod_esi.erl
@@ -415,7 +415,7 @@ deliver_webpage_chunk(#mod{config_db = Db} = ModData, Pid, Timeout) ->
end;
timeout ->
?hdrv("deliver_webpage_chunk - timeout", []),
- send_headers(ModData, {504, "Timeout"},[{"connection", "close"}]),
+ send_headers(ModData, 504, [{"connection", "close"}]),
httpd_socket:close(ModData#mod.socket_type, ModData#mod.socket),
process_flag(trap_exit,false),
{proceed,[{response, {already_sent, 200, 0}} | ModData#mod.data]}