Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http.c @ 372:6639b93e81b2 NGINX_0_6_30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.6.30 *) Change: now if an "include" directive pattern does not match any file, then nginx does not issue an error. *) Feature: now the time in directives may be specified without spaces, for example, "1h50m". *) Bugfix: memory leaks if the "ssl_verify_client" directive was on. Thanks to Chavelle Vincent. *) Bugfix: the "sub_filter" directive might set text to change into output. *) Bugfix: the "error_page" directive did not take into account arguments in redirected URI. *) Bugfix: now nginx always opens files in binary mode under Cygwin. *) Bugfix: nginx could not be built on OpenBSD; bug appeared in 0.6.15.
author Igor Sysoev <http://sysoev.ru>
date Tue, 29 Apr 2008 00:00:00 +0400
parents babd3d9efb62
children 820f6378fc00
comparison
equal deleted inserted replaced
371:b6a2a305fdad 372:6639b93e81b2
17 static ngx_int_t ngx_http_add_names(ngx_conf_t *cf, 17 static ngx_int_t ngx_http_add_names(ngx_conf_t *cf,
18 ngx_http_conf_in_addr_t *in_addr, ngx_http_core_srv_conf_t *cscf); 18 ngx_http_conf_in_addr_t *in_addr, ngx_http_core_srv_conf_t *cscf);
19 static char *ngx_http_merge_locations(ngx_conf_t *cf, 19 static char *ngx_http_merge_locations(ngx_conf_t *cf,
20 ngx_array_t *locations, void **loc_conf, ngx_http_module_t *module, 20 ngx_array_t *locations, void **loc_conf, ngx_http_module_t *module,
21 ngx_uint_t ctx_index); 21 ngx_uint_t ctx_index);
22 static int ngx_http_cmp_conf_in_addrs(const void *one, const void *two); 22 static ngx_int_t ngx_http_cmp_conf_in_addrs(const void *one, const void *two);
23 static int ngx_libc_cdecl ngx_http_cmp_dns_wildcards(const void *one, 23 static int ngx_libc_cdecl ngx_http_cmp_dns_wildcards(const void *one,
24 const void *two); 24 const void *two);
25 25
26 ngx_uint_t ngx_http_max_module; 26 ngx_uint_t ngx_http_max_module;
27 27
1087 1087
1088 return NGX_CONF_OK; 1088 return NGX_CONF_OK;
1089 } 1089 }
1090 1090
1091 1091
1092 static int 1092 static ngx_int_t
1093 ngx_http_cmp_conf_in_addrs(const void *one, const void *two) 1093 ngx_http_cmp_conf_in_addrs(const void *one, const void *two)
1094 { 1094 {
1095 ngx_http_conf_in_addr_t *first, *second; 1095 ngx_http_conf_in_addr_t *first, *second;
1096 1096
1097 first = (ngx_http_conf_in_addr_t *) one; 1097 first = (ngx_http_conf_in_addr_t *) one;