nginxtra 1.6.3.9 → 1.8.0.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (181) hide show
  1. checksums.yaml +4 -4
  2. data/bin/nginxtra +1 -1
  3. data/bin/nginxtra_rails +1 -1
  4. data/lib/nginxtra/version.rb +1 -1
  5. data/vendor/nginx/CHANGES +358 -14
  6. data/vendor/nginx/CHANGES.ru +372 -18
  7. data/vendor/nginx/LICENSE +2 -2
  8. data/vendor/nginx/auto/cc/clang +5 -0
  9. data/vendor/nginx/auto/cc/gcc +5 -0
  10. data/vendor/nginx/auto/lib/google-perftools/conf +1 -1
  11. data/vendor/nginx/auto/lib/openssl/make +0 -5
  12. data/vendor/nginx/auto/lib/perl/conf +9 -1
  13. data/vendor/nginx/auto/make +1 -1
  14. data/vendor/nginx/auto/modules +11 -0
  15. data/vendor/nginx/auto/options +10 -2
  16. data/vendor/nginx/auto/os/darwin +0 -1
  17. data/vendor/nginx/auto/os/freebsd +6 -23
  18. data/vendor/nginx/auto/sources +16 -14
  19. data/vendor/nginx/auto/summary +3 -24
  20. data/vendor/nginx/auto/threads +20 -0
  21. data/vendor/nginx/auto/types/sizeof +2 -12
  22. data/vendor/nginx/auto/unix +50 -6
  23. data/vendor/nginx/configure +5 -0
  24. data/vendor/nginx/contrib/vim/syntax/nginx.vim +183 -50
  25. data/vendor/nginx/src/core/nginx.c +21 -9
  26. data/vendor/nginx/src/core/nginx.h +8 -2
  27. data/vendor/nginx/src/core/ngx_buf.c +88 -0
  28. data/vendor/nginx/src/core/ngx_buf.h +15 -1
  29. data/vendor/nginx/src/core/ngx_conf_file.c +4 -1
  30. data/vendor/nginx/src/core/ngx_connection.c +25 -66
  31. data/vendor/nginx/src/core/ngx_connection.h +1 -3
  32. data/vendor/nginx/src/core/ngx_core.h +11 -3
  33. data/vendor/nginx/src/core/ngx_crypt.c +1 -1
  34. data/vendor/nginx/src/core/ngx_cycle.c +7 -1
  35. data/vendor/nginx/src/core/ngx_cycle.h +6 -2
  36. data/vendor/nginx/src/core/ngx_file.c +13 -5
  37. data/vendor/nginx/src/core/ngx_file.h +6 -0
  38. data/vendor/nginx/src/core/ngx_log.c +215 -21
  39. data/vendor/nginx/src/core/ngx_log.h +9 -1
  40. data/vendor/nginx/src/core/ngx_output_chain.c +104 -15
  41. data/vendor/nginx/src/core/ngx_palloc.c +3 -7
  42. data/vendor/nginx/src/core/ngx_rbtree.c +2 -4
  43. data/vendor/nginx/src/core/ngx_rbtree.h +2 -4
  44. data/vendor/nginx/src/core/ngx_regex.c +14 -6
  45. data/vendor/nginx/src/core/ngx_resolver.c +16 -23
  46. data/vendor/nginx/src/core/ngx_resolver.h +8 -7
  47. data/vendor/nginx/src/core/ngx_shmtx.c +1 -1
  48. data/vendor/nginx/src/core/ngx_slab.c +89 -2
  49. data/vendor/nginx/src/core/ngx_slab.h +3 -0
  50. data/vendor/nginx/src/core/ngx_string.c +58 -2
  51. data/vendor/nginx/src/core/ngx_string.h +1 -0
  52. data/vendor/nginx/src/core/ngx_syslog.c +374 -0
  53. data/vendor/nginx/src/core/ngx_syslog.h +30 -0
  54. data/vendor/nginx/src/core/ngx_thread_pool.c +630 -0
  55. data/vendor/nginx/src/core/ngx_thread_pool.h +36 -0
  56. data/vendor/nginx/src/core/ngx_times.c +19 -2
  57. data/vendor/nginx/src/core/ngx_times.h +1 -0
  58. data/vendor/nginx/src/event/modules/ngx_aio_module.c +1 -1
  59. data/vendor/nginx/src/event/modules/ngx_devpoll_module.c +9 -24
  60. data/vendor/nginx/src/event/modules/ngx_epoll_module.c +152 -28
  61. data/vendor/nginx/src/event/modules/ngx_eventport_module.c +43 -25
  62. data/vendor/nginx/src/event/modules/ngx_kqueue_module.c +86 -156
  63. data/vendor/nginx/src/event/modules/ngx_poll_module.c +21 -37
  64. data/vendor/nginx/src/event/modules/ngx_rtsig_module.c +15 -27
  65. data/vendor/nginx/src/event/modules/ngx_select_module.c +10 -12
  66. data/vendor/nginx/src/event/modules/ngx_win32_select_module.c +7 -9
  67. data/vendor/nginx/src/event/ngx_event.c +5 -33
  68. data/vendor/nginx/src/event/ngx_event.h +15 -50
  69. data/vendor/nginx/src/event/ngx_event_accept.c +11 -10
  70. data/vendor/nginx/src/event/ngx_event_connect.c +0 -11
  71. data/vendor/nginx/src/event/ngx_event_connect.h +1 -4
  72. data/vendor/nginx/src/event/ngx_event_openssl.c +622 -38
  73. data/vendor/nginx/src/event/ngx_event_openssl.h +20 -2
  74. data/vendor/nginx/src/event/ngx_event_openssl_stapling.c +5 -1
  75. data/vendor/nginx/src/event/ngx_event_pipe.c +45 -19
  76. data/vendor/nginx/src/event/ngx_event_pipe.h +3 -0
  77. data/vendor/nginx/src/event/ngx_event_posted.c +7 -145
  78. data/vendor/nginx/src/event/ngx_event_posted.h +12 -39
  79. data/vendor/nginx/src/event/ngx_event_timer.c +50 -70
  80. data/vendor/nginx/src/event/ngx_event_timer.h +2 -14
  81. data/vendor/nginx/src/http/modules/ngx_http_addition_filter_module.c +1 -1
  82. data/vendor/nginx/src/http/modules/ngx_http_autoindex_module.c +416 -71
  83. data/vendor/nginx/src/http/modules/ngx_http_charset_filter_module.c +19 -15
  84. data/vendor/nginx/src/http/modules/ngx_http_dav_module.c +16 -4
  85. data/vendor/nginx/src/http/modules/ngx_http_fastcgi_module.c +601 -134
  86. data/vendor/nginx/src/http/modules/ngx_http_geo_module.c +1 -1
  87. data/vendor/nginx/src/http/modules/ngx_http_geoip_module.c +9 -3
  88. data/vendor/nginx/src/http/modules/ngx_http_gunzip_filter_module.c +9 -3
  89. data/vendor/nginx/src/http/modules/ngx_http_gzip_filter_module.c +9 -3
  90. data/vendor/nginx/src/http/modules/ngx_http_gzip_static_module.c +0 -2
  91. data/vendor/nginx/src/http/modules/ngx_http_headers_filter_module.c +197 -91
  92. data/vendor/nginx/src/http/modules/ngx_http_image_filter_module.c +1 -0
  93. data/vendor/nginx/src/http/modules/ngx_http_limit_conn_module.c +65 -162
  94. data/vendor/nginx/src/http/modules/ngx_http_limit_req_module.c +53 -67
  95. data/vendor/nginx/src/http/modules/ngx_http_log_module.c +128 -23
  96. data/vendor/nginx/src/http/modules/ngx_http_memcached_module.c +25 -6
  97. data/vendor/nginx/src/http/modules/ngx_http_mp4_module.c +1 -1
  98. data/vendor/nginx/src/http/modules/ngx_http_not_modified_filter_module.c +39 -13
  99. data/vendor/nginx/src/http/modules/ngx_http_proxy_module.c +697 -141
  100. data/vendor/nginx/src/http/modules/ngx_http_rewrite_module.c +5 -1
  101. data/vendor/nginx/src/http/modules/ngx_http_scgi_module.c +282 -125
  102. data/vendor/nginx/src/http/modules/ngx_http_ssi_filter_module.c +4 -1
  103. data/vendor/nginx/src/http/modules/ngx_http_ssl_module.c +44 -1
  104. data/vendor/nginx/src/http/modules/ngx_http_ssl_module.h +2 -0
  105. data/vendor/nginx/src/http/modules/ngx_http_stub_status_module.c +10 -8
  106. data/vendor/nginx/src/http/modules/ngx_http_sub_filter_module.c +18 -3
  107. data/vendor/nginx/src/http/modules/ngx_http_upstream_hash_module.c +641 -0
  108. data/vendor/nginx/src/http/modules/ngx_http_upstream_ip_hash_module.c +1 -1
  109. data/vendor/nginx/src/http/modules/ngx_http_upstream_keepalive_module.c +3 -21
  110. data/vendor/nginx/src/http/modules/ngx_http_upstream_least_conn_module.c +0 -5
  111. data/vendor/nginx/src/http/modules/ngx_http_uwsgi_module.c +449 -125
  112. data/vendor/nginx/src/http/modules/ngx_http_xslt_filter_module.c +4 -2
  113. data/vendor/nginx/src/http/modules/perl/ngx_http_perl_module.c +2 -1
  114. data/vendor/nginx/src/http/ngx_http.c +10 -5
  115. data/vendor/nginx/src/http/ngx_http.h +4 -4
  116. data/vendor/nginx/src/http/ngx_http_cache.h +26 -1
  117. data/vendor/nginx/src/http/ngx_http_copy_filter_module.c +109 -68
  118. data/vendor/nginx/src/http/ngx_http_core_module.c +191 -46
  119. data/vendor/nginx/src/http/ngx_http_core_module.h +16 -4
  120. data/vendor/nginx/src/http/ngx_http_file_cache.c +584 -67
  121. data/vendor/nginx/src/http/ngx_http_parse.c +55 -4
  122. data/vendor/nginx/src/http/ngx_http_request.c +14 -6
  123. data/vendor/nginx/src/http/ngx_http_request.h +12 -4
  124. data/vendor/nginx/src/http/ngx_http_request_body.c +114 -28
  125. data/vendor/nginx/src/http/ngx_http_spdy.c +383 -229
  126. data/vendor/nginx/src/http/ngx_http_spdy.h +8 -5
  127. data/vendor/nginx/src/http/ngx_http_spdy_filter_module.c +12 -4
  128. data/vendor/nginx/src/http/ngx_http_special_response.c +2 -2
  129. data/vendor/nginx/src/http/ngx_http_upstream.c +808 -132
  130. data/vendor/nginx/src/http/ngx_http_upstream.h +33 -3
  131. data/vendor/nginx/src/http/ngx_http_upstream_round_robin.c +72 -65
  132. data/vendor/nginx/src/http/ngx_http_upstream_round_robin.h +1 -2
  133. data/vendor/nginx/src/http/ngx_http_variables.c +47 -3
  134. data/vendor/nginx/src/http/ngx_http_write_filter_module.c +15 -6
  135. data/vendor/nginx/src/mail/ngx_mail.c +2 -3
  136. data/vendor/nginx/src/mail/ngx_mail.h +2 -0
  137. data/vendor/nginx/src/mail/ngx_mail_auth_http_module.c +140 -11
  138. data/vendor/nginx/src/mail/ngx_mail_core_module.c +3 -3
  139. data/vendor/nginx/src/mail/ngx_mail_handler.c +79 -2
  140. data/vendor/nginx/src/mail/ngx_mail_imap_module.c +3 -1
  141. data/vendor/nginx/src/mail/ngx_mail_pop3_module.c +3 -1
  142. data/vendor/nginx/src/mail/ngx_mail_smtp_module.c +3 -1
  143. data/vendor/nginx/src/mail/ngx_mail_ssl_module.c +125 -1
  144. data/vendor/nginx/src/mail/ngx_mail_ssl_module.h +8 -0
  145. data/vendor/nginx/src/misc/ngx_cpp_test_module.cpp +1 -1
  146. data/vendor/nginx/src/os/unix/ngx_aio_read_chain.c +1 -1
  147. data/vendor/nginx/src/os/unix/ngx_channel.c +0 -7
  148. data/vendor/nginx/src/os/unix/ngx_darwin_config.h +0 -3
  149. data/vendor/nginx/src/os/unix/ngx_darwin_sendfile_chain.c +44 -208
  150. data/vendor/nginx/src/os/unix/ngx_file_aio_read.c +25 -17
  151. data/vendor/nginx/src/os/unix/ngx_files.c +109 -0
  152. data/vendor/nginx/src/os/unix/ngx_files.h +6 -0
  153. data/vendor/nginx/src/os/unix/ngx_freebsd_config.h +0 -6
  154. data/vendor/nginx/src/os/unix/ngx_freebsd_sendfile_chain.c +78 -206
  155. data/vendor/nginx/src/os/unix/ngx_linux_aio_read.c +25 -14
  156. data/vendor/nginx/src/os/unix/ngx_linux_config.h +4 -1
  157. data/vendor/nginx/src/os/unix/ngx_linux_sendfile_chain.c +235 -194
  158. data/vendor/nginx/src/os/unix/ngx_os.h +25 -3
  159. data/vendor/nginx/src/os/unix/ngx_posix_init.c +4 -2
  160. data/vendor/nginx/src/os/unix/ngx_process_cycle.c +13 -195
  161. data/vendor/nginx/src/os/unix/ngx_process_cycle.h +0 -1
  162. data/vendor/nginx/src/os/unix/ngx_readv_chain.c +27 -108
  163. data/vendor/nginx/src/os/unix/ngx_setproctitle.h +2 -2
  164. data/vendor/nginx/src/os/unix/ngx_solaris_sendfilev_chain.c +12 -67
  165. data/vendor/nginx/src/os/unix/ngx_thread.h +26 -83
  166. data/vendor/nginx/src/os/unix/ngx_thread_cond.c +87 -0
  167. data/vendor/nginx/src/os/unix/ngx_thread_id.c +70 -0
  168. data/vendor/nginx/src/os/unix/ngx_thread_mutex.c +174 -0
  169. data/vendor/nginx/src/os/unix/ngx_user.c +2 -20
  170. data/vendor/nginx/src/os/unix/ngx_writev_chain.c +129 -98
  171. metadata +16 -17
  172. data/vendor/nginx/auto/lib/zlib/patch.zlib.h +0 -10
  173. data/vendor/nginx/src/event/ngx_event_busy_lock.c +0 -286
  174. data/vendor/nginx/src/event/ngx_event_busy_lock.h +0 -65
  175. data/vendor/nginx/src/event/ngx_event_mutex.c +0 -70
  176. data/vendor/nginx/src/http/ngx_http_busy_lock.c +0 -307
  177. data/vendor/nginx/src/http/ngx_http_busy_lock.h +0 -54
  178. data/vendor/nginx/src/os/unix/ngx_freebsd_rfork_thread.c +0 -756
  179. data/vendor/nginx/src/os/unix/ngx_freebsd_rfork_thread.h +0 -122
  180. data/vendor/nginx/src/os/unix/ngx_pthread_thread.c +0 -278
  181. data/vendor/nginx/src/os/unix/rfork_thread.S +0 -73
