nginx-vendor-current: src/http/ngx_http_core

comparison src/http/ngx_http_core_module.c @ 546:e19e5f542878 NGINX_0_8_25

nginx 0.8.25 *) Change: now no message is written in an error log if a variable is not found by $r->variable() method. *) Feature: the ngx_http_degradation_module. *) Feature: regular expression named captures. *) Feature: now URI part is not required a "proxy_pass" directive if variables are used. *) Feature: now the "msie_padding" directive works for Chrome too. *) Bugfix: a segmentation fault occurred in a worker process on low memory condition; the bug had appeared in 0.8.18. *) Bugfix: nginx sent gzipped responses to clients those do not support gzip, if "gzip_static on" and "gzip_vary off"; the bug had appeared in 0.8.16.

author	Igor Sysoev <http://sysoev.ru>
date	Mon, 16 Nov 2009 00:00:00 +0300
parents	c04fa65fe604
children	ab7d265273ed

comparison

equal deleted inserted replaced

-:91e4b06e1a01
+:e19e5f542878
 if (r->unparsed_uri.len) {
 r->valid_unparsed_uri = 1;
 }
 r->valid_location = 1;
-r->gzip = 0;
+#if (NGX_HTTP_GZIP)
+r->gzip_tested = 0;
+r->gzip_ok = 0;
+r->gzip_vary = 0;
+#endif
 r->write_event_handler = ngx_http_core_run_phases;
 ngx_http_core_run_phases(r);
 }
 ngx_http_core_find_location(ngx_http_request_t *r)
 {
 ngx_int_t                  rc;
 ngx_http_core_loc_conf_t  *pclcf;
 #if (NGX_PCRE)
-ngx_int_t                  n, len;
+ngx_int_t                  n;
 ngx_uint_t                 noregex;
 ngx_http_core_loc_conf_t  *clcf, **clcfp;
 noregex = 0;
 #endif
 #if (NGX_PCRE)
 if (noregex == 0 && pclcf->regex_locations) {
-len = 0;
 for (clcfp = pclcf->regex_locations; *clcfp; clcfp++) {
 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 "test location: ~ \"%V\"", &(*clcfp)->name);
-if ((*clcfp)->captures) {
+n = ngx_http_regex_exec(r, (*clcfp)->regex, &r->uri);
-len = (NGX_HTTP_MAX_CAPTURES + 1) * 3;
+if (n == NGX_OK) {
+r->loc_conf = (*clcfp)->loc_conf;
-if (r->captures == NULL) {
-r->captures = ngx_palloc(r->pool, len * sizeof(int));
+/* look up nested locations */
-if (r->captures == NULL) {
-return NGX_ERROR;
+rc = ngx_http_core_find_location(r);
-}
-}
+return (rc == NGX_ERROR) ? rc : NGX_OK;
 }
-n = ngx_regex_exec((*clcfp)->regex, &r->uri, r->captures, len);
+if (n == NGX_DECLINED) {
-if (n == NGX_REGEX_NO_MATCHED) {
 continue;
 }
-if (n < 0) {
+return NGX_ERROR;
-ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-ngx_regex_exec_n
-" failed: %d on \"%V\" using \"%V\"",
-n, &r->uri, &(*clcfp)->name);
-return NGX_ERROR;
-}
-/* match */
-r->loc_conf = (*clcfp)->loc_conf;
-r->ncaptures = len;
-r->captures_data = r->uri.data;
-/* look up nested locations */
-rc = ngx_http_core_find_location(r);
-return (rc == NGX_ERROR) ? rc : NGX_OK;
 }
 }
 #endif
 return rc;
 } else {
 #if (NGX_PCRE)
 ngx_uint_t  captures;
-captures = alias && clcf->captures;
+captures = alias && clcf->regex;
 reserved += captures ? 1 : r->uri.len - alias + 1;
 #else
 reserved += r->uri.len - alias + 1;
 #endif
 ngx_uint_t                 p;
 ngx_array_t               *cc;
 ngx_table_elt_t           *e, *d;
 ngx_http_core_loc_conf_t  *clcf;
-if (r->gzip == 1) {
+r->gzip_tested = 1;
-return NGX_OK;
-}
-if (r->gzip == 2) {
-return NGX_DECLINED;
-}
-r->gzip = 2;
 if (r != r->main
 || r->headers_in.accept_encoding == NULL
 || ngx_strcasestrn(r->headers_in.accept_encoding->value.data,
 "gzip", 4 - 1)
 }
 }
 #endif
