Changeset 36932


Ignore:
Timestamp:
2013-06-13T13:55:12+02:00 (5 years ago)
Author:
jow
Message:

uhttpd: expose missing options to uci

Location:
trunk/package/network/services/uhttpd/files
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/network/services/uhttpd/files/uhttpd.config

    r31931 r36932  
    2424        option max_requests 3 
    2525 
     26        # Maximum number of concurrent connections. 
     27        # If this number is exceeded, further TCP connection 
     28        # attempts are queued until the number of active 
     29        # connections drops below the limit again. 
     30        option max_connections 100 
     31 
    2632        # Certificate and private key for HTTPS. 
    2733        # If no listen_https addresses are given, 
     
    4652#       option lua_handler      /usr/lib/lua/luci/sgi/uhttpd.lua 
    4753 
     54        # Specify the ubus-rpc prefix and socket path. 
     55#       option ubus_prefix      /ubus 
     56#       option ubus_socket      /var/run/ubus.sock 
     57 
    4858        # CGI/Lua timeout, if the called script does not 
    4959        # write data within the given amount of seconds, 
     
    5767        # request process. 
    5868        option network_timeout  30 
     69 
     70        # HTTP Keep-Alive, specifies the timeout for persistent 
     71        # HTTP/1.1 connections. Setting this to 0 will disable 
     72        # persistent HTTP connections. 
     73        option http_keepalive   20 
    5974 
    6075        # TCP Keep-Alive, send periodic keep-alive probes 
     
    7085        # Configuration file in busybox httpd format 
    7186#       option config   /etc/httpd.conf 
     87 
     88        # Do not follow symlinks that point outside of the 
     89        # home directory. 
     90#       option no_symlinks      0 
     91 
     92        # Do not produce directory listings but send 403 
     93        # instead if a client requests an url pointing to 
     94        # a directory without any index file. 
     95#       option no_dirlists      0 
     96 
     97        # Do not authenticate any ubus-rpc requests against 
     98        # the ubus session/access procedure. 
     99        # This is dangerous and should be always left off 
     100        # except for development and debug purposes! 
     101#       option no_ubusauth      0 
    72102 
    73103 
  • trunk/package/network/services/uhttpd/files/uhttpd.init

    r33778 r36932  
    6868        append_arg "$cfg" lua_prefix "-l" 
    6969        append_arg "$cfg" lua_handler "-L" 
     70        append_arg "$cfg" ubus_prefix "-u" 
     71        append_arg "$cfg" ubus_socket "-U" 
    7072        append_arg "$cfg" script_timeout "-t" 
    7173        append_arg "$cfg" network_timeout "-T" 
     74        append_arg "$cfg" http_keepalive "-k" 
    7275        append_arg "$cfg" tcp_keepalive "-A" 
    7376        append_arg "$cfg" error_page "-E" 
    7477        append_arg "$cfg" max_requests "-n" 3 
     78        append_arg "$cfg" max_connections "-N" 
    7579 
     80        append_bool "$cfg" no_ubusauth "-a" 0 
    7681        append_bool "$cfg" no_symlinks "-S" 0 
    7782        append_bool "$cfg" no_dirlists "-D" 0 
Note: See TracChangeset for help on using the changeset viewer.