nginx-vendor-current: src/http/ngx_http_core

comparison src/http/ngx_http_core_module.c @ 644:6f21ae02fb01 NGINX_1_1_6

nginx 1.1.6 *) Change in internal API: now module context data are cleared while internal redirect to named location. Requested by Yichun Zhang. *) Change: if a server in an upstream failed, only one request will be sent to it after fail_timeout; the server will be considered alive if it will successfully respond to the request. *) Change: now the 0x7F-0x1F characters are escaped as \xXX in an access_log. *) Feature: "proxy/fastcgi/scgi/uwsgi_ignore_headers" directives support the following additional values: X-Accel-Limit-Rate, X-Accel-Buffering, X-Accel-Charset. *) Feature: decrease of memory consumption if SSL is used. *) Bugfix: some UTF-8 characters were processed incorrectly. Thanks to Alexey Kuts. *) Bugfix: the ngx_http_rewrite_module directives specified at "server" level were executed twice if no matching locations were defined. *) Bugfix: a socket leak might occurred if "aio sendfile" was used. *) Bugfix: connections with fast clients might be closed after send_timeout if file AIO was used. *) Bugfix: in the ngx_http_autoindex_module. *) Bugfix: the module ngx_http_mp4_module did not support seeking on 32-bit platforms.

author	Igor Sysoev <http://sysoev.ru>
date	Mon, 17 Oct 2011 00:00:00 +0400
parents	d3cf6c6b0043
children	615b5ea36fc0

comparison

equal deleted inserted replaced

-:a4bb0b481f6c
+:6f21ae02fb01
 ngx_http_finalize_request(r, NGX_HTTP_REQUEST_ENTITY_TOO_LARGE);
 return NGX_OK;
 }
 if (rc == NGX_DONE) {
+ngx_http_clear_location(r);
 r->headers_out.location = ngx_list_push(&r->headers_out.headers);
 if (r->headers_out.location == NULL) {
 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
 return NGX_OK;
 }
 return NGX_HTTP_INTERNAL_SERVER_ERROR;
 }
 if (status >= NGX_HTTP_MOVED_PERMANENTLY && status <= NGX_HTTP_SEE_OTHER) {
+ngx_http_clear_location(r);
 r->headers_out.location = ngx_list_push(&r->headers_out.headers);
 if (r->headers_out.location == NULL) {
 return NGX_HTTP_INTERNAL_SERVER_ERROR;
 }
 name, &r->uri, &r->args);
 r->internal = 1;
 r->content_handler = NULL;
 r->loc_conf = (*clcfp)->loc_conf;
+/* clear the modules contexts */
+ngx_memzero(r->ctx, sizeof(void *) * ngx_http_max_module);
 ngx_http_update_location_config(r);
 cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
 ngx_hash_key_t  *type;
 value = cf->args->elts;
 if (ngx_strcmp(value[0].data, "include") == 0) {
+if (cf->args->nelts != 2) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"invalid number of arguments"
+" in \"include\" directive");
+return NGX_CONF_ERROR;
+}
 file = value[1];
 if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
 return NGX_CONF_ERROR;
 }
 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
 "duplicate extension \"%V\", "
 "content type: \"%V\", "
 "previous content type: \"%V\"",
 &value[i], content_type, old);
-continue;
+goto next;
 }
 }
 type = ngx_array_push(clcf->types);
 }
 type->key = value[i];
 type->key_hash = hash;
 type->value = content_type;
+next:
+continue;
 }
 return NGX_CONF_OK;
 }
 conf->types_hash_bucket_size = ngx_align(conf->types_hash_bucket_size,
 ngx_cacheline_size);
 /*
-* the special handling the "types" directive in the "http" section
+* the special handling of the "types" directive in the "http" section
 * to inherit the http's conf->types_hash to all servers
 */
 if (prev->types && prev->types_hash.buckets == NULL) {
 conf->types = prev->types;
 conf->types_hash = prev->types_hash;
 }
 if (conf->types == NULL) {
-conf->types = ngx_array_create(cf->pool, 4, sizeof(ngx_hash_key_t));
+conf->types = ngx_array_create(cf->pool, 3, sizeof(ngx_hash_key_t));
 if (conf->types == NULL) {
 return NGX_CONF_ERROR;
 }
 for (i = 0; ngx_http_core_default_types[i].key.len; i++) {
 types_hash.hash = &conf->types_hash;
 types_hash.key = ngx_hash_key_lc;
 types_hash.max_size = conf->types_hash_max_size;
 types_hash.bucket_size = conf->types_hash_bucket_size;
-types_hash.name = "mime_types_hash";
+types_hash.name = "types_hash";
 types_hash.pool = cf->pool;
 types_hash.temp_pool = NULL;
 if (ngx_hash_init(&types_hash, conf->types->elts, conf->types->nelts)
 != NGX_OK)
 ngx_conf_merge_uint_value(conf->satisfy, prev->satisfy,
 NGX_HTTP_SATISFY_ALL);
 ngx_conf_merge_uint_value(conf->if_modified_since, prev->if_modified_since,
 NGX_HTTP_IMS_EXACT);
 ngx_conf_merge_uint_value(conf->max_ranges, prev->max_ranges,
-0x7fffffff);
+NGX_MAX_INT32_VALUE);
 ngx_conf_merge_uint_value(conf->client_body_in_file_only,
-prev->client_body_in_file_only, 0);
+prev->client_body_in_file_only,
+NGX_HTTP_REQUEST_BODY_FILE_OFF);
 ngx_conf_merge_value(conf->client_body_in_single_buffer,
 prev->client_body_in_single_buffer, 0);
 ngx_conf_merge_value(conf->internal, prev->internal, 0);
 ngx_conf_merge_value(conf->sendfile, prev->sendfile, 0);
 ngx_conf_merge_size_value(conf->sendfile_max_chunk,
 prev->sendfile_max_chunk, 0);
 #if (NGX_HAVE_FILE_AIO)
-ngx_conf_merge_value(conf->aio, prev->aio, 0);
+ngx_conf_merge_value(conf->aio, prev->aio, NGX_HTTP_AIO_OFF);
 #endif
 ngx_conf_merge_size_value(conf->read_ahead, prev->read_ahead, 0);
 ngx_conf_merge_off_value(conf->directio, prev->directio,
-NGX_MAX_OFF_T_VALUE);
+NGX_OPEN_FILE_DIRECTIO_OFF);
 ngx_conf_merge_off_value(conf->directio_alignment, prev->directio_alignment,
 512);
 ngx_conf_merge_value(conf->tcp_nopush, prev->tcp_nopush, 0);
 ngx_conf_merge_value(conf->tcp_nodelay, prev->tcp_nodelay, 1);
 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
 "server name \"%V\" has suspicious symbols",
 &value[i]);
 }
-if (value[i].len == 1 && ch == '*') {
-ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"\"server_name *\" is unsupported, use "
-"\"server_name_in_redirect off\" instead");
-return NGX_CONF_ERROR;
-}
 sn = ngx_array_push(&cscf->server_names);
 if (sn == NULL) {
 return NGX_CONF_ERROR;
 }

Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 644:6f21ae02fb01 NGINX_1_1_6