@@ -58,6 +58,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
58
58
  . auto/unix
59
59
  fi
60
60
 
61
+ . auto/threads
61
62
  . auto/modules
62
63
  . auto/lib/conf
63
64
 
@@ -108,4 +109,8 @@ have=NGX_HTTP_SCGI_TEMP_PATH value="\"$NGX_HTTP_SCGI_TEMP_PATH\""
108
109
  have=NGX_USER value="\"$NGX_USER\"" . auto/define
109
110
  have=NGX_GROUP value="\"$NGX_GROUP\"" . auto/define
110
111
 
112
+ if [ ".$NGX_BUILD" != "." ]; then
113
+ have=NGX_BUILD value="\"$NGX_BUILD\"" . auto/define
114
+ fi
115
+
111
116
  . auto/summary
@@ -31,6 +31,7 @@ syn keyword ngxDirectiveBlock limit_except contained
31
31
  syn keyword ngxDirectiveBlock if contained
32
32
  syn keyword ngxDirectiveBlock geo contained
33
33
  syn keyword ngxDirectiveBlock map contained
34
+ syn keyword ngxDirectiveBlock split_clients contained
34
35
 
35
36
  syn keyword ngxDirectiveImportant include
36
37
  syn keyword ngxDirectiveImportant root
@@ -41,6 +42,8 @@ syn keyword ngxDirectiveImportant internal
41
42
  syn keyword ngxDirectiveImportant proxy_pass