-r->gzip = 1;
+r->gzip_ok = 1;
 return NGX_OK;
 }
 #endif
 static ngx_int_t
 ngx_http_core_regex_location(ngx_conf_t *cf, ngx_http_core_loc_conf_t *clcf,
 ngx_str_t *regex, ngx_uint_t caseless)
 {
 #if (NGX_PCRE)
-ngx_str_t  err;
+ngx_regex_compile_t  rc;
-u_char     errstr[NGX_MAX_CONF_ERRSTR];
+u_char               errstr[NGX_MAX_CONF_ERRSTR];
-err.len = NGX_MAX_CONF_ERRSTR;
+ngx_memzero(&rc, sizeof(ngx_regex_compile_t));
-err.data = errstr;
+rc.pattern = *regex;
+rc.err.len = NGX_MAX_CONF_ERRSTR;
+rc.err.data = errstr;
 #if (NGX_HAVE_CASELESS_FILESYSTEM)
-caseless = 1;
+rc.options = NGX_REGEX_CASELESS;
 #endif
-clcf->regex = ngx_regex_compile(regex, caseless ? NGX_REGEX_CASELESS: 0,
+clcf->regex = ngx_http_regex_compile(cf, &rc);
-cf->pool, &err);
 if (clcf->regex == NULL) {
-ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%s", err.data);
 return NGX_ERROR;
 }
 clcf->name = *regex;
-clcf->captures = (ngx_regex_capture_count(clcf->regex) > 0);
 return NGX_OK;
 #else
 static char *
 ngx_http_core_types(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-ngx_http_core_loc_conf_t *lcf = conf;
+ngx_http_core_loc_conf_t *clcf = conf;
 char        *rv;
 ngx_conf_t   save;
-if (lcf->types == NULL) {
+if (clcf->types == NULL) {
-lcf->types = ngx_array_create(cf->pool, 64, sizeof(ngx_hash_key_t));
+clcf->types = ngx_array_create(cf->pool, 64, sizeof(ngx_hash_key_t));
-if (lcf->types == NULL) {
+if (clcf->types == NULL) {
 return NGX_CONF_ERROR;
 }
 }
 save = *cf;
 static char *
 ngx_http_core_type(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
 {
-ngx_http_core_loc_conf_t *lcf = conf;
+ngx_http_core_loc_conf_t *clcf = conf;
 ngx_str_t       *value, *content_type, *old, file;
 ngx_uint_t       i, n, hash;
 ngx_hash_key_t  *type;
 for (i = 1; i < cf->args->nelts; i++) {
 hash = ngx_hash_strlow(value[i].data, value[i].data, value[i].len);
-type = lcf->types->elts;
+type = clcf->types->elts;
-for (n = 0; n < lcf->types->nelts; n++) {
+for (n = 0; n < clcf->types->nelts; n++) {
 if (ngx_strcmp(value[i].data, type[n].key.data) == 0) {
 old = type[n].value;
 type[n].value = content_type;
 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
 continue;
 }
 }
-type = ngx_array_push(lcf->types);
+type = ngx_array_push(clcf->types);
 if (type == NULL) {
 return NGX_CONF_ERROR;
 }
 type->key = value[i];
 static void *
 ngx_http_core_create_loc_conf(ngx_conf_t *cf)
 {
-ngx_http_core_loc_conf_t  *lcf;
+ngx_http_core_loc_conf_t  *clcf;
-lcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_loc_conf_t));
+clcf = ngx_pcalloc(cf->pool, sizeof(ngx_http_core_loc_conf_t));
-if (lcf == NULL) {
+if (clcf == NULL) {
 return NULL;
 }
 /*
 * set by ngx_pcalloc():
 *
-*     lcf->root = { 0, NULL };
+*     clcf->root = { 0, NULL };
-*     lcf->limit_except = 0;
+*     clcf->limit_except = 0;
-*     lcf->post_action = { 0, NULL };
+*     clcf->post_action = { 0, NULL };
-*     lcf->types = NULL;
+*     clcf->types = NULL;
-*     lcf->default_type = { 0, NULL };
+*     clcf->default_type = { 0, NULL };
-*     lcf->error_log = NULL;
+*     clcf->error_log = NULL;
-*     lcf->error_pages = NULL;
+*     clcf->error_pages = NULL;
-*     lcf->try_files = NULL;
+*     clcf->try_files = NULL;
-*     lcf->client_body_path = NULL;
+*     clcf->client_body_path = NULL;
-*     lcf->regex = NULL;
+*     clcf->regex = NULL;
-*     lcf->exact_match = 0;
+*     clcf->exact_match = 0;
-*     lcf->auto_redirect = 0;
+*     clcf->auto_redirect = 0;
-*     lcf->alias = 0;
+*     clcf->alias = 0;
-*     lcf->gzip_proxied = 0;
+*     clcf->gzip_proxied = 0;
 */
-lcf->client_max_body_size = NGX_CONF_UNSET;
+clcf->client_max_body_size = NGX_CONF_UNSET;
-lcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE;
+clcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE;
-lcf->client_body_timeout = NGX_CONF_UNSET_MSEC;
+clcf->client_body_timeout = NGX_CONF_UNSET_MSEC;
-lcf->satisfy = NGX_CONF_UNSET_UINT;
+clcf->satisfy = NGX_CONF_UNSET_UINT;
-lcf->if_modified_since = NGX_CONF_UNSET_UINT;
+clcf->if_modified_since = NGX_CONF_UNSET_UINT;
-lcf->client_body_in_file_only = NGX_CONF_UNSET_UINT;
+clcf->client_body_in_file_only = NGX_CONF_UNSET_UINT;
-lcf->client_body_in_single_buffer = NGX_CONF_UNSET;
+clcf->client_body_in_single_buffer = NGX_CONF_UNSET;
-lcf->internal = NGX_CONF_UNSET;
+clcf->internal = NGX_CONF_UNSET;
-lcf->sendfile = NGX_CONF_UNSET;
+clcf->sendfile = NGX_CONF_UNSET;
-lcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE;
+clcf->sendfile_max_chunk = NGX_CONF_UNSET_SIZE;
 #if (NGX_HAVE_FILE_AIO)
-lcf->aio = NGX_CONF_UNSET;
+clcf->aio = NGX_CONF_UNSET;
 #endif
-lcf->read_ahead = NGX_CONF_UNSET_SIZE;
+clcf->read_ahead = NGX_CONF_UNSET_SIZE;
-lcf->directio = NGX_CONF_UNSET;
+clcf->directio = NGX_CONF_UNSET;
-lcf->directio_alignment = NGX_CONF_UNSET;
+clcf->directio_alignment = NGX_CONF_UNSET;
-lcf->tcp_nopush = NGX_CONF_UNSET;
+clcf->tcp_nopush = NGX_CONF_UNSET;
-lcf->tcp_nodelay = NGX_CONF_UNSET;
+clcf->tcp_nodelay = NGX_CONF_UNSET;
-lcf->send_timeout = NGX_CONF_UNSET_MSEC;
+clcf->send_timeout = NGX_CONF_UNSET_MSEC;
-lcf->send_lowat = NGX_CONF_UNSET_SIZE;
+clcf->send_lowat = NGX_CONF_UNSET_SIZE;
-lcf->postpone_output = NGX_CONF_UNSET_SIZE;
+clcf->postpone_output = NGX_CONF_UNSET_SIZE;
-lcf->limit_rate = NGX_CONF_UNSET_SIZE;
+clcf->limit_rate = NGX_CONF_UNSET_SIZE;
-lcf->limit_rate_after = NGX_CONF_UNSET_SIZE;
+clcf->limit_rate_after = NGX_CONF_UNSET_SIZE;
-lcf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
+clcf->keepalive_timeout = NGX_CONF_UNSET_MSEC;
-lcf->keepalive_header = NGX_CONF_UNSET;
+clcf->keepalive_header = NGX_CONF_UNSET;
-lcf->keepalive_requests = NGX_CONF_UNSET_UINT;
+clcf->keepalive_requests = NGX_CONF_UNSET_UINT;
-lcf->lingering_time = NGX_CONF_UNSET_MSEC;
+clcf->lingering_time = NGX_CONF_UNSET_MSEC;
-lcf->lingering_timeout = NGX_CONF_UNSET_MSEC;
+clcf->lingering_timeout = NGX_CONF_UNSET_MSEC;
-lcf->resolver_timeout = NGX_CONF_UNSET_MSEC;
+clcf->resolver_timeout = NGX_CONF_UNSET_MSEC;
-lcf->reset_timedout_connection = NGX_CONF_UNSET;
+clcf->reset_timedout_connection = NGX_CONF_UNSET;
-lcf->server_name_in_redirect = NGX_CONF_UNSET;
+clcf->server_name_in_redirect = NGX_CONF_UNSET;
-lcf->port_in_redirect = NGX_CONF_UNSET;
+clcf->port_in_redirect = NGX_CONF_UNSET;
-lcf->msie_padding = NGX_CONF_UNSET;
+clcf->msie_padding = NGX_CONF_UNSET;
-lcf->msie_refresh = NGX_CONF_UNSET;
+clcf->msie_refresh = NGX_CONF_UNSET;
-lcf->log_not_found = NGX_CONF_UNSET;
+clcf->log_not_found = NGX_CONF_UNSET;
-lcf->log_subrequest = NGX_CONF_UNSET;
+clcf->log_subrequest = NGX_CONF_UNSET;
-lcf->recursive_error_pages = NGX_CONF_UNSET;
+clcf->recursive_error_pages = NGX_CONF_UNSET;
-lcf->server_tokens = NGX_CONF_UNSET;
+clcf->server_tokens = NGX_CONF_UNSET;
-lcf->types_hash_max_size = NGX_CONF_UNSET_UINT;
+clcf->types_hash_max_size = NGX_CONF_UNSET_UINT;
-lcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT;
+clcf->types_hash_bucket_size = NGX_CONF_UNSET_UINT;
-lcf->open_file_cache = NGX_CONF_UNSET_PTR;
+clcf->open_file_cache = NGX_CONF_UNSET_PTR;
-lcf->open_file_cache_valid = NGX_CONF_UNSET;
+clcf->open_file_cache_valid = NGX_CONF_UNSET;
-lcf->open_file_cache_min_uses = NGX_CONF_UNSET_UINT;
+clcf->open_file_cache_min_uses = NGX_CONF_UNSET_UINT;
-lcf->open_file_cache_errors = NGX_CONF_UNSET;
+clcf->open_file_cache_errors = NGX_CONF_UNSET;
-lcf->open_file_cache_events = NGX_CONF_UNSET;
+clcf->open_file_cache_events = NGX_CONF_UNSET;
 #if (NGX_HTTP_GZIP)
-lcf->gzip_vary = NGX_CONF_UNSET;
+clcf->gzip_vary = NGX_CONF_UNSET;
-lcf->gzip_http_version = NGX_CONF_UNSET_UINT;
+clcf->gzip_http_version = NGX_CONF_UNSET_UINT;
 #if (NGX_PCRE)
-lcf->gzip_disable = NGX_CONF_UNSET_PTR;
+clcf->gzip_disable = NGX_CONF_UNSET_PTR;
-lcf->gzip_disable_msie6 = 3;
+clcf->gzip_disable_msie6 = 3;
 #endif
 #endif
-return lcf;
+return clcf;
 }
 static ngx_str_t  ngx_http_core_text_html_type = ngx_string("text/html");
 static ngx_str_t  ngx_http_core_image_gif_type = ngx_string("image/gif");
 continue;
 }
 #if (NGX_PCRE)
 {
-ngx_str_t  err;
+ngx_regex_compile_t  rc;
-u_char     errstr[NGX_MAX_CONF_ERRSTR];
+u_char               errstr[NGX_MAX_CONF_ERRSTR];
 if (value[i].len == 1) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "empty regex in server name \"%V\"", &value[i]);
 return NGX_CONF_ERROR;
 }
-err.len = NGX_MAX_CONF_ERRSTR;
-err.data = errstr;
 value[i].len--;
 value[i].data++;
-sn->regex = ngx_regex_compile(&value[i], 0, cf->pool, &err);
+ngx_memzero(&rc, sizeof(ngx_regex_compile_t));
+rc.pattern = value[i];
+rc.err.len = NGX_MAX_CONF_ERRSTR;
+rc.err.data = errstr;
+sn->regex = ngx_http_regex_compile(cf, &rc);
 if (sn->regex == NULL) {
-ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%s", err.data);
 return NGX_CONF_ERROR;
 }
 sn->name = value[i];
-cscf->captures = (ngx_regex_capture_count(sn->regex) > 0);
+cscf->captures = (rc.captures > 0);
 }
 #else
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "the using of the regex \"%V\" "
 "requires PCRE library", &value[i]);
 static char *
 ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-ngx_http_core_loc_conf_t *lcf = conf;
+ngx_http_core_loc_conf_t *clcf = conf;
 ngx_str_t                  *value;
 ngx_uint_t                  alias, n;
 ngx_http_script_compile_t   sc;
 alias = (cmd->name.len == sizeof("alias") - 1) ? 1 : 0;
-if (lcf->root.data) {
+if (clcf->root.data) {
 /* the (ngx_uint_t) cast is required by gcc 2.7.2.3 */
-if ((ngx_uint_t) lcf->alias == alias) {
+if ((ngx_uint_t) clcf->alias == alias) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "\"%V\" directive is duplicate",
 &cmd->name);
 } else {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "\"%V\" directive is duplicate, "
 "\"%s\" directive is specified before",
-&cmd->name, lcf->alias ? "alias" : "root");
+&cmd->name, clcf->alias ? "alias" : "root");
 }
 return NGX_CONF_ERROR;
 }
-if (lcf->named && alias) {
+if (clcf->named && alias) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "the \"alias\" directive may not be used "
 "inside named location");
 return NGX_CONF_ERROR;
 &cmd->name);
 return NGX_CONF_ERROR;
 }
