Mercurial > hg > nginx-vendor-current

comparison src/core/ngx_conf_file.c @ 686:2e8a942c8872 NGINX_1_3_6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.3.6 *) Feature: the ngx_http_gunzip_filter_module. *) Feature: the "memcached_gzip_flag" directive. *) Feature: the "always" parameter of the "gzip_static" directive. *) Bugfix: in the "limit_req" directive; the bug had appeared in 1.1.14. Thanks to Charles Chen. *) Bugfix: nginx could not be built by gcc 4.7 with -O2 optimization if the --with-ipv6 option was used.
author Igor Sysoev <http://sysoev.ru>
date Wed, 12 Sep 2012 00:00:00 +0400
parents 5cb5db9975ba
children 88a1b4797f2e
comparison
equal deleted inserted replaced
685:0a9f545d4f4b 686:2e8a942c8872
10 10
11 #define NGX_CONF_BUFFER 4096 11 #define NGX_CONF_BUFFER 4096
12 12
13 static ngx_int_t ngx_conf_handler(ngx_conf_t *cf, ngx_int_t last); 13 static ngx_int_t ngx_conf_handler(ngx_conf_t *cf, ngx_int_t last);
14 static ngx_int_t ngx_conf_read_token(ngx_conf_t *cf); 14 static ngx_int_t ngx_conf_read_token(ngx_conf_t *cf);
15 static char *ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
16 static ngx_int_t ngx_conf_test_full_name(ngx_str_t *name); 15 static ngx_int_t ngx_conf_test_full_name(ngx_str_t *name);
17 static void ngx_conf_flush_files(ngx_cycle_t *cycle); 16 static void ngx_conf_flush_files(ngx_cycle_t *cycle);
18 17
19 18
20 static ngx_command_t ngx_conf_commands[] = { 19 static ngx_command_t ngx_conf_commands[] = {
729 } 728 }
730 } 729 }
731 } 730 }
732 731
733 732
734 static char * 733 char *
735 ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) 734 ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
736 { 735 {
737 char *rv; 736 char *rv;
738 ngx_int_t n; 737 ngx_int_t n;
739 ngx_str_t *value, file, name; 738 ngx_str_t *value, file, name;