42
43
  syn keyword ngxDirectiveImportant memcached_pass
43
44
  syn keyword ngxDirectiveImportant fastcgi_pass
45
+ syn keyword ngxDirectiveImportant scgi_pass
46
+ syn keyword ngxDirectiveImportant uwsgi_pass
44
47
  syn keyword ngxDirectiveImportant try_files
45
48
 
46
49
  syn keyword ngxDirectiveControl break
@@ -53,12 +56,15 @@ syn keyword ngxDirectiveError post_action
53
56
 
54
57
  syn keyword ngxDirectiveDeprecated connections
55
58
  syn keyword ngxDirectiveDeprecated imap
59
+ syn keyword ngxDirectiveDeprecated limit_zone
56
60
  syn keyword ngxDirectiveDeprecated open_file_cache_retest
57
61
  syn keyword ngxDirectiveDeprecated optimize_server_names
58
62
  syn keyword ngxDirectiveDeprecated satisfy_any
63
+ syn keyword ngxDirectiveDeprecated so_keepalive
59
64
 
60
65
  syn keyword ngxDirective accept_mutex
61
66
  syn keyword ngxDirective accept_mutex_delay
67
+ syn keyword ngxDirective acceptex_read
62
68
  syn keyword ngxDirective access_log
63
69
  syn keyword ngxDirective add_after_body