-lcf->alias = alias;
+clcf->alias = alias;
-lcf->root = value[1];
+clcf->root = value[1];
-if (!alias && lcf->root.data[lcf->root.len - 1] == '/') {
+if (!alias && clcf->root.data[clcf->root.len - 1] == '/') {
-lcf->root.len--;
+clcf->root.len--;
 }
-if (lcf->root.data[0] != '$') {
+if (clcf->root.data[0] != '$') {
-if (ngx_conf_full_name(cf->cycle, &lcf->root, 0) != NGX_OK) {
+if (ngx_conf_full_name(cf->cycle, &clcf->root, 0) != NGX_OK) {
 return NGX_CONF_ERROR;
 }
 }
-n = ngx_http_script_variables_count(&lcf->root);
+n = ngx_http_script_variables_count(&clcf->root);
 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t));
 if (n) {
 sc.cf = cf;
-sc.source = &lcf->root;
+sc.source = &clcf->root;
-sc.lengths = &lcf->root_lengths;
+sc.lengths = &clcf->root_lengths;
-sc.values = &lcf->root_values;
+sc.values = &clcf->root_values;
 sc.variables = n;
 sc.complete_lengths = 1;
 sc.complete_values = 1;
 if (ngx_http_script_compile(&sc) != NGX_OK) {
 return NGX_CONF_ERROR;
 }
 }
-#if (NGX_PCRE)
-if (alias && lcf->regex
-&& (ngx_regex_capture_count(lcf->regex) <= 0 || sc.ncaptures == 0))
-{
-ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"the \"alias\" directive must use captures "
-"inside location given by regular expression");
-return NGX_CONF_ERROR;
-}
-#endif
 return NGX_CONF_OK;
 }
 static char *
 ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-ngx_http_core_loc_conf_t *lcf = conf;
