diff options
Diffstat (limited to 'docs/conf')
| -rw-r--r-- | docs/conf/extra/httpd-default.conf.in | 2 | ||||
| -rw-r--r-- | docs/conf/extra/httpd-mpm.conf.in | 18 | ||||
| -rw-r--r-- | docs/conf/extra/proxy-html.conf.in | 5 | ||||
| -rw-r--r-- | docs/conf/httpd.conf.in | 12 |
4 files changed, 26 insertions, 11 deletions
diff --git a/docs/conf/extra/httpd-default.conf.in b/docs/conf/extra/httpd-default.conf.in index f1e7bc82..71969228 100644 --- a/docs/conf/extra/httpd-default.conf.in +++ b/docs/conf/extra/httpd-default.conf.in @@ -7,7 +7,7 @@ # # Timeout: The number of seconds before receives and sends time out. # -Timeout 300 +Timeout 60 # # KeepAlive: Whether or not to allow persistent connections (more than diff --git a/docs/conf/extra/httpd-mpm.conf.in b/docs/conf/extra/httpd-mpm.conf.in index b64da4ef..bf29fafe 100644 --- a/docs/conf/extra/httpd-mpm.conf.in +++ b/docs/conf/extra/httpd-mpm.conf.in @@ -29,7 +29,7 @@ StartServers 5 MinSpareServers 5 MaxSpareServers 10 - MaxRequestWorkers 150 + MaxRequestWorkers 250 MaxConnectionsPerChild 0 </IfModule> @@ -42,11 +42,11 @@ # MaxConnectionsPerChild: maximum number of connections a server process serves # before terminating <IfModule mpm_worker_module> - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 + StartServers 3 + MinSpareThreads 75 + MaxSpareThreads 250 ThreadsPerChild 25 - MaxRequestWorkers 150 + MaxRequestWorkers 400 MaxConnectionsPerChild 0 </IfModule> @@ -59,11 +59,11 @@ # MaxConnectionsPerChild: maximum number of connections a server process serves # before terminating <IfModule mpm_event_module> - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 + StartServers 3 + MinSpareThreads 75 + MaxSpareThreads 250 ThreadsPerChild 25 - MaxRequestWorkers 150 + MaxRequestWorkers 400 MaxConnectionsPerChild 0 </IfModule> diff --git a/docs/conf/extra/proxy-html.conf.in b/docs/conf/extra/proxy-html.conf.in index 49afe98a..683a0911 100644 --- a/docs/conf/extra/proxy-html.conf.in +++ b/docs/conf/extra/proxy-html.conf.in @@ -1,5 +1,10 @@ # Configuration example. # +# For detailed information about these directives see +# <URL:http://httpd.apache.org/docs/2.4/mod/mod_proxy_html.html> +# and for mod_xml2enc see +# <URL:http://httpd.apache.org/docs/2.4/mod/mod_xml2enc.html> +# # First, to load the module with its prerequisites. Note: mod_xml2enc # is not always necessary, but without it mod_proxy_html is likely to # mangle pages in encodings other than ASCII or Unicode (utf-8). diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in index 83dd6b89..a46499dd 100644 --- a/docs/conf/httpd.conf.in +++ b/docs/conf/httpd.conf.in @@ -255,7 +255,7 @@ LogLevel warn # ScriptSock: On threaded servers, designate the path to the UNIX # socket used to communicate with the CGI daemon of mod_cgid. # - #Scriptsock @rel_runtimedir@/cgisock + #Scriptsock cgisock </IfModule> # @@ -406,3 +406,13 @@ Include @rel_sysconfdir@/extra/proxy-html.conf SSLRandomSeed startup builtin SSLRandomSeed connect builtin </IfModule> + +# Deal with user agents that deliberately violate open standards +# +<IfModule setenvif_module> +BrowserMatch "MSIE 10.0;" bad_DNT +</IfModule> +<IfModule headers_module> +RequestHeader unset DNT env=bad_DNT +</IfModule> + |