Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.h @ 362:54fad6c4b555 NGINX_0_6_25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.25 *) Change: now the "server_name_in_redirect" directive is used instead of the "server_name" directive's special "*" parameter. *) Change: now wildcard and regex names can be used as main name in a "server_name" directive. *) Change: the "satisfy_any" directive was replaced by the "satisfy" directive. *) Workaround: old worker processes might hog CPU after reconfiguration if they was run under Linux OpenVZ. *) Feature: the "min_delete_depth" directive. *) Bugfix: the COPY and MOVE methods did not work with single files. *) Bugfix: the ngx_http_gzip_static_module did not allow the ngx_http_dav_module to work; bug appeared in 0.6.23. *) Bugfix: socket leak in HTTPS mode if deferred accept was used. Thanks to Ben Maurer. *) Bugfix: nginx could not be built without PCRE library; bug appeared in 0.6.23.
author Igor Sysoev <http://sysoev.ru>
date Tue, 08 Jan 2008 00:00:00 +0300
parents 9121a0a91f47
children 6639b93e81b2
comparison
equal deleted inserted replaced
361:160660bad929 362:54fad6c4b555
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_SATISFY_ALL 0
28 #define NGX_HTTP_SATISFY_ANY 1
29
30
27 typedef struct { 31 typedef struct {
28 unsigned default_server:1; 32 unsigned default_server:1;
29 unsigned bind:1; 33 unsigned bind:1;
30 34
31 int backlog; 35 int backlog;
129 */ 133 */
130 ngx_array_t locations; 134 ngx_array_t locations;
131 135
132 unsigned regex_start:15; 136 unsigned regex_start:15;
133 unsigned named_start:15; 137 unsigned named_start:15;
134 unsigned wildcard:1;
135 138
136 /* array of the ngx_http_listen_t, "listen" directive */ 139 /* array of the ngx_http_listen_t, "listen" directive */
137 ngx_array_t listen; 140 ngx_array_t listen;
138 141
139 /* array of the ngx_http_server_name_t, "server_name" directive */ 142 /* array of the ngx_http_server_name_t, "server_name" directive */
285 288
286 ngx_resolver_t *resolver; /* resolver */ 289 ngx_resolver_t *resolver; /* resolver */
287 290
288 time_t keepalive_header; /* keepalive_timeout */ 291 time_t keepalive_header; /* keepalive_timeout */
289 292
290 ngx_flag_t satisfy_any; /* satisfy_any */ 293 ngx_uint_t satisfy; /* satisfy */
294
291 ngx_flag_t internal; /* internal */ 295 ngx_flag_t internal; /* internal */
292 ngx_flag_t client_body_in_file_only; /* client_body_in_file_only */ 296 ngx_flag_t client_body_in_file_only; /* client_body_in_file_only */
293 ngx_flag_t sendfile; /* sendfile */ 297 ngx_flag_t sendfile; /* sendfile */
294 ngx_flag_t tcp_nopush; /* tcp_nopush */ 298 ngx_flag_t tcp_nopush; /* tcp_nopush */
295 ngx_flag_t tcp_nodelay; /* tcp_nodelay */ 299 ngx_flag_t tcp_nodelay; /* tcp_nodelay */
296 ngx_flag_t reset_timedout_connection; /* reset_timedout_connection */ 300 ngx_flag_t reset_timedout_connection; /* reset_timedout_connection */
301 ngx_flag_t server_name_in_redirect; /* server_name_in_redirect */
297 ngx_flag_t port_in_redirect; /* port_in_redirect */ 302 ngx_flag_t port_in_redirect; /* port_in_redirect */
298 ngx_flag_t msie_padding; /* msie_padding */ 303 ngx_flag_t msie_padding; /* msie_padding */
299 ngx_flag_t msie_refresh; /* msie_refresh */ 304 ngx_flag_t msie_refresh; /* msie_refresh */
300 ngx_flag_t log_not_found; /* log_not_found */ 305 ngx_flag_t log_not_found; /* log_not_found */
301 ngx_flag_t recursive_error_pages; /* recursive_error_pages */ 306 ngx_flag_t recursive_error_pages; /* recursive_error_pages */
350 ngx_int_t ngx_http_set_content_type(ngx_http_request_t *r); 355 ngx_int_t ngx_http_set_content_type(ngx_http_request_t *r);
351 ngx_int_t ngx_http_set_exten(ngx_http_request_t *r); 356 ngx_int_t ngx_http_set_exten(ngx_http_request_t *r);
352 u_char *ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *name, 357 u_char *ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *name,
353 size_t *root_length, size_t reserved); 358 size_t *root_length, size_t reserved);
354 ngx_int_t ngx_http_auth_basic_user(ngx_http_request_t *r); 359 ngx_int_t ngx_http_auth_basic_user(ngx_http_request_t *r);
360 ngx_int_t ngx_http_server_addr(ngx_http_request_t *r, ngx_str_t *s);
355 #if (NGX_HTTP_GZIP) 361 #if (NGX_HTTP_GZIP)
356 ngx_int_t ngx_http_gzip_ok(ngx_http_request_t *r); 362 ngx_int_t ngx_http_gzip_ok(ngx_http_request_t *r);
357 #endif 363 #endif
358 364
359 365