64
70
  syn keyword ngxDirective add_before_body
@@ -74,11 +80,14 @@ syn keyword ngxDirective auth_basic_user_file
74
80
  syn keyword ngxDirective auth_http
75
81
  syn keyword ngxDirective auth_http_header
76
82
  syn keyword ngxDirective auth_http_timeout
83
+ syn keyword ngxDirective auth_request
84
+ syn keyword ngxDirective auth_request_set
77
85
  syn keyword ngxDirective autoindex
78
86
  syn keyword ngxDirective autoindex_exact_size
79
87
  syn keyword ngxDirective autoindex_localtime
80
88
  syn keyword ngxDirective charset
81
89
  syn keyword ngxDirective charset_types
90
+ syn keyword ngxDirective chunked_transfer_encoding
82
91
  syn keyword ngxDirective client_body_buffer_size
83
92
  syn keyword ngxDirective client_body_in_file_only
84
93
  syn keyword ngxDirective client_body_in_single_buffer
@@ -102,32 +111,44 @@ syn keyword ngxDirective devpoll_changes
102
111
  syn keyword ngxDirective devpoll_events
103
112
  syn keyword ngxDirective directio
104
113
  syn keyword ngxDirective directio_alignment
114
+ syn keyword ngxDirective disable_symlinks
105
115
  syn keyword ngxDirective empty_gif
106
116
  syn keyword ngxDirective env
107
117
  syn keyword ngxDirective epoll_events
108
118
  syn keyword ngxDirective error_log
119
+ syn keyword ngxDirective etag
109
120
  syn keyword ngxDirective eventport_events
110
121
  syn keyword ngxDirective expires
111
122
  syn keyword ngxDirective fastcgi_bind
112
123
  syn keyword ngxDirective fastcgi_buffer_size
124
+ syn keyword ngxDirective fastcgi_buffering
113
125
  syn keyword ngxDirective fastcgi_buffers
114
126
  syn keyword ngxDirective fastcgi_busy_buffers_size
115
127
  syn keyword ngxDirective fastcgi_cache
128
+ syn keyword ngxDirective fastcgi_cache_bypass
116
129
  syn keyword ngxDirective fastcgi_cache_key
130
+ syn keyword ngxDirective fastcgi_cache_lock
131
+ syn keyword ngxDirective fastcgi_cache_lock_timeout
117
132
  syn keyword ngxDirective fastcgi_cache_methods
118
133
  syn keyword ngxDirective fastcgi_cache_min_uses
119
134
  syn keyword ngxDirective fastcgi_cache_path
135
+ syn keyword ngxDirective fastcgi_cache_revalidate
120
136
  syn keyword ngxDirective fastcgi_cache_use_stale
121
137
  syn keyword ngxDirective fastcgi_cache_valid
122
138
  syn keyword ngxDirective fastcgi_catch_stderr
123
139
  syn keyword ngxDirective fastcgi_connect_timeout
140
+ syn keyword ngxDirective fastcgi_force_ranges
124
141
  syn keyword ngxDirective fastcgi_hide_header
125
142
  syn keyword ngxDirective fastcgi_ignore_client_abort
126
143
  syn keyword ngxDirective fastcgi_ignore_headers
127
144
  syn keyword ngxDirective fastcgi_index
128
145
  syn keyword ngxDirective fastcgi_intercept_errors
146
+ syn keyword ngxDirective fastcgi_keep_conn
129
147
  syn keyword ngxDirective fastcgi_max_temp_file_size
130
148
  syn keyword ngxDirective fastcgi_next_upstream
149
+ syn keyword ngxDirective fastcgi_next_upstream_timeout
150
+ syn keyword ngxDirective fastcgi_next_upstream_tries
151
+ syn keyword ngxDirective fastcgi_no_cache
131
152
  syn keyword ngxDirective fastcgi_param
132
153
  syn keyword ngxDirective fastcgi_pass_header
133
154
  syn keyword ngxDirective fastcgi_pass_request_body
@@ -140,12 +161,15 @@ syn keyword ngxDirective fastcgi_store
140
161
  syn keyword ngxDirective fastcgi_store_access
141
162
  syn keyword ngxDirective fastcgi_temp_file_write_size
142
163
  syn keyword ngxDirective fastcgi_temp_path
143
- syn keyword ngxDirective fastcgi_upstream_fail_timeout
144
- syn keyword ngxDirective fastcgi_upstream_max_fails
145
164
  syn keyword ngxDirective flv
146
165
  syn keyword ngxDirective geoip_city
147
166
  syn keyword ngxDirective geoip_country
167
+ syn keyword ngxDirective geoip_org
168
+ syn keyword ngxDirective geoip_proxy
169
+ syn keyword ngxDirective geoip_proxy_recursive
148
170
  syn keyword ngxDirective google_perftools_profiles
171
+ syn keyword ngxDirective gunzip
172
+ syn keyword ngxDirective gunzip_buffers
149
173
  syn keyword ngxDirective gzip
150
174
  syn keyword ngxDirective gzip_buffers
151
175
  syn keyword ngxDirective gzip_comp_level
@@ -159,30 +183,40 @@ syn keyword ngxDirective gzip_static
159
183
  syn keyword ngxDirective gzip_types
160
184
  syn keyword ngxDirective gzip_vary
161
185
  syn keyword ngxDirective gzip_window
186
+ syn keyword ngxDirective hash
162
187
  syn keyword ngxDirective if_modified_since
163
188
  syn keyword ngxDirective ignore_invalid_headers
164
189
  syn keyword ngxDirective image_filter
165
190
  syn keyword ngxDirective image_filter_buffer
191
+ syn keyword ngxDirective image_filter_interlace
166
192
  syn keyword ngxDirective image_filter_jpeg_quality
193
+ syn keyword ngxDirective image_filter_sharpen
167
194
  syn keyword ngxDirective image_filter_transparency
168
195
  syn keyword ngxDirective imap_auth
