diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-08-22 15:36:01 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-08-22 15:36:01 +0200 |
| commit | 424021bb4253cbf0f864b97666497b82b5da66c1 (patch) | |
| tree | fe50212e5b75ab481c90e3b3d997169a3d823c29 /lib/inets/src | |
| parent | 85cbdc050b60b0d6cebcde4bb9fa9a2499f770a7 (diff) | |
| parent | 6450814d8a9d55962dcb830a01faababd70a6ebd (diff) | |
| download | otp-424021bb4253cbf0f864b97666497b82b5da66c1.tar.gz otp-424021bb4253cbf0f864b97666497b82b5da66c1.tar.bz2 otp-424021bb4253cbf0f864b97666497b82b5da66c1.zip | |
Merge branch 'jw/fix-httpd-erl-script-nocache/OTP-11260' into maint
* jw/fix-httpd-erl-script-nocache/OTP-11260:
inets: added simple testcase for option erl_script_nocache
Fix httpd config option 'erl_script_nocache'
Diffstat (limited to 'lib/inets/src')
| -rw-r--r-- | lib/inets/src/http_server/httpd_response.erl | 6 | ||||
| -rw-r--r-- | lib/inets/src/http_server/mod_cgi.erl | 2 | ||||
| -rw-r--r-- | lib/inets/src/http_server/mod_esi.erl | 2 |
3 files changed, 5 insertions, 5 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"}, diff --git a/lib/inets/src/http_server/mod_cgi.erl b/lib/inets/src/http_server/mod_cgi.erl index c854166c29..f1b73810e6 100644 --- a/lib/inets/src/http_server/mod_cgi.erl +++ b/lib/inets/src/http_server/mod_cgi.erl @@ -295,7 +295,7 @@ receive_headers(Port, Module, Function, Args, Timeout) -> end. send_headers(ModData, {StatusCode, _}, HTTPHeaders) -> - ExtraHeaders = httpd_response:cache_headers(ModData), + ExtraHeaders = httpd_response:cache_headers(ModData, script_nocache), httpd_response:send_header(ModData, StatusCode, ExtraHeaders ++ HTTPHeaders). diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl index e36c33b282..b11df34f9e 100644 --- a/lib/inets/src/http_server/mod_esi.erl +++ b/lib/inets/src/http_server/mod_esi.erl @@ -440,7 +440,7 @@ receive_headers(Timeout) -> end. send_headers(ModData, StatusCode, HTTPHeaders) -> - ExtraHeaders = httpd_response:cache_headers(ModData), + ExtraHeaders = httpd_response:cache_headers(ModData, erl_script_nocache), httpd_response:send_header(ModData, StatusCode, ExtraHeaders ++ HTTPHeaders). |