<div dir="ltr">Igor, <div><br></div><div>Bolshoy Spasiva!</div><div><br></div><div>Really, you deserve to be thanked personally once in a while for the continuous works and improvements.</div><div><br><br><div class="gmail_quote">
On Tue, Nov 1, 2011 at 3:24 PM, <span dir="ltr"><<a href="mailto:igor@sysoev.ru">igor@sysoev.ru</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Author: is<br>
Date: <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:24:50 +0000 (Tue, 01 Nov <a href="tel:2011" value="+9722011">2011</a>)<br>
New Revision: <a href="tel:4247" value="+9724247">4247</a><br>
<br>
Modified:<br>
branches/stable-1.0/<br>
branches/stable-1.0/src/core/ngx_cycle.c<br>
branches/stable-1.0/src/core/ngx_palloc.c<br>
branches/stable-1.0/src/core/ngx_string.c<br>
branches/stable-1.0/src/event/ngx_event.c<br>
branches/stable-1.0/src/event/ngx_event_timer.c<br>
branches/stable-1.0/src/http/modules/ngx_http_dav_module.c<br>
branches/stable-1.0/src/http/modules/ngx_http_headers_filter_module.c<br>
branches/stable-1.0/src/http/modules/ngx_http_log_module.c<br>
branches/stable-1.0/src/http/ngx_http.c<br>
branches/stable-1.0/src/http/ngx_http_core_module.c<br>
branches/stable-1.0/src/http/ngx_http_upstream.c<br>
branches/stable-1.0/src/os/unix/ngx_errno.c<br>
branches/stable-1.0/src/os/unix/ngx_file_aio_read.c<br>
branches/stable-1.0/src/os/unix/ngx_freebsd_sendfile_chain.c<br>
branches/stable-1.0/src/os/unix/ngx_process.c<br>
branches/stable-1.0/src/os/unix/ngx_process_cycle.c<br>
branches/stable-1.0/src/os/win32/ngx_process_cycle.c<br>
Log:<br>
Merging r4132, r4134, r4143, r4183, r4191, r4199:<br>
<br>
Various fixes related to error messages:<br>
<br>
*) Removed old warning that suggested to use "server_name_in_redirect off"<br>
(now the default) in place of no longer supported "server_name *".<br>
<br>
*) Fixing directive name in error message if types hash size is not enough.<br>
<br>
*) Replaced "can not" with "cannot" and "could not" in a bunch of places.<br>
Fixed nearby grammar errors.<br>
<br>
*) Overhauled error essages.<br>
<br>
<br>
<br>
Property changes on: branches/stable-1.0<br>
___________________________________________________________________<br>
Modified: svn:mergeinfo<br>
- /trunk:<a href="tel:3960-3974" value="+97239603974">3960-3974</a>,<a href="tel:3977-3987" value="+97239773987">3977-3987</a>,<a href="tel:3991-3996" value="+97239913996">3991-3996</a>,<a href="tel:3998" value="+9723998">3998</a>,<a href="tel:4003-4007" value="+97240034007">4003-4007</a>,<a href="tel:4009-4013" value="+97240094013">4009-4013</a>,<a href="tel:4015-4018" value="+97240154018">4015-4018</a>,<a href="tel:4020" value="+9724020">4020</a>,<a href="tel:4023" value="+9724023">4023</a>,<a href="tel:4025-4027" value="+97240254027">4025-4027</a>,<a href="tel:4034-4065" value="+97240344065">4034-4065</a>,<a href="tel:4073" value="+9724073">4073</a>,<a href="tel:4077" value="+9724077">4077</a>,<a href="tel:4086-4090" value="+97240864090">4086-4090</a>,<a href="tel:4094-4102" value="+97240944102">4094-4102</a>,<a href="tel:4106-4108" value="+97241064108">4106-4108</a>,<a href="tel:4113-4114" value="+97241134114">4113-4114</a>,<a href="tel:4129-4131" value="+97241294131">4129-4131</a>,<a href="tel:4133" value="+9724133">4133</a>,<a href="tel:4135-4137" value="+97241354137">4135-4137</a>,<a href="tel:4154" value="+9724154">4154</a>,<a href="tel:4156-4157" value="+97241564157">4156-4157</a>,<a href="tel:4184" value="+9724184">4184</a>,<a href="tel:4186-4187" value="+97241864187">4186-4187</a>,<a href="tel:4192" value="+9724192">4192</a>,<a href="tel:4200-4205" value="+97242004205">4200-4205</a>,<a href="tel:4229" value="+9724229">4229</a>,<a href="tel:4235" value="+9724235">4235</a>,<a href="tel:4237" value="+9724237">4237</a><br>
+ /trunk:<a href="tel:3960-3974" value="+97239603974">3960-3974</a>,<a href="tel:3977-3987" value="+97239773987">3977-3987</a>,<a href="tel:3991-3996" value="+97239913996">3991-3996</a>,<a href="tel:3998" value="+9723998">3998</a>,<a href="tel:4003-4007" value="+97240034007">4003-4007</a>,<a href="tel:4009-4013" value="+97240094013">4009-4013</a>,<a href="tel:4015-4018" value="+97240154018">4015-4018</a>,<a href="tel:4020" value="+9724020">4020</a>,<a href="tel:4023" value="+9724023">4023</a>,<a href="tel:4025-4027" value="+97240254027">4025-4027</a>,<a href="tel:4034-4065" value="+97240344065">4034-4065</a>,<a href="tel:4073" value="+9724073">4073</a>,<a href="tel:4077" value="+9724077">4077</a>,<a href="tel:4086-4090" value="+97240864090">4086-4090</a>,<a href="tel:4094-4102" value="+97240944102">4094-4102</a>,<a href="tel:4106-4108" value="+97241064108">4106-4108</a>,<a href="tel:4113-4114" value="+97241134114">4113-4114</a>,<a href="tel:4129-4137" value="+97241294137">4129-4137</a>,<a href="tel:4143" value="+9724143">4143</a>,<a href="tel:4154" value="+9724154">4154</a>,<a href="tel:4156-4157" value="+97241564157">4156-4157</a>,<a href="tel:4183-4184" value="+97241834184">4183-4184</a>,<a href="tel:4186-4187" value="+97241864187">4186-4187</a>,<a href="tel:4191-4192" value="+97241914192">4191-4192</a>,<a href="tel:4199-4205" value="+97241994205">4199-4205</a>,<a href="tel:4229" value="+9724229">4229</a>,<a href="tel:4235" value="+9724235">4235</a>,<a href="tel:4237" value="+9724237">4237</a><br>
<br>
Modified: branches/stable-1.0/src/core/ngx_cycle.c<br>
===================================================================<br>
--- branches/stable-1.0/src/core/ngx_cycle.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:00:30 UTC (rev <a href="tel:4246" value="+9724246">4246</a>)<br>
+++ branches/stable-1.0/src/core/ngx_cycle.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:24:50 UTC (rev <a href="tel:4247" value="+9724247">4247</a>)<br>
@@ -739,7 +739,7 @@<br>
ngx_temp_pool = ngx_create_pool(128, cycle->log);<br>
if (ngx_temp_pool == NULL) {<br>
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,<br>
- "can not create ngx_temp_pool");<br>
+ "could not create ngx_temp_pool");<br>
exit(1);<br>
}<br>
<br>
<br>
Modified: branches/stable-1.0/src/core/ngx_palloc.c<br>
===================================================================<br>
--- branches/stable-1.0/src/core/ngx_palloc.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:00:30 UTC (rev <a href="tel:4246" value="+9724246">4246</a>)<br>
+++ branches/stable-1.0/src/core/ngx_palloc.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:24:50 UTC (rev <a href="tel:4247" value="+9724247">4247</a>)<br>
@@ -68,7 +68,7 @@<br>
<br>
/*<br>
* we could allocate the pool->log from this pool<br>
- * so we can not use this log while the free()ing the pool<br>
+ * so we cannot use this log while free()ing the pool<br>
*/<br>
<br>
for (p = pool, n = pool->d.next; /* void */; p = n, n = n->d.next) {<br>
<br>
Modified: branches/stable-1.0/src/core/ngx_string.c<br>
===================================================================<br>
--- branches/stable-1.0/src/core/ngx_string.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:00:30 UTC (rev <a href="tel:4246" value="+9724246">4246</a>)<br>
+++ branches/stable-1.0/src/core/ngx_string.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:24:50 UTC (rev <a href="tel:4247" value="+9724247">4247</a>)<br>
@@ -381,7 +381,7 @@<br>
<br>
/*<br>
* (int64_t) cast is required for msvc6:<br>
- * it can not convert uint64_t to double<br>
+ * it cannot convert uint64_t to double<br>
*/<br>
ui64 = (uint64_t) ((f - (int64_t) ui64) * scale + 0.5);<br>
<br>
<br>
Modified: branches/stable-1.0/src/event/ngx_event.c<br>
===================================================================<br>
--- branches/stable-1.0/src/event/ngx_event.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:00:30 UTC (rev <a href="tel:4246" value="+9724246">4246</a>)<br>
+++ branches/stable-1.0/src/event/ngx_event.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:24:50 UTC (rev <a href="tel:4247" value="+9724247">4247</a>)<br>
@@ -1027,7 +1027,7 @@<br>
"when the server runs without a master process "<br>
"the \"%V\" event type must be the same as "<br>
"in previous configuration - \"%s\" "<br>
- "and it can not be changed on the fly, "<br>
+ "and it cannot be changed on the fly, "<br>
"to change it you need to stop server "<br>
"and start it again",<br>
&value[1], old_ecf->name);<br>
<br>
Modified: branches/stable-1.0/src/event/ngx_event_timer.c<br>
===================================================================<br>
--- branches/stable-1.0/src/event/ngx_event_timer.c 2011-11-01 13:00:30 UTC (rev 4246)<br>
+++ branches/stable-1.0/src/event/ngx_event_timer.c 2011-11-01 13:24:50 UTC (rev 4247)<br>
@@ -103,11 +103,11 @@<br>
if (ngx_threaded && ngx_trylock(ev->lock) == 0) {<br>
<br>
/*<br>
- * We can not change the timer of the event that is been<br>
- * handling by another thread. And we can not easy walk<br>
- * the rbtree to find a next expired timer so we exit the loop.<br>
- * However it should be rare case when the event that is<br>
- * been handling has expired timer.<br>
+ * We cannot change the timer of the event that is being<br>
+ * handled by another thread. And we cannot easy walk<br>
+ * the rbtree to find next expired timer so we exit the loop.<br>
+ * However, it should be a rare case when the event that is<br>
+ * being handled has an expired timer.<br>
*/<br>
<br>
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0,<br>
<br>
Modified: branches/stable-1.0/src/http/modules/ngx_http_dav_module.c<br>
===================================================================<br>
--- branches/stable-1.0/src/http/modules/ngx_http_dav_module.c 2011-11-01 13:00:30 UTC (rev 4246)<br>
+++ branches/stable-1.0/src/http/modules/ngx_http_dav_module.c 2011-11-01 13:24:50 UTC (rev 4247)<br>
@@ -158,7 +158,7 @@<br>
<br>
if (r->uri.data[r->uri.len - 1] == '/') {<br>
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,<br>
- "can not PUT to a collection");<br>
+ "cannot PUT to a collection");<br>
return NGX_HTTP_CONFLICT;<br>
}<br>
<br>
<br>
Modified: branches/stable-1.0/src/http/modules/ngx_http_headers_filter_module.c<br>
===================================================================<br>
--- branches/stable-1.0/src/http/modules/ngx_http_headers_filter_module.c 2011-11-01 13:00:30 UTC (rev 4246)<br>
+++ branches/stable-1.0/src/http/modules/ngx_http_headers_filter_module.c 2011-11-01 13:24:50 UTC (rev 4247)<br>
@@ -507,7 +507,7 @@<br>
minus = 0;<br>
<br>
if (hcf->expires == NGX_HTTP_EXPIRES_MODIFIED) {<br>
- return "daily time can not be used with \"modified\" parameter";<br>
+ return "daily time cannot be used with \"modified\" parameter";<br>
}<br>
<br>
hcf->expires = NGX_HTTP_EXPIRES_DAILY;<br>
<br>
Modified: branches/stable-1.0/src/http/modules/ngx_http_log_module.c<br>
===================================================================<br>
--- branches/stable-1.0/src/http/modules/ngx_http_log_module.c 2011-11-01 13:00:30 UTC (rev 4246)<br>
+++ branches/stable-1.0/src/http/modules/ngx_http_log_module.c 2011-11-01 13:24:50 UTC (rev 4247)<br>
@@ -960,7 +960,7 @@<br>
<br>
if (log->script) {<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "buffered logs can not have variables in name");<br>
+ "buffered logs cannot have variables in name");<br>
return NGX_CONF_ERROR;<br>
}<br>
<br>
<br>
Modified: branches/stable-1.0/src/http/ngx_http.c<br>
===================================================================<br>
--- branches/stable-1.0/src/http/ngx_http.c 2011-11-01 13:00:30 UTC (rev 4246)<br>
+++ branches/stable-1.0/src/http/ngx_http.c 2011-11-01 13:24:50 UTC (rev 4247)<br>
@@ -1226,7 +1226,7 @@<br>
#endif<br>
<br>
/*<br>
- * we can not compare whole sockaddr struct's as kernel<br>
+ * we cannot compare whole sockaddr struct's as kernel<br>
* may fill some fields in inherited sockaddr struct's<br>
*/<br>
<br>
@@ -1281,7 +1281,7 @@<br>
<br>
if (addr[i].opt.set) {<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "a duplicate listen options for %s", addr[i].opt.addr);<br>
+ "duplicate listen options for %s", addr[i].opt.addr);<br>
return NGX_ERROR;<br>
}<br>
<br>
<br>
Modified: branches/stable-1.0/src/http/ngx_http_core_module.c<br>
===================================================================<br>
--- branches/stable-1.0/src/http/ngx_http_core_module.c 2011-11-01 13:00:30 UTC (rev 4246)<br>
+++ branches/stable-1.0/src/http/ngx_http_core_module.c 2011-11-01 13:24:50 UTC (rev 4247)<br>
@@ -1259,7 +1259,7 @@<br>
tf++;<br>
<br>
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,<br>
- "try to use %s: \"%s\" \"%s\"",<br>
+ "trying to use %s: \"%s\" \"%s\"",<br>
test_dir ? "dir" : "file", name, path.data);<br>
<br>
if (tf->lengths == NULL && tf->name.len == 0) {<br>
@@ -1897,7 +1897,7 @@<br>
<br>
if (alias && !r->valid_location) {<br>
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,<br>
- "\"alias\" could not be used in location \"%V\" "<br>
+ "\"alias\" cannot be used in location \"%V\" "<br>
"where URI was rewritten", &clcf->name);<br>
return NULL;<br>
}<br>
@@ -2468,7 +2468,7 @@<br>
if (r->uri_changes == 0) {<br>
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,<br>
"rewrite or internal redirection cycle "<br>
- "while internal redirect to \"%V\"", uri);<br>
+ "while internally redirecting to \"%V\"", uri);<br>
<br>
r->main->count++;<br>
ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);<br>
@@ -2862,7 +2862,7 @@<br>
<br>
if (pclcf->exact_match) {<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "location \"%V\" could not be inside "<br>
+ "location \"%V\" cannot be inside "<br>
"the exact location \"%V\"",<br>
&clcf->name, &pclcf->name);<br>
return NGX_CONF_ERROR;<br>
@@ -2870,7 +2870,7 @@<br>
<br>
if (pclcf->named) {<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "location \"%V\" could not be inside "<br>
+ "location \"%V\" cannot be inside "<br>
"the named location \"%V\"",<br>
&clcf->name, &pclcf->name);<br>
return NGX_CONF_ERROR;<br>
@@ -2878,8 +2878,8 @@<br>
<br>
if (clcf->named) {<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "named location \"%V\" must be "<br>
- "on server level only",<br>
+ "named location \"%V\" can be "<br>
+ "on the server level only",<br>
&clcf->name);<br>
return NGX_CONF_ERROR;<br>
}<br>
@@ -2948,7 +2948,7 @@<br>
#else<br>
<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "the using of the regex \"%V\" requires PCRE library",<br>
+ "using regex \"%V\" requires PCRE library",<br>
regex);<br>
return NGX_ERROR;<br>
<br>
@@ -3030,9 +3030,9 @@<br>
type[n].value = content_type;<br>
<br>
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,<br>
- "duplicate extention \"%V\", "<br>
+ "duplicate extension \"%V\", "<br>
"content type: \"%V\", "<br>
- "old content type: \"%V\"",<br>
+ "previous content type: \"%V\"",<br>
&value[i], content_type, old);<br>
goto next;<br>
}<br>
@@ -3187,7 +3187,7 @@<br>
if (conf->large_client_header_buffers.size < conf->connection_pool_size) {<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
"the \"large_client_header_buffers\" size must be "<br>
- "equal to or bigger than \"connection_pool_size\"");<br>
+ "equal to or greater than \"connection_pool_size\"");<br>
return NGX_CONF_ERROR;<br>
}<br>
<br>
@@ -3200,7 +3200,7 @@<br>
prev->underscores_in_headers, 0);<br>
<br>
if (conf->server_names.nelts == 0) {<br>
- /* the array has 4 empty preallocated elements, so push can not fail */<br>
+ /* the array has 4 empty preallocated elements, so push cannot fail */<br>
sn = ngx_array_push(&conf->server_names);<br>
#if (NGX_PCRE)<br>
sn->regex = NULL;<br>
@@ -3435,7 +3435,7 @@<br>
types_hash.key = ngx_hash_key_lc;<br>
types_hash.max_size = conf->types_hash_max_size;<br>
types_hash.bucket_size = conf->types_hash_bucket_size;<br>
- <a href="http://types_hash.name" target="_blank">types_hash.name</a> = "mime_types_hash";<br>
+ <a href="http://types_hash.name" target="_blank">types_hash.name</a> = "types_hash";<br>
types_hash.pool = cf->pool;<br>
types_hash.temp_pool = NULL;<br>
<br>
@@ -<a href="tel:3789" value="+9723789">3789</a>,7 +3789,7 @@<br>
continue;<br>
#else<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "bind ipv6only is not supported "<br>
+ "ipv6only is not supported "<br>
"on this platform");<br>
return NGX_CONF_ERROR;<br>
#endif<br>
@@ -<a href="tel:3808" value="+9723808">3808</a>,7 +3808,7 @@<br>
}<br>
<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "the invalid \"%V\" parameter", &value[n]);<br>
+ "invalid parameter \"%V\"", &value[n]);<br>
return NGX_CONF_ERROR;<br>
}<br>
<br>
@@ -<a href="tel:3846" value="+9723846">3846</a>,17 +3846,10 @@<br>
<br>
if (ngx_strchr(value[i].data, '/')) {<br>
ngx_conf_log_error(NGX_LOG_WARN, cf, 0,<br>
- "server name \"%V\" has strange symbols",<br>
+ "server name \"%V\" has suspicious symbols",<br>
&value[i]);<br>
}<br>
<br>
- if (value[i].len == 1 && ch == '*') {<br>
- ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "\"server_name *\" is unsupported, use "<br>
- "\"server_name_in_redirect off\" instead");<br>
- return NGX_CONF_ERROR;<br>
- }<br>
-<br>
sn = ngx_array_push(&cscf->server_names);<br>
if (sn == NULL) {<br>
return NGX_CONF_ERROR;<br>
@@ -<a href="tel:3917" value="+9723917">3917</a>,7 +3910,7 @@<br>
}<br>
#else<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "the using of the regex \"%V\" "<br>
+ "using regex \"%V\" "<br>
"requires PCRE library", &value[i]);<br>
<br>
return NGX_CONF_ERROR;<br>
@@ -<a href="tel:3949" value="+9723949">3949</a>,7 +3942,7 @@<br>
} else {<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
"\"%V\" directive is duplicate, "<br>
- "\"%s\" directive is specified before",<br>
+ "\"%s\" directive was specified earlier",<br>
&cmd->name, clcf->alias ? "alias" : "root");<br>
}<br>
<br>
@@ -<a href="tel:3958" value="+9723958">3958</a>,8 +3951,8 @@<br>
<br>
if (clcf->named && alias) {<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "the \"alias\" directive may not be used "<br>
- "inside named location");<br>
+ "the \"alias\" directive cannot be used "<br>
+ "inside the named location");<br>
<br>
return NGX_CONF_ERROR;<br>
}<br>
@@ -<a href="tel:3970" value="+9723970">3970</a>,7 +3963,7 @@<br>
|| ngx_strstr(value[1].data, "${document_root}"))<br>
{<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "the $document_root variable may not be used "<br>
+ "the $document_root variable cannot be used "<br>
"in the \"%V\" directive",<br>
&cmd->name);<br>
<br>
@@ -<a href="tel:3981" value="+9723981">3981</a>,7 +3974,7 @@<br>
|| ngx_strstr(value[1].data, "${realpath_root}"))<br>
{<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "the $realpath_root variable may not be used "<br>
+ "the $realpath_root variable cannot be used "<br>
"in the \"%V\" directive",<br>
&cmd->name);<br>
<br>
@@ -<a href="tel:4440" value="+9724440">4440</a>,7 +4433,7 @@<br>
<br>
if (max == 0) {<br>
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,<br>
- "\"open_file_cache\" must have \"max\" parameter");<br>
+ "\"open_file_cache\" must have the \"max\" parameter");<br>
return NGX_CONF_ERROR;<br>
}<br>
<br>
<br>
Modified: branches/stable-1.0/src/http/ngx_http_upstream.c<br>
===================================================================<br>
--- branches/stable-1.0/src/http/ngx_http_upstream.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:00:30 UTC (rev <a href="tel:4246" value="+9724246">4246</a>)<br>
+++ branches/stable-1.0/src/http/ngx_http_upstream.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:24:50 UTC (rev <a href="tel:4247" value="+9724247">4247</a>)<br>
@@ -987,7 +987,7 @@<br>
<br>
if (!u->cacheable && u->peer.connection) {<br>
ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno,<br>
- "kevent() reported that client closed prematurely "<br>
+ "kevent() reported that client prematurely closed "<br>
"connection, so upstream connection is closed too");<br>
ngx_http_upstream_finalize_request(r, u,<br>
NGX_HTTP_CLIENT_CLOSED_REQUEST);<br>
@@ -995,8 +995,8 @@<br>
}<br>
<br>
ngx_log_error(NGX_LOG_INFO, ev->log, ev->kq_errno,<br>
- "kevent() reported that client closed "<br>
- "prematurely connection");<br>
+ "kevent() reported that client prematurely closed "<br>
+ "connection");<br>
<br>
if (u->peer.connection == NULL) {<br>
ngx_http_upstream_finalize_request(r, u,<br>
@@ -1050,7 +1050,7 @@<br>
<br>
if (!u->cacheable && u->peer.connection) {<br>
ngx_log_error(NGX_LOG_INFO, ev->log, err,<br>
- "client closed prematurely connection, "<br>
+ "client prematurely closed connection, "<br>
"so upstream connection is closed too");<br>
ngx_http_upstream_finalize_request(r, u,<br>
NGX_HTTP_CLIENT_CLOSED_REQUEST);<br>
@@ -1058,7 +1058,7 @@<br>
}<br>
<br>
ngx_log_error(NGX_LOG_INFO, ev->log, err,<br>
- "client closed prematurely connection");<br>
+ "client prematurely closed connection");<br>
<br>
if (u->peer.connection == NULL) {<br>
ngx_http_upstream_finalize_request(r, u,<br>
<br>
Modified: branches/stable-1.0/src/os/unix/ngx_errno.c<br>
===================================================================<br>
--- branches/stable-1.0/src/os/unix/ngx_errno.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:00:30 UTC (rev <a href="tel:4246" value="+9724246">4246</a>)<br>
+++ branches/stable-1.0/src/os/unix/ngx_errno.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:24:50 UTC (rev <a href="tel:4247" value="+9724247">4247</a>)<br>
@@ -12,7 +12,7 @@<br>
* The strerror() messages are copied because:<br>
*<br>
* 1) strerror() and strerror_r() functions are not Async-Signal-Safe,<br>
- * therefore, they can not be used in signal handlers;<br>
+ * therefore, they cannot be used in signal handlers;<br>
*<br>
* 2) a direct sys_errlist[] array may be used instead of these functions,<br>
* but Linux linker warns about its usage:<br>
<br>
Modified: branches/stable-1.0/src/os/unix/ngx_file_aio_read.c<br>
===================================================================<br>
--- branches/stable-1.0/src/os/unix/ngx_file_aio_read.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:00:30 UTC (rev <a href="tel:4246" value="+9724246">4246</a>)<br>
+++ branches/stable-1.0/src/os/unix/ngx_file_aio_read.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:24:50 UTC (rev <a href="tel:4247" value="+9724247">4247</a>)<br>
@@ -23,7 +23,7 @@<br>
* kqueue EVFILT_AIO filter is level triggered only: an event repeats<br>
* until aio_return() will be called;<br>
*<br>
- * aio_cancel() can not cancel file AIO: it returns AIO_NOTCANCELED always.<br>
+ * aio_cancel() cannot cancel file AIO: it returns AIO_NOTCANCELED always.<br>
*/<br>
<br>
<br>
<br>
Modified: branches/stable-1.0/src/os/unix/ngx_freebsd_sendfile_chain.c<br>
===================================================================<br>
--- branches/stable-1.0/src/os/unix/ngx_freebsd_sendfile_chain.c <a href="tel:2011-11-01" value="+97220111101">2011-11-01</a> 13:00:30 UTC (rev 4246)<br>
+++ branches/stable-1.0/src/os/unix/ngx_freebsd_sendfile_chain.c 2011-11-01 13:24:50 UTC (rev 4247)<br>
@@ -11,7 +11,7 @@<br>
<br>
/*<br>
* Although FreeBSD sendfile() allows to pass a header and a trailer,<br>
- * it can not send a header with a part of the file in one packet until<br>
+ * it cannot send a header with a part of the file in one packet until<br>
* FreeBSD 5.3. Besides, over the fast ethernet connection sendfile()<br>
* may send the partially filled packets, i.e. the 8 file pages may be sent<br>
* as the 11 full 1460-bytes packets, then one incomplete 324-bytes packet,<br>
<br>
Modified: branches/stable-1.0/src/os/unix/ngx_process.c<br>
===================================================================<br>
--- branches/stable-1.0/src/os/unix/ngx_process.c 2011-11-01 13:00:30 UTC (rev 4246)<br>
+++ branches/stable-1.0/src/os/unix/ngx_process.c 2011-11-01 13:24:50 UTC (rev 4247)<br>
@@ -541,7 +541,7 @@<br>
if (WEXITSTATUS(status) == 2 && ngx_processes[i].respawn) {<br>
ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,<br>
"%s %P exited with fatal code %d "<br>
- "and can not be respawn",<br>
+ "and cannot be respawned",<br>
process, pid, WEXITSTATUS(status));<br>
ngx_processes[i].respawn = 0;<br>
}<br>
<br>
Modified: branches/stable-1.0/src/os/unix/ngx_process_cycle.c<br>
===================================================================<br>
--- branches/stable-1.0/src/os/unix/ngx_process_cycle.c 2011-11-01 13:00:30 UTC (rev 4246)<br>
+++ branches/stable-1.0/src/os/unix/ngx_process_cycle.c 2011-11-01 13:24:50 UTC (rev 4247)<br>
@@ -620,7 +620,8 @@<br>
== NGX_INVALID_PID)<br>
{<br>
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,<br>
- "can not respawn %s", ngx_processes[i].name);<br>
+ "could not respawn %s",<br>
+ ngx_processes[i].name);<br>
continue;<br>
}<br>
<br>
<br>
Modified: branches/stable-1.0/src/os/win32/ngx_process_cycle.c<br>
===================================================================<br>
--- branches/stable-1.0/src/os/win32/ngx_process_cycle.c 2011-11-01 13:00:30 UTC (rev 4246)<br>
+++ branches/stable-1.0/src/os/win32/ngx_process_cycle.c 2011-11-01 13:24:50 UTC (rev 4247)<br>
@@ -530,7 +530,7 @@<br>
== NGX_INVALID_PID)<br>
{<br>
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,<br>
- "can not respawn %s", ngx_processes[n].name);<br>
+ "could not respawn %s", ngx_processes[n].name);<br>
<br>
if (n == ngx_last_process - 1) {<br>
ngx_last_process--;<br>
<br>
_______________________________________________<br>
nginx-devel mailing list<br>
<a href="mailto:nginx-devel@nginx.org">nginx-devel@nginx.org</a><br>
<a href="http://mailman.nginx.org/mailman/listinfo/nginx-devel" target="_blank">http://mailman.nginx.org/mailman/listinfo/nginx-devel</a><br>
</blockquote></div><br></div></div>