169
196
  syn keyword ngxDirective imap_capabilities
170
197
  syn keyword ngxDirective imap_client_buffer
171
198
  syn keyword ngxDirective index
199
+ syn keyword ngxDirective iocp_threads
172
200
  syn keyword ngxDirective ip_hash
201
+ syn keyword ngxDirective keepalive
202
+ syn keyword ngxDirective keepalive_disable
173
203
  syn keyword ngxDirective keepalive_requests
174
204
  syn keyword ngxDirective keepalive_timeout
175
205
  syn keyword ngxDirective kqueue_changes
176
206
  syn keyword ngxDirective kqueue_events
177
207
  syn keyword ngxDirective large_client_header_buffers
208
+ syn keyword ngxDirective least_conn
178
209
  syn keyword ngxDirective limit_conn
179
210
  syn keyword ngxDirective limit_conn_log_level
211
+ syn keyword ngxDirective limit_conn_status
212
+ syn keyword ngxDirective limit_conn_zone
180
213
  syn keyword ngxDirective limit_rate
181
214
  syn keyword ngxDirective limit_rate_after
182
215
  syn keyword ngxDirective limit_req
183
216
  syn keyword ngxDirective limit_req_log_level
217
+ syn keyword ngxDirective limit_req_status
184
218
  syn keyword ngxDirective limit_req_zone
185
- syn keyword ngxDirective limit_zone
219
+ syn keyword ngxDirective lingering_close
186
220
  syn keyword ngxDirective lingering_time
187
221
  syn keyword ngxDirective lingering_timeout
188
222
  syn keyword ngxDirective lock_file
@@ -192,21 +226,27 @@ syn keyword ngxDirective log_subrequest
192
226
  syn keyword ngxDirective map_hash_bucket_size
193
227
  syn keyword ngxDirective map_hash_max_size
194
228
  syn keyword ngxDirective master_process
229
+ syn keyword ngxDirective max_ranges
195
230
  syn keyword ngxDirective memcached_bind
196
231
  syn keyword ngxDirective memcached_buffer_size
197
232
  syn keyword ngxDirective memcached_connect_timeout
233
+ syn keyword ngxDirective memcached_gzip_flag
198
234
  syn keyword ngxDirective memcached_next_upstream
235
+ syn keyword ngxDirective memcached_next_upstream_timeout
236
+ syn keyword ngxDirective memcached_next_upstream_tries
199
237
  syn keyword ngxDirective memcached_read_timeout
200
238
  syn keyword ngxDirective memcached_send_timeout
201
- syn keyword ngxDirective memcached_upstream_fail_timeout
202
- syn keyword ngxDirective memcached_upstream_max_fails
203
239
  syn keyword ngxDirective merge_slashes
204
240
  syn keyword ngxDirective min_delete_depth
205
241
  syn keyword ngxDirective modern_browser
206
242
  syn keyword ngxDirective modern_browser_value
243
+ syn keyword ngxDirective mp4
244
+ syn keyword ngxDirective mp4_buffer_size
245
+ syn keyword ngxDirective mp4_max_buffer_size
207
246
  syn keyword ngxDirective msie_padding
208
247
  syn keyword ngxDirective msie_refresh
209
248
  syn keyword ngxDirective multi_accept
249
+ syn keyword ngxDirective mysql_test
210
250
  syn keyword ngxDirective open_file_cache
211
251
  syn keyword ngxDirective open_file_cache_errors
212
252
  syn keyword ngxDirective open_file_cache_events
@@ -215,6 +255,7 @@ syn keyword ngxDirective open_file_cache_valid
215
255
  syn keyword ngxDirective open_log_file_cache
216
256
  syn keyword ngxDirective output_buffers
217
257
  syn keyword ngxDirective override_charset
258
+ syn keyword ngxDirective pcre_jit
218
259
  syn keyword ngxDirective perl
219
260
  syn keyword ngxDirective perl_modules
220
261
  syn keyword ngxDirective perl_require
@@ -223,6 +264,7 @@ syn keyword ngxDirective pid
223
264
  syn keyword ngxDirective pop3_auth
224
265
  syn keyword ngxDirective pop3_capabilities
225
266
  syn keyword ngxDirective port_in_redirect
267
+ syn keyword ngxDirective post_acceptex
226
268
  syn keyword ngxDirective postpone_gzipping
227
269
  syn keyword ngxDirective postpone_output
228
270
  syn keyword ngxDirective protocol
@@ -234,22 +276,33 @@ syn keyword ngxDirective proxy_buffering
234
276
  syn keyword ngxDirective proxy_buffers
235
277
  syn keyword ngxDirective proxy_busy_buffers_size
236
278
  syn keyword ngxDirective proxy_cache
279
+ syn keyword ngxDirective proxy_cache_bypass
237
280
  syn keyword ngxDirective proxy_cache_key
281
+ syn keyword ngxDirective proxy_cache_lock
282
+ syn keyword ngxDirective proxy_cache_lock_timeout
238
283
  syn keyword ngxDirective proxy_cache_methods
239
284
  syn keyword ngxDirective proxy_cache_min_uses
240
285
  syn keyword ngxDirective proxy_cache_path
286
+ syn keyword ngxDirective proxy_cache_revalidate
241
287
  syn keyword ngxDirective proxy_cache_use_stale
242
288
  syn keyword ngxDirective proxy_cache_valid
243
289
  syn keyword ngxDirective proxy_connect_timeout
290
+ syn keyword ngxDirective proxy_cookie_domain
291
+ syn keyword ngxDirective proxy_cookie_path
292
+ syn keyword ngxDirective proxy_force_ranges
244
293
  syn keyword ngxDirective proxy_headers_hash_bucket_size
245
294
  syn keyword ngxDirective proxy_headers_hash_max_size
246
295
  syn keyword ngxDirective proxy_hide_header
296
+ syn keyword ngxDirective proxy_http_version
247
297
  syn keyword ngxDirective proxy_ignore_client_abort
248
298
  syn keyword ngxDirective proxy_ignore_headers
