nginx-vendor-1-0: src/http/ngx_http_core

comparison src/http/ngx_http_core_module.c @ 638:692f4d4d7f10 NGINX_1_0_9

nginx 1.0.9 *) Change: now the 0x7F-0x1F characters are escaped as \xXX in an access_log. *) Change: now SIGWINCH signal works only in daemon mode. *) 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. *) Feature: accept filters are now supported on NetBSD. *) Feature: the "uwsgi_buffering" and "scgi_buffering" directives. Thanks to Peter Smit. *) Bugfix: a segmentation fault occurred on start or while reconfiguration if the "ssl" directive was used at http level and there was no "ssl_certificate" defined. *) 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. *) Bugfix: non-cacheable responses might be cached if "proxy_cache_bypass" directive was used. Thanks to John Ferlito. *) Bugfix: cached responses with an empty body were returned incorrectly; the bug had appeared in 0.8.31. *) Bugfix: 201 responses of the ngx_http_dav_module were incorrect; the bug had appeared in 0.8.32. *) Bugfix: in the "return" directive. *) Bugfix: the "ssl_verify_client", "ssl_verify_depth", and "ssl_prefer_server_ciphers" directives might work incorrectly if SNI was used.

author	Igor Sysoev <http://sysoev.ru>
date	Tue, 01 Nov 2011 00:00:00 +0400
parents	0d6525917227
children	1b80544421e8

comparison

equal deleted inserted replaced

-:ea7441793bba
+:692f4d4d7f10
 offsetof(ngx_http_core_loc_conf_t, client_body_in_single_buffer),
 NULL },
 { ngx_string("sendfile"),
 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
-|NGX_CONF_TAKE1,
+|NGX_CONF_FLAG,
 ngx_conf_set_flag_slot,
 NGX_HTTP_LOC_CONF_OFFSET,
 offsetof(ngx_http_core_loc_conf_t, sendfile),
 NULL },
 NGX_HTTP_LOC_CONF_OFFSET,
 offsetof(ngx_http_core_loc_conf_t, max_ranges),
 NULL },
 { ngx_string("chunked_transfer_encoding"),
-NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
 ngx_conf_set_flag_slot,
 NGX_HTTP_LOC_CONF_OFFSET,
 offsetof(ngx_http_core_loc_conf_t, chunked_transfer_encoding),
 NULL },
 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;
 }
 test_dir = tf->test_dir;
 tf++;
 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-"try to use %s: \"%s\" \"%s\"",
+"trying to use %s: \"%s\" \"%s\"",
 test_dir ? "dir" : "file", name, path.data);
 if (tf->lengths == NULL && tf->name.len == 0) {
 if (tf->code) {
 ngx_int_t     rc;
 ngx_str_t     val;
 ngx_buf_t    *b;
 ngx_chain_t   out;
+if (ngx_http_discard_request_body(r) != NGX_OK) {
+return NGX_HTTP_INTERNAL_SERVER_ERROR;
+}
 r->headers_out.status = status;
-if (status == NGX_HTTP_NO_CONTENT) {
-r->header_only = 1;
-return ngx_http_send_header(r);
-}
 if (ngx_http_complex_value(r, cv, &val) != 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;
 }
 alias = clcf->alias;
 if (alias && !r->valid_location) {
 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-"\"alias\" could not be used in location \"%V\" "
+"\"alias\" cannot be used in location \"%V\" "
 "where URI was rewritten", &clcf->name);
 return NULL;
 }
 if (clcf->root_lengths == NULL) {
 r->uri_changes--;
 if (r->uri_changes == 0) {
 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
 "rewrite or internal redirection cycle "
-"while internal redirect to \"%V\"", uri);
+"while internally redirecting to \"%V\"", uri);
 r->main->count++;
 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
 return NGX_DONE;
 }
 clcf->prev_location = pclcf;
 #endif
 if (pclcf->exact_match) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"location \"%V\" could not be inside "
+"location \"%V\" cannot be inside "
 "the exact location \"%V\"",
 &clcf->name, &pclcf->name);
 return NGX_CONF_ERROR;
 }
 if (pclcf->named) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"location \"%V\" could not be inside "
