Mercurial > hg > nginx-ranges
comparison src/http/ngx_http_core_module.h @ 396:77df96611112
Merge with current.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 05 Aug 2008 02:12:51 +0400 |
parents | 34fb3a573548 |
children | 6ebbca3d5ed7 |
comparison
equal
deleted
inserted
replaced
391:1d9bef53cd8e | 396:77df96611112 |
---|---|
263 ngx_array_t *types; | 263 ngx_array_t *types; |
264 ngx_hash_t types_hash; | 264 ngx_hash_t types_hash; |
265 ngx_str_t default_type; | 265 ngx_str_t default_type; |
266 | 266 |
267 off_t client_max_body_size; /* client_max_body_size */ | 267 off_t client_max_body_size; /* client_max_body_size */ |
268 off_t directio; /* directio */ | |
268 | 269 |
269 size_t client_body_buffer_size; /* client_body_buffer_size */ | 270 size_t client_body_buffer_size; /* client_body_buffer_size */ |
270 size_t send_lowat; /* send_lowat */ | 271 size_t send_lowat; /* send_lowat */ |
271 size_t postpone_output; /* postpone_output */ | 272 size_t postpone_output; /* postpone_output */ |
272 size_t limit_rate; /* limit_rate */ | 273 size_t limit_rate; /* limit_rate */ |
370 ngx_int_t ngx_http_core_post_access_phase(ngx_http_request_t *r, | 371 ngx_int_t ngx_http_core_post_access_phase(ngx_http_request_t *r, |
371 ngx_http_phase_handler_t *ph); | 372 ngx_http_phase_handler_t *ph); |
372 ngx_int_t ngx_http_core_content_phase(ngx_http_request_t *r, | 373 ngx_int_t ngx_http_core_content_phase(ngx_http_request_t *r, |
373 ngx_http_phase_handler_t *ph); | 374 ngx_http_phase_handler_t *ph); |
374 | 375 |
376 | |
377 void *ngx_http_test_content_type(ngx_http_request_t *r, ngx_hash_t *types_hash); | |
375 ngx_int_t ngx_http_set_content_type(ngx_http_request_t *r); | 378 ngx_int_t ngx_http_set_content_type(ngx_http_request_t *r); |
376 ngx_int_t ngx_http_set_exten(ngx_http_request_t *r); | 379 ngx_int_t ngx_http_set_exten(ngx_http_request_t *r); |
377 u_char *ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *name, | 380 u_char *ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *name, |
378 size_t *root_length, size_t reserved); | 381 size_t *root_length, size_t reserved); |
379 ngx_int_t ngx_http_auth_basic_user(ngx_http_request_t *r); | 382 ngx_int_t ngx_http_auth_basic_user(ngx_http_request_t *r); |