249
299
  syn keyword ngxDirective proxy_intercept_errors
250
300
  syn keyword ngxDirective proxy_max_temp_file_size
251
301
  syn keyword ngxDirective proxy_method
252
302
  syn keyword ngxDirective proxy_next_upstream
303
+ syn keyword ngxDirective proxy_next_upstream_timeout
304
+ syn keyword ngxDirective proxy_next_upstream_tries
305
+ syn keyword ngxDirective proxy_no_cache
253
306
  syn keyword ngxDirective proxy_pass_error_message
254
307
  syn keyword ngxDirective proxy_pass_header
255
308
  syn keyword ngxDirective proxy_pass_request_body
@@ -260,18 +313,27 @@ syn keyword ngxDirective proxy_send_lowat
260
313
  syn keyword ngxDirective proxy_send_timeout
261
314
  syn keyword ngxDirective proxy_set_body
262
315
  syn keyword ngxDirective proxy_set_header
316
+ syn keyword ngxDirective proxy_ssl_ciphers
317
+ syn keyword ngxDirective proxy_ssl_crl
318
+ syn keyword ngxDirective proxy_ssl_name
319
+ syn keyword ngxDirective proxy_ssl_protocols
320
+ syn keyword ngxDirective proxy_ssl_server_name
263
321
  syn keyword ngxDirective proxy_ssl_session_reuse
322
+ syn keyword ngxDirective proxy_ssl_trusted_certificate
323
+ syn keyword ngxDirective proxy_ssl_verify
324
+ syn keyword ngxDirective proxy_ssl_verify_depth
264
325
  syn keyword ngxDirective proxy_store
265
326
  syn keyword ngxDirective proxy_store_access
266
327
  syn keyword ngxDirective proxy_temp_file_write_size
267
328
  syn keyword ngxDirective proxy_temp_path
268
329
  syn keyword ngxDirective proxy_timeout
269
- syn keyword ngxDirective proxy_upstream_fail_timeout
270
- syn keyword ngxDirective proxy_upstream_max_fails
271
330
  syn keyword ngxDirective random_index
272
331
  syn keyword ngxDirective read_ahead
273
332
  syn keyword ngxDirective real_ip_header
333
+ syn keyword ngxDirective real_ip_recursive
274
334
  syn keyword ngxDirective recursive_error_pages
335
+ syn keyword ngxDirective referer_hash_bucket_size
336
+ syn keyword ngxDirective referer_hash_max_size
275
337
  syn keyword ngxDirective request_pool_size
276
338
  syn keyword ngxDirective reset_timedout_connection
277
339
  syn keyword ngxDirective resolver
@@ -282,6 +344,45 @@ syn keyword ngxDirective rtsig_overflow_test
282
344
  syn keyword ngxDirective rtsig_overflow_threshold
283
345
  syn keyword ngxDirective rtsig_signo
284
346
  syn keyword ngxDirective satisfy
347
+ syn keyword ngxDirective scgi_bind
348
+ syn keyword ngxDirective scgi_buffer_size
349
+ syn keyword ngxDirective scgi_buffering
350
+ syn keyword ngxDirective scgi_buffers
351
+ syn keyword ngxDirective scgi_busy_buffers_size
352
+ syn keyword ngxDirective scgi_cache
353
+ syn keyword ngxDirective scgi_cache_bypass
354
+ syn keyword ngxDirective scgi_cache_key
355
+ syn keyword ngxDirective scgi_cache_lock
356
+ syn keyword ngxDirective scgi_cache_lock_timeout
357
+ syn keyword ngxDirective scgi_cache_methods
358
+ syn keyword ngxDirective scgi_cache_min_uses
359
+ syn keyword ngxDirective scgi_cache_path
360
+ syn keyword ngxDirective scgi_cache_revalidate
361
+ syn keyword ngxDirective scgi_cache_use_stale
362
+ syn keyword ngxDirective scgi_cache_valid
363
+ syn keyword ngxDirective scgi_connect_timeout
364
+ syn keyword ngxDirective scgi_force_ranges
365
+ syn keyword ngxDirective scgi_hide_header
366
+ syn keyword ngxDirective scgi_ignore_client_abort
367
+ syn keyword ngxDirective scgi_ignore_headers
368
+ syn keyword ngxDirective scgi_intercept_errors
369
+ syn keyword ngxDirective scgi_max_temp_file_size
370
+ syn keyword ngxDirective scgi_next_upstream
371
+ syn keyword ngxDirective scgi_next_upstream_timeout
372
+ syn keyword ngxDirective scgi_next_upstream_tries
373
+ syn keyword ngxDirective scgi_no_cache
374
+ syn keyword ngxDirective scgi_param
375
+ syn keyword ngxDirective scgi_pass_header
376
+ syn keyword ngxDirective scgi_pass_request_body
377
+ syn keyword ngxDirective scgi_pass_request_headers
378
+ syn keyword ngxDirective scgi_read_timeout
379
+ syn keyword ngxDirective scgi_send_timeout
380
+ syn keyword ngxDirective scgi_store
381
+ syn keyword ngxDirective scgi_store_access
382
+ syn keyword ngxDirective scgi_temp_file_write_size
383
+ syn keyword ngxDirective scgi_temp_path
384
+ syn keyword ngxDirective secure_link
385
+ syn keyword ngxDirective secure_link_md5
285
386
  syn keyword ngxDirective secure_link_secret
286
387
  syn keyword ngxDirective send_lowat
287
388
  syn keyword ngxDirective send_timeout
@@ -296,31 +397,50 @@ syn keyword ngxDirective smtp_auth
296
397
  syn keyword ngxDirective smtp_capabilities
297
398
  syn keyword ngxDirective smtp_client_buffer
298
399
  syn keyword ngxDirective smtp_greeting_delay
299
- syn keyword ngxDirective so_keepalive
300
400
  syn keyword ngxDirective source_charset
