# HG changeset patch # User Ruslan Ermilov # Date 1319001324 0 # Node ID c76a257f3fd4b75394f7fa47b938c18a2475f020 # Parent b8fd014ec712af0211bf97f543af9aab60b97909 The directive name is now automatically printed in and . Specifying is made non-optional. Visible changes: - "types" and "proxy_set_header" get proper defaults (not yet displayed nicely); - "fastcgi_hide_header", "fastcgi_ignore_headers", "fastcgi_pass_header", "proxy_hide_header", "proxy_ignore_headers", and "proxy_pass_header" now have their (empty) defaults documented; - mentions of "fastcgi_redirect_errors" and "proxy_redirect_errors" which are long unsupported were removed. diff -r b8fd014ec712 -r c76a257f3fd4 dtd/module.dtd --- a/dtd/module.dtd Tue Oct 18 12:19:06 2011 +0000 +++ b/dtd/module.dtd Wed Oct 19 05:15:24 2011 +0000 @@ -12,7 +12,7 @@ id ID #IMPLIED > - + -aio + on | off | sendfile -aio off +off http server location @@ -132,7 +132,7 @@ -alias path +path location @@ -189,8 +189,8 @@ -client_body_buffer_size size -client_body_buffer_size 8k|16k +size +8k|16k http server location @@ -209,12 +209,12 @@ -client_body_in_file_only + on | clean | off -client_body_in_file_only off +off http server location @@ -244,9 +244,9 @@ -client_body_in_single_buffer on | off +on | off -client_body_in_single_buffer off +off http server location @@ -263,13 +263,13 @@ -client_body_temp_path + path [level1 [level2 [level3]]] -client_body_temp_path client_body_temp +client_body_temp http server location @@ -292,8 +292,8 @@ -client_body_timeout time -client_body_timeout 60s +time +60s http server location @@ -312,8 +312,8 @@ -client_header_buffer_size size -client_header_buffer_size 1k +size +1k http server @@ -332,8 +332,8 @@ -client_header_timeout time -client_header_timeout 60s +time +60s http server @@ -349,8 +349,8 @@ -client_max_body_size size -client_max_body_size 1m +size +1m http server location @@ -374,8 +374,8 @@ -default_type mime-type -default_type text/plain +mime-type +text/plain http server location @@ -389,8 +389,8 @@ -directio size | off -directio off +size | off +off http server location @@ -415,8 +415,8 @@ -directio_alignment size -directio_alignment 512 +size +512 http server location @@ -432,7 +432,7 @@ -error_page + code ... [=[response]] uri @@ -496,12 +496,12 @@ -if_modified_since + off | exact | before -if_modified_since exact +exact http server location @@ -539,7 +539,7 @@ -internal + location @@ -588,8 +588,8 @@ -keepalive_requests number -keepalive_requests 100 +number +100 http server location @@ -604,11 +604,11 @@ -keepalive_timeout + timeout [header_timeout] -keepalive_timeout 75s +75s http server location @@ -633,8 +633,8 @@ -large_client_header_buffers number size -large_client_header_buffers 4 8k +number size +4 8k http server @@ -658,7 +658,7 @@ -limit_except method ... { ... } +method ... { ... } location @@ -701,8 +701,8 @@ -limit_rate rate -limit_rate 0 +rate +0 http server location @@ -743,8 +743,8 @@ -limit_rate_after size -limit_rate_after 0 +size +0 http server location @@ -770,7 +770,7 @@ -listen + address[:port] [default_server] [setfib=number] @@ -783,7 +783,7 @@ [ipv6only=on|off] [ssl] -listen + port [default_server] [setfib=number] @@ -796,7 +796,7 @@ [ipv6only=on|off] [ssl] -listen + unix:path [default_server] [backlog=number] @@ -807,7 +807,7 @@ [bind] [ssl] -listen *:80 | *:8000 +*:80 | *:8000 server @@ -986,14 +986,14 @@ -location [ +[ = | ~ | ~* | ^~ ] uri { ... } -location @name { ... } +@name { ... } server location @@ -1096,8 +1096,8 @@ -log_not_found on | off -log_not_found on +on | off +on http server location @@ -1111,8 +1111,8 @@ -log_subrequest on | off -log_subrequest off +on | off +off http server location @@ -1126,8 +1126,8 @@ -merge_slashes on | off -merge_slashes on +on | off +on http server @@ -1167,8 +1167,8 @@ -msie_padding on | off -msie_padding on +on | off +on http server location @@ -1182,8 +1182,8 @@ -msie_refresh on | off -msie_refresh off +on | off +off http server location @@ -1196,12 +1196,12 @@ -open_file_cache off -open_file_cache +off + max=N [inactive=time] -open_file_cache off +off http server location @@ -1277,8 +1277,8 @@ -open_file_cache_errors on | off -open_file_cache_errors off +on | off +off http server location @@ -1294,8 +1294,8 @@