aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/http_server/httpd_response.erl
diff options
context:
space:
mode:
authorJohannes Weißl <[email protected]>2013-06-22 20:21:45 +0200
committerIngela Anderton Andin <[email protected]>2014-02-05 10:32:23 +0100
commit79377d58e3f42a3f866998f2135c42c05a51d945 (patch)
tree7622a79225114e5270da43cc5ecf3fbbd1b271a8 /lib/inets/src/http_server/httpd_response.erl
parent1623d54ce6a552eb6802519c0ffe1f3616fab4aa (diff)
downloadotp-79377d58e3f42a3f866998f2135c42c05a51d945.tar.gz
otp-79377d58e3f42a3f866998f2135c42c05a51d945.tar.bz2
otp-79377d58e3f42a3f866998f2135c42c05a51d945.zip
Fix httpd config option 'erl_script_nocache'
This fixes the usage of the httpd configuration option 'erl_script_nocache', which got ignored before. Attention: Before, the option 'script_nocache' also changed the behavior for mod_esi, now it only affects mod_cgi.
Diffstat (limited to 'lib/inets/src/http_server/httpd_response.erl')
-rw-r--r--lib/inets/src/http_server/httpd_response.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/httpd_response.erl b/lib/inets/src/http_server/httpd_response.erl
index 6b6532266b..a45b04f275 100644
--- a/lib/inets/src/http_server/httpd_response.erl
+++ b/lib/inets/src/http_server/httpd_response.erl
@@ -20,7 +20,7 @@
-module(httpd_response).
-export([generate_and_send_response/1, send_status/3, send_header/3,
send_body/3, send_chunk/3, send_final_chunk/2, split_header/2,
- is_disable_chunked_send/1, cache_headers/1]).
+ is_disable_chunked_send/1, cache_headers/2]).
-export([map_status_code/2]).
-include("httpd.hrl").
@@ -266,8 +266,8 @@ get_connection(false,"HTTP/1.1") ->
get_connection(_,_) ->
"".
-cache_headers(#mod{config_db = Db}) ->
- case httpd_util:lookup(Db, script_nocache, false) of
+cache_headers(#mod{config_db = Db}, NoCacheType) ->
+ case httpd_util:lookup(Db, NoCacheType, false) of
true ->
Date = httpd_util:rfc1123_date(),
[{"cache-control", "no-cache"},