401
+ syn keyword ngxDirective spdy_chunk_size
402
+ syn keyword ngxDirective spdy_headers_comp
403
+ syn keyword ngxDirective spdy_keepalive_timeout
404
+ syn keyword ngxDirective spdy_max_concurrent_streams
405
+ syn keyword ngxDirective spdy_pool_size
406
+ syn keyword ngxDirective spdy_recv_buffer_size
407
+ syn keyword ngxDirective spdy_recv_timeout
408
+ syn keyword ngxDirective spdy_streams_index_size
301
409
  syn keyword ngxDirective ssi
302
410
  syn keyword ngxDirective ssi_ignore_recycled_buffers
411
+ syn keyword ngxDirective ssi_last_modified
303
412
  syn keyword ngxDirective ssi_min_file_chunk
304
413
  syn keyword ngxDirective ssi_silent_errors
305
414
  syn keyword ngxDirective ssi_types
306
415
  syn keyword ngxDirective ssi_value_length
307
416
  syn keyword ngxDirective ssl
417
+ syn keyword ngxDirective ssl_buffer_size
308
418
  syn keyword ngxDirective ssl_certificate
309
419
  syn keyword ngxDirective ssl_certificate_key
310
420
  syn keyword ngxDirective ssl_ciphers
311
421
  syn keyword ngxDirective ssl_client_certificate
312
422
  syn keyword ngxDirective ssl_crl
313
423
  syn keyword ngxDirective ssl_dhparam
424
+ syn keyword ngxDirective ssl_ecdh_curve
314
425
  syn keyword ngxDirective ssl_engine
426
+ syn keyword ngxDirective ssl_password_file
315
427
  syn keyword ngxDirective ssl_prefer_server_ciphers
316
428
  syn keyword ngxDirective ssl_protocols
317
429
  syn keyword ngxDirective ssl_session_cache
430
+ syn keyword ngxDirective ssl_session_ticket_key
431
+ syn keyword ngxDirective ssl_session_tickets
318
432
  syn keyword ngxDirective ssl_session_timeout
433
+ syn keyword ngxDirective ssl_stapling
434
+ syn keyword ngxDirective ssl_stapling_file
435
+ syn keyword ngxDirective ssl_stapling_responder
436
+ syn keyword ngxDirective ssl_stapling_verify
437
+ syn keyword ngxDirective ssl_trusted_certificate
319
438
  syn keyword ngxDirective ssl_verify_client
320
439
  syn keyword ngxDirective ssl_verify_depth
321
440
  syn keyword ngxDirective starttls
322
441
  syn keyword ngxDirective stub_status
323
442
  syn keyword ngxDirective sub_filter
443
+ syn keyword ngxDirective sub_filter_last_modified
324
444
  syn keyword ngxDirective sub_filter_once
325
445
  syn keyword ngxDirective sub_filter_types
326
446
  syn keyword ngxDirective tcp_nodelay
@@ -342,9 +462,59 @@ syn keyword ngxDirective userid_name
342
462
  syn keyword ngxDirective userid_p3p
343
463
  syn keyword ngxDirective userid_path
344
464
  syn keyword ngxDirective userid_service
465
+ syn keyword ngxDirective uwsgi_bind
466
+ syn keyword ngxDirective uwsgi_buffer_size
467
+ syn keyword ngxDirective uwsgi_buffering
468
+ syn keyword ngxDirective uwsgi_buffers
469
+ syn keyword ngxDirective uwsgi_busy_buffers_size
470
+ syn keyword ngxDirective uwsgi_cache
471
+ syn keyword ngxDirective uwsgi_cache_bypass
472
+ syn keyword ngxDirective uwsgi_cache_key
473
+ syn keyword ngxDirective uwsgi_cache_lock
474
+ syn keyword ngxDirective uwsgi_cache_lock_timeout
475
+ syn keyword ngxDirective uwsgi_cache_methods
476
+ syn keyword ngxDirective uwsgi_cache_min_uses
477
+ syn keyword ngxDirective uwsgi_cache_path
478
+ syn keyword ngxDirective uwsgi_cache_revalidate
479
+ syn keyword ngxDirective uwsgi_cache_use_stale
480
+ syn keyword ngxDirective uwsgi_cache_valid
481
+ syn keyword ngxDirective uwsgi_connect_timeout
482
+ syn keyword ngxDirective uwsgi_force_ranges
483
+ syn keyword ngxDirective uwsgi_hide_header
484
+ syn keyword ngxDirective uwsgi_ignore_client_abort
485
+ syn keyword ngxDirective uwsgi_ignore_headers
486
+ syn keyword ngxDirective uwsgi_intercept_errors
487
+ syn keyword ngxDirective uwsgi_max_temp_file_size
488
+ syn keyword ngxDirective uwsgi_modifier1
489
+ syn keyword ngxDirective uwsgi_modifier2
490
+ syn keyword ngxDirective uwsgi_next_upstream
491
+ syn keyword ngxDirective uwsgi_next_upstream_timeout
492
+ syn keyword ngxDirective uwsgi_next_upstream_tries
493
+ syn keyword ngxDirective uwsgi_no_cache
494
+ syn keyword ngxDirective uwsgi_param
495
+ syn keyword ngxDirective uwsgi_pass_header
496
+ syn keyword ngxDirective uwsgi_pass_request_body
497
+ syn keyword ngxDirective uwsgi_pass_request_headers
498
+ syn keyword ngxDirective uwsgi_read_timeout
499
+ syn keyword ngxDirective uwsgi_send_timeout
500
+ syn keyword ngxDirective uwsgi_ssl_ciphers
501
+ syn keyword ngxDirective uwsgi_ssl_crl
502
+ syn keyword ngxDirective uwsgi_ssl_name
503
+ syn keyword ngxDirective uwsgi_ssl_protocols
504
+ syn keyword ngxDirective uwsgi_ssl_server_name
505
+ syn keyword ngxDirective uwsgi_ssl_session_reuse
506
+ syn keyword ngxDirective uwsgi_ssl_trusted_certificate
507
+ syn keyword ngxDirective uwsgi_ssl_verify
508
+ syn keyword ngxDirective uwsgi_ssl_verify_depth
509
+ syn keyword ngxDirective uwsgi_store
510
+ syn keyword ngxDirective uwsgi_store_access
511
+ syn keyword ngxDirective uwsgi_string
512
+ syn keyword ngxDirective uwsgi_temp_file_write_size
513
+ syn keyword ngxDirective uwsgi_temp_path
345
514
  syn keyword ngxDirective valid_referers
