ath9k: merge a few more pending fixes, including a fix for the bogus WARN_ON in pci...

[openwrt.git] / package / uhttpd / files / uhttpd.config

diff --git a/package/uhttpd/files/uhttpd.config b/package/uhttpd/files/uhttpd.config
index 0bca4f5..08ca5e5 100644 (file)
--- a/package/uhttpd/files/uhttpd.config
+++ b/package/uhttpd/files/uhttpd.config
@@ -1,9 +1,22 @@
 # Server configuration
 config uhttpd main
 
 # Server configuration
 config uhttpd main
 

+       # HTTP listen addresses, multiple allowed
+       list listen_http        0.0.0.0:80
+#      list listen_http        [::]:80
+
+       # HTTPS listen addresses, multiple allowed
+       list listen_https       0.0.0.0:443
+#      list listen_https       [::]:443
+

        # Server document root
        option home             /www
 
        # Server document root
        option home             /www
 

+       # Reject requests from RFC1918 IP addresses
+       # directed to the servers public IP(s).
+       # This is a DNS rebinding countermeasure.
+       option rfc1918_filter 1
+

        # Certificate and private key for HTTPS.
        # If no listen_https addresses are given,
        # the key options are ignored.
        # Certificate and private key for HTTPS.
        # If no listen_https addresses are given,
        # the key options are ignored.


@@ -14,18 +27,36 @@ config uhttpd main
        # Default is /cgi-bin
        option cgi_prefix       /cgi-bin
 
        # Default is /cgi-bin
        option cgi_prefix       /cgi-bin
 

+       # List of extension->interpreter mappings.
+       # Files with an associated interpreter can
+       # be called outside of the CGI prefix and do
+       # not need to be executable.
+#      list interpreter        ".php=/usr/bin/php-cgi"
+#      list interpreter        ".cgi=/usr/bin/perl"
+

        # Lua url prefix and handler script.
        # Lua support is disabled if no prefix given.
 #      option lua_prefix       /luci
 #      option lua_handler      /usr/lib/lua/luci/sgi/uhttpd.lua
 
        # Lua url prefix and handler script.
        # Lua support is disabled if no prefix given.
 #      option lua_prefix       /luci
 #      option lua_handler      /usr/lib/lua/luci/sgi/uhttpd.lua
 

-       # HTTP listen addresses, multiple allowed
-       list listen_http        0.0.0.0:80
-#      list listen_http        [::]:80
+       # CGI/Lua timeout, if the called script does not
+       # write data within the given amount of seconds,
+       # the server will terminate the request with
+       # 504 Gateway Timeout response.
+       option script_timeout   60

 
 

-       # HTTPS listen addresses, multiple allowed
-       list listen_https       0.0.0.0:443
-#      list listen_https       [::]:443
+       # Network timeout, if the current connection is
+       # blocked for the specified amount of seconds,
+       # the server will terminate the associated
+       # request process.
+       option network_timeout  30
+
+       # TCP Keep-Alive, send periodic keep-alive probes
+       # over established connections to detect dead peers.
+       # The value is given in seconds to specify the
+       # interval between subsequent probes.
+       # Setting this to 0 will disable TCP keep-alive.
+       option tcp_keepalive    1

 
        # Basic auth realm, defaults to local hostname
 #      option realm    OpenWrt
 
        # Basic auth realm, defaults to local hostname
 #      option realm    OpenWrt