diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-10-10 14:53:23 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-10-10 14:53:23 +0200 |
| commit | 02743d4f8df0ddb6ef7f9dc93097e5f62655483b (patch) | |
| tree | ad45b6c0ad322839b41fe53b082c86b0e88db476 /lib/dialyzer | |
| parent | ad0e13a4e535a22db786c5f4ae24dfe220b959e4 (diff) | |
| parent | ffc5b4a516aa517bc4ccbb387c612a6bbea52ad4 (diff) | |
| download | otp-02743d4f8df0ddb6ef7f9dc93097e5f62655483b.tar.gz otp-02743d4f8df0ddb6ef7f9dc93097e5f62655483b.tar.bz2 otp-02743d4f8df0ddb6ef7f9dc93097e5f62655483b.zip | |
Merge branch 'weisslj/fix-httpd-timeout-options/OTP-11276' into maint
* weisslj/fix-httpd-timeout-options/OTP-11276:
inets: added testcase for keep_alive_timeout
Add test for httpd config option 'script_timeout'
Fix httpd config option 'script_timeout'
Fix httpd config option 'keep_alive_timeout'
Diffstat (limited to 'lib/dialyzer')
| -rw-r--r-- | lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl index d3f67eb77a..8c91b6f430 100644 --- a/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl +++ b/lib/dialyzer/test/r9c_SUITE_data/src/inets/mod_cgi.erl @@ -338,7 +338,7 @@ exec_script(false,Info,Script,_AfterScript,_RequestURI) -> %% proxy(#mod{config_db = ConfigDb} = Info, Port) -> - Timeout = httpd_util:lookup(ConfigDb, cgi_timeout, ?DEFAULT_CGI_TIMEOUT), + Timeout = httpd_util:lookup(ConfigDb, script_timeout, ?DEFAULT_CGI_TIMEOUT), proxy(Info, Port, 0, undefined,[], Timeout). proxy(Info, Port, Size, StatusCode, AccResponse, Timeout) -> |