diff options
| author | Micael Karlberg <[email protected]> | 2011-03-28 11:37:36 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-28 11:37:36 +0200 |
| commit | 117d7f67b394928755e607afe97e21dca3c060a7 (patch) | |
| tree | 03731c35f03b865b001bd3a86332887a0cb02107 /lib/inets/src | |
| parent | 3b9072a22c8050215c3d72e46c31e73c2a95532d (diff) | |
| parent | eea0a7bdf77179c98e41f867398253c4c6f0811f (diff) | |
| download | otp-117d7f67b394928755e607afe97e21dca3c060a7.tar.gz otp-117d7f67b394928755e607afe97e21dca3c060a7.tar.bz2 otp-117d7f67b394928755e607afe97e21dca3c060a7.zip | |
Merge branch 'bd/mod_esi_timeout_fix' into bmk/inets/inet56_integration
OTP-9158
Diffstat (limited to 'lib/inets/src')
| -rw-r--r-- | lib/inets/src/http_server/mod_esi.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl index b85c479693..e36c33b282 100644 --- a/lib/inets/src/http_server/mod_esi.erl +++ b/lib/inets/src/http_server/mod_esi.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2010. All Rights Reserved. +%% Copyright Ericsson AB 1997-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -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]} |