+ngx_http_core_loc_conf_t *clcf = conf;
 u_char                            *p;
 ngx_int_t                          overwrite;
 ngx_str_t                         *value, uri, args;
 ngx_uint_t                         i, n;
 ngx_http_err_page_t               *err;
 ngx_http_complex_value_t           cv;
 ngx_http_compile_complex_value_t   ccv;
-if (lcf->error_pages == NULL) {
+if (clcf->error_pages == NULL) {
-lcf->error_pages = ngx_array_create(cf->pool, 4,
+clcf->error_pages = ngx_array_create(cf->pool, 4,
 sizeof(ngx_http_err_page_t));
-if (lcf->error_pages == NULL) {
+if (clcf->error_pages == NULL) {
 return NGX_CONF_ERROR;
 }
 }
 value = cf->args->elts;
 args.data = p;
 }
 }
 for (i = 1; i < cf->args->nelts - n; i++) {
-err = ngx_array_push(lcf->error_pages);
+err = ngx_array_push(clcf->error_pages);
 if (err == NULL) {
 return NGX_CONF_ERROR;
 }
 err->status = ngx_atoi(value[i].data, value[i].len);
 static char *
 ngx_http_core_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-ngx_http_core_loc_conf_t *lcf = conf;
+ngx_http_core_loc_conf_t *clcf = conf;
 time_t       inactive;
 ngx_str_t   *value, s;
 ngx_int_t    max;
 ngx_uint_t   i;
-if (lcf->open_file_cache != NGX_CONF_UNSET_PTR) {
+if (clcf->open_file_cache != NGX_CONF_UNSET_PTR) {
 return "is duplicate";
 }
 value = cf->args->elts;
 continue;
 }
 if (ngx_strcmp(value[i].data, "off") == 0) {
-lcf->open_file_cache = NULL;
+clcf->open_file_cache = NULL;
 continue;
 }
 failed:
 "invalid \"open_file_cache\" parameter \"%V\"",
 &value[i]);
 return NGX_CONF_ERROR;
 }