+"location \"%V\" cannot be inside "
 "the named location \"%V\"",
 &clcf->name, &pclcf->name);
 return NGX_CONF_ERROR;
 }
 if (clcf->named) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"named location \"%V\" must be "
+"named location \"%V\" can be "
-"on server level only",
+"on the server level only",
 &clcf->name);
 return NGX_CONF_ERROR;
 }
 len = pclcf->name.len;
 return NGX_OK;
 #else
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"the using of the regex \"%V\" requires PCRE library",
+"using regex \"%V\" requires PCRE library",
 regex);
 return NGX_ERROR;
 #endif
 }
 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;
 }
 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,
-"duplicate extention \"%V\", "
+"duplicate extension \"%V\", "
 "content type: \"%V\", "
-"old 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;
 }
 4, 8192);
 if (conf->large_client_header_buffers.size < conf->connection_pool_size) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "the \"large_client_header_buffers\" size must be "
-"equal to or bigger than \"connection_pool_size\"");
+"equal to or greater than \"connection_pool_size\"");
 return NGX_CONF_ERROR;
 }
 ngx_conf_merge_value(conf->ignore_invalid_headers,
 prev->ignore_invalid_headers, 1);
 ngx_conf_merge_value(conf->underscores_in_headers,
 prev->underscores_in_headers, 0);
 if (conf->server_names.nelts == 0) {
-/* the array has 4 empty preallocated elements, so push can not fail */
+/* the array has 4 empty preallocated elements, so push cannot fail */
 sn = ngx_array_push(&conf->server_names);
 #if (NGX_PCRE)
 sn->regex = NULL;
 #endif
 sn->server = conf;
 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);
 }
 continue;
 #else
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"bind ipv6only is not supported "
+"ipv6only is not supported "
 "on this platform");
 return NGX_CONF_ERROR;
 #endif
 }
 return NGX_CONF_ERROR;
 #endif
 }
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"the invalid \"%V\" parameter", &value[n]);
+"invalid parameter \"%V\"", &value[n]);
 return NGX_CONF_ERROR;
 }
 if (ngx_http_add_listen(cf, cscf, &lsopt) == NGX_OK) {
 return NGX_CONF_OK;
 return NGX_CONF_ERROR;
 }
 if (ngx_strchr(value[i].data, '/')) {
 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
-"server name \"%V\" has strange symbols",
+"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;
 sn->name = value[i];
 cscf->captures = (rc.captures > 0);
 }
 #else
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"the using of the regex \"%V\" "
+"using regex \"%V\" "
 "requires PCRE library", &value[i]);
 return NGX_CONF_ERROR;
 #endif
 }
 "\"%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",
+"\"%s\" directive was specified earlier",
 &cmd->name, clcf->alias ? "alias" : "root");
 }
 return NGX_CONF_ERROR;
 }
 if (clcf->named && alias) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"the \"alias\" directive may not be used "
+"the \"alias\" directive cannot be used "
-"inside named location");
+"inside the named location");
 return NGX_CONF_ERROR;
 }
 value = cf->args->elts;
 if (ngx_strstr(value[1].data, "$document_root")
 || ngx_strstr(value[1].data, "${document_root}"))
 {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"the $document_root variable may not be used "
+"the $document_root variable cannot be used "
 "in the \"%V\" directive",
 &cmd->name);
 return NGX_CONF_ERROR;
 }
 if (ngx_strstr(value[1].data, "$realpath_root")
 || ngx_strstr(value[1].data, "${realpath_root}"))
 {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"the $realpath_root variable may not be used "
+"the $realpath_root variable cannot be used "
 "in the \"%V\" directive",
 &cmd->name);
 return NGX_CONF_ERROR;
 }
 return NGX_CONF_OK;
 }
 if (max == 0) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-"\"open_file_cache\" must have \"max\" parameter");
+"\"open_file_cache\" must have the \"max\" parameter");
 return NGX_CONF_ERROR;
 }
 clcf->open_file_cache = ngx_open_file_cache_init(cf->pool, max, inactive);
 if (clcf->open_file_cache) {

Mercurial > hg > nginx-vendor-1-0

comparison src/http/ngx_http_core_module.c @ 638:692f4d4d7f10 NGINX_1_0_9