comparison src/http/ngx_http_core_module.h @ 539:5f4de8cf0d9d

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 15 Sep 2009 03:43:40 +0400
parents d41628eb4d0a
children f7ec98e3caeb
comparison
equal deleted inserted replaced
522:40fd8d7b82f9 539:5f4de8cf0d9d
22 #define NGX_HTTP_GZIP_PROXIED_NO_ETAG 0x0080 22 #define NGX_HTTP_GZIP_PROXIED_NO_ETAG 0x0080
23 #define NGX_HTTP_GZIP_PROXIED_AUTH 0x0100 23 #define NGX_HTTP_GZIP_PROXIED_AUTH 0x0100
24 #define NGX_HTTP_GZIP_PROXIED_ANY 0x0200 24 #define NGX_HTTP_GZIP_PROXIED_ANY 0x0200
25 25
26 26
27 #define NGX_HTTP_AIO_OFF 0
28 #define NGX_HTTP_AIO_ON 1
29 #define NGX_HTTP_AIO_SENDFILE 2
30
31
27 #define NGX_HTTP_SATISFY_ALL 0 32 #define NGX_HTTP_SATISFY_ALL 0
28 #define NGX_HTTP_SATISFY_ANY 1 33 #define NGX_HTTP_SATISFY_ANY 1
29 34
30 35
31 #define NGX_HTTP_IMS_OFF 0 36 #define NGX_HTTP_IMS_OFF 0
317 ngx_hash_t types_hash; 322 ngx_hash_t types_hash;
318 ngx_str_t default_type; 323 ngx_str_t default_type;
319 324
320 off_t client_max_body_size; /* client_max_body_size */ 325 off_t client_max_body_size; /* client_max_body_size */
321 off_t directio; /* directio */ 326 off_t directio; /* directio */
327 off_t directio_alignment; /* directio_alignment */
322 328
323 size_t client_body_buffer_size; /* client_body_buffer_size */ 329 size_t client_body_buffer_size; /* client_body_buffer_size */
324 size_t send_lowat; /* send_lowat */ 330 size_t send_lowat; /* send_lowat */
325 size_t postpone_output; /* postpone_output */ 331 size_t postpone_output; /* postpone_output */
326 size_t limit_rate; /* limit_rate */ 332 size_t limit_rate; /* limit_rate */
345 351
346 ngx_flag_t client_body_in_single_buffer; 352 ngx_flag_t client_body_in_single_buffer;
347 /* client_body_in_singe_buffer */ 353 /* client_body_in_singe_buffer */
348 ngx_flag_t internal; /* internal */ 354 ngx_flag_t internal; /* internal */
349 ngx_flag_t sendfile; /* sendfile */ 355 ngx_flag_t sendfile; /* sendfile */
356 #if (NGX_HAVE_FILE_AIO)
357 ngx_flag_t aio; /* aio */
358 #endif
350 ngx_flag_t tcp_nopush; /* tcp_nopush */ 359 ngx_flag_t tcp_nopush; /* tcp_nopush */
351 ngx_flag_t tcp_nodelay; /* tcp_nodelay */ 360 ngx_flag_t tcp_nodelay; /* tcp_nodelay */
352 ngx_flag_t reset_timedout_connection; /* reset_timedout_connection */ 361 ngx_flag_t reset_timedout_connection; /* reset_timedout_connection */
353 ngx_flag_t server_name_in_redirect; /* server_name_in_redirect */ 362 ngx_flag_t server_name_in_redirect; /* server_name_in_redirect */
354 ngx_flag_t port_in_redirect; /* port_in_redirect */ 363 ngx_flag_t port_in_redirect; /* port_in_redirect */