346
515
  syn keyword ngxDirective variables_hash_bucket_size
347
516
  syn keyword ngxDirective variables_hash_max_size
517
+ syn keyword ngxDirective worker_aio_requests
348
518
  syn keyword ngxDirective worker_connections
349
519
  syn keyword ngxDirective worker_cpu_affinity
350
520
  syn keyword ngxDirective worker_priority
@@ -356,6 +526,9 @@ syn keyword ngxDirective worker_threads
356
526
  syn keyword ngxDirective working_directory
357
527
  syn keyword ngxDirective xclient
358
528
  syn keyword ngxDirective xml_entities
529
+ syn keyword ngxDirective xslt_last_modified
530
+ syn keyword ngxDirective xslt_param
531
+ syn keyword ngxDirective xslt_string_param
359
532
  syn keyword ngxDirective xslt_stylesheet
360
533
  syn keyword ngxDirective xslt_types
361
534
 
@@ -367,7 +540,7 @@ syn keyword ngxDirective xslt_types
367
540
  syn keyword ngxDirectiveThirdParty set_from_accept_language
368
541
 
369
542
  " Access Key Module <http://wiki.nginx.org/NginxHttpAccessKeyModule>
370
- " Denies access unless the request URL contains an access key.
543
+ " Denies access unless the request URL contains an access key.
371
544
  syn keyword ngxDirectiveThirdParty accesskey
372
545
  syn keyword ngxDirectiveThirdParty accesskey_arg
373
546
  syn keyword ngxDirectiveThirdParty accesskey_hashmethod
@@ -521,7 +694,7 @@ syn keyword ngxDirectiveThirdParty mogilefs_send_timeout
521
694
  syn keyword ngxDirectiveThirdParty mogilefs_tracker
522
695
 
523
696
  " MP4 Streaming Lite Module <http://wiki.nginx.org/NginxMP4StreamingLite>
524
- " Will seek to a certain time within H.264/MP4 files when provided with a 'start' parameter in the URL.
697
+ " Will seek to a certain time within H.264/MP4 files when provided with a 'start' parameter in the URL.
525
698
  syn keyword ngxDirectiveThirdParty mp4
526
699
 
527
700
  " Nginx Notice Module <http://xph.us/software/nginx-notice/>
@@ -642,46 +815,6 @@ syn keyword ngxDirectiveThirdParty xss_get
642
815
  syn keyword ngxDirectiveThirdParty xss_input_types
643
816
  syn keyword ngxDirectiveThirdParty xss_output_type
644
817
 
645
- " uWSGI Module <http://wiki.nginx.org/HttpUwsgiModule>
646
- " Allows Nginx to interact with uWSGI processes and control what parameters are passed to the process.
647
- syn keyword ngxDirectiveThirdParty uwsgi_bind
648
- syn keyword ngxDirectiveThirdParty uwsgi_buffer_size
649
- syn keyword ngxDirectiveThirdParty uwsgi_buffering
650
- syn keyword ngxDirectiveThirdParty uwsgi_buffers
651
- syn keyword ngxDirectiveThirdParty uwsgi_busy_buffers_size
652
- syn keyword ngxDirectiveThirdParty uwsgi_cache
653
- syn keyword ngxDirectiveThirdParty uwsgi_cache_bypass
654
- syn keyword ngxDirectiveThirdParty uwsgi_cache_key
655
- syn keyword ngxDirectiveThirdParty uwsgi_cache_lock
656
- syn keyword ngxDirectiveThirdParty uwsgi_cache_lock_timeout
657
- syn keyword ngxDirectiveThirdParty uwsgi_cache_methods
658
- syn keyword ngxDirectiveThirdParty uwsgi_cache_min_uses
659
- syn keyword ngxDirectiveThirdParty uwsgi_cache_path
660
- syn keyword ngxDirectiveThirdParty uwsgi_cache_use_stale
661
- syn keyword ngxDirectiveThirdParty uwsgi_cache_valid
662
- syn keyword ngxDirectiveThirdParty uwsgi_connect_timeout
663
- syn keyword ngxDirectiveThirdParty uwsgi_hide_header
664
- syn keyword ngxDirectiveThirdParty uwsgi_ignore_client_abort
665
- syn keyword ngxDirectiveThirdParty uwsgi_ignore_headers
666
- syn keyword ngxDirectiveThirdParty uwsgi_intercept_errors
667
- syn keyword ngxDirectiveThirdParty uwsgi_max_temp_file_size
668
- syn keyword ngxDirectiveThirdParty uwsgi_modifier1
669
- syn keyword ngxDirectiveThirdParty uwsgi_modifier2
670
- syn keyword ngxDirectiveThirdParty uwsgi_next_upstream
671
- syn keyword ngxDirectiveThirdParty uwsgi_no_cache
672
- syn keyword ngxDirectiveThirdParty uwsgi_param
673
- syn keyword ngxDirectiveThirdParty uwsgi_pass
674
- syn keyword ngxDirectiveThirdParty uwsgi_pass_header
675
- syn keyword ngxDirectiveThirdParty uwsgi_pass_request_body
676
- syn keyword ngxDirectiveThirdParty uwsgi_pass_request_headers
677
- syn keyword ngxDirectiveThirdParty uwsgi_read_timeout
678
- syn keyword ngxDirectiveThirdParty uwsgi_send_timeout
679
- syn keyword ngxDirectiveThirdParty uwsgi_store
680
- syn keyword ngxDirectiveThirdParty uwsgi_store_access
681
- syn keyword ngxDirectiveThirdParty uwsgi_string
682
- syn keyword ngxDirectiveThirdParty uwsgi_temp_file_write_size
683
- syn keyword ngxDirectiveThirdParty uwsgi_temp_path
684
-
685
818
  " highlight
686
819
 
687
820
  hi link ngxComment Comment