-if (lcf->open_file_cache == NULL) {
+if (clcf->open_file_cache == NULL) {
 return NGX_CONF_OK;
 }
 if (max == 0) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "\"open_file_cache\" must have \"max\" parameter");
 return NGX_CONF_ERROR;
 }
-lcf->open_file_cache = ngx_open_file_cache_init(cf->pool, max, inactive);
+clcf->open_file_cache = ngx_open_file_cache_init(cf->pool, max, inactive);
-if (lcf->open_file_cache) {
+if (clcf->open_file_cache) {
 return NGX_CONF_OK;
 }
 return NGX_CONF_ERROR;
 }
 static char *
 ngx_http_core_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-ngx_http_core_loc_conf_t *lcf = conf;
+ngx_http_core_loc_conf_t *clcf = conf;
 ngx_str_t  *value;
-if (lcf->error_log) {
+if (clcf->error_log) {
 return "is duplicate";
 }
 value = cf->args->elts;
-lcf->error_log = ngx_log_create(cf->cycle, &value[1]);
+clcf->error_log = ngx_log_create(cf->cycle, &value[1]);
-if (lcf->error_log == NULL) {
+if (clcf->error_log == NULL) {
 return NGX_CONF_ERROR;
 }
 if (cf->args->nelts == 2) {
-lcf->error_log->log_level = NGX_LOG_ERR;
+clcf->error_log->log_level = NGX_LOG_ERR;
 return NGX_CONF_OK;
 }
-return ngx_log_set_levels(cf, lcf->error_log);
+return ngx_log_set_levels(cf, clcf->error_log);
 }
 static char *
 ngx_http_core_keepalive(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-ngx_http_core_loc_conf_t *lcf = conf;
+ngx_http_core_loc_conf_t *clcf = conf;
 ngx_str_t  *value;
-if (lcf->keepalive_timeout != NGX_CONF_UNSET_MSEC) {
+if (clcf->keepalive_timeout != NGX_CONF_UNSET_MSEC) {
 return "is duplicate";
 }
 value = cf->args->elts;
-lcf->keepalive_timeout = ngx_parse_time(&value[1], 0);
+clcf->keepalive_timeout = ngx_parse_time(&value[1], 0);
-if (lcf->keepalive_timeout == (ngx_msec_t) NGX_ERROR) {
+if (clcf->keepalive_timeout == (ngx_msec_t) NGX_ERROR) {
 return "invalid value";
 }
-if (lcf->keepalive_timeout == (ngx_msec_t) NGX_PARSE_LARGE_TIME) {
+if (clcf->keepalive_timeout == (ngx_msec_t) NGX_PARSE_LARGE_TIME) {
 return "value must be less than 597 hours";
 }
 if (cf->args->nelts == 2) {
 return NGX_CONF_OK;
 }
-lcf->keepalive_header = ngx_parse_time(&value[2], 1);
+clcf->keepalive_header = ngx_parse_time(&value[2], 1);
-if (lcf->keepalive_header == NGX_ERROR) {
+if (clcf->keepalive_header == NGX_ERROR) {
 return "invalid value";
 }
-if (lcf->keepalive_header == NGX_PARSE_LARGE_TIME) {
+if (clcf->keepalive_header == NGX_PARSE_LARGE_TIME) {
 return "value must be less than 68 years";
 }
 return NGX_CONF_OK;
 }
 static char *
 ngx_http_core_internal(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
-ngx_http_core_loc_conf_t *lcf = conf;
+ngx_http_core_loc_conf_t *clcf = conf;
-if (lcf->internal != NGX_CONF_UNSET) {
+if (clcf->internal != NGX_CONF_UNSET) {
 return "is duplicate";
 }
-lcf->internal = 1;
+clcf->internal = 1;
 return NGX_CONF_OK;
 }
 {
 ngx_http_core_loc_conf_t  *clcf = conf;
 #if (NGX_PCRE)
-ngx_str_t         err, *value;
+ngx_str_t            *value;
-ngx_uint_t        i;
+ngx_uint_t            i;
-ngx_regex_elt_t  *re;
+ngx_regex_elt_t      *re;
-u_char            errstr[NGX_MAX_CONF_ERRSTR];
+ngx_regex_compile_t   rc;
+u_char                errstr[NGX_MAX_CONF_ERRSTR];
 if (clcf->gzip_disable == NGX_CONF_UNSET_PTR) {
 clcf->gzip_disable = ngx_array_create(cf->pool, 2,
 sizeof(ngx_regex_elt_t));
 if (clcf->gzip_disable == NULL) {
 }
 }
 value = cf->args->elts;
-err.len = NGX_MAX_CONF_ERRSTR;
+ngx_memzero(&rc, sizeof(ngx_regex_compile_t));
-err.data = errstr;
+rc.pool = cf->pool;
+rc.err.len = NGX_MAX_CONF_ERRSTR;
+rc.err.data = errstr;
 for (i = 1; i < cf->args->nelts; i++) {
 if (ngx_strcmp(value[1].data, "msie6") == 0) {
 clcf->gzip_disable_msie6 = 1;
 re = ngx_array_push(clcf->gzip_disable);
 if (re == NULL) {
 return NGX_CONF_ERROR;
 }
-re->regex = ngx_regex_compile(&value[i], NGX_REGEX_CASELESS, cf->pool,
+rc.pattern = value[1];
-&err);
+rc.options = NGX_REGEX_CASELESS;
-if (re->regex == NULL) {
+if (ngx_regex_compile(&rc) != NGX_OK) {
-ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%s", err.data);
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "%V", &rc.err);
 return NGX_CONF_ERROR;
 }
+re->regex = rc.regex;
 re->name = value[i].data;
 }
 return NGX_CONF_OK;

Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 546:e19e5f542878 NGINX_0_8_25