[nginx] svn commit: r5044 - in branches/stable-1.2: . src/http/modules

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-02-10 03:22:58 +0000 (Sun, 10 Feb 2013)
New Revision: 5044
URL: http://trac.nginx.org/nginx/changeset/5044/nginx

Log:
Merge of r4963: proxy: better error message about unexpected data.

Requested by Igor Sysoev.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/modules/ngx_http_proxy_module.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2013-02-10 03:20:00 UTC (rev 5043)
+++ branches/stable-1.2	2013-02-10 03:22:58 UTC (rev 5044)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4962,4964,4973,4978,4984,5011
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4964,4973,4978,4984,5011
\ No newline at end of property
Modified: branches/stable-1.2/src/http/modules/ngx_http_proxy_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_proxy_module.c	2013-02-10 03:20:00 UTC (rev 5043)
+++ branches/stable-1.2/src/http/modules/ngx_http_proxy_module.c	2013-02-10 03:22:58 UTC (rev 5044)
@@ -1610,7 +1610,8 @@
         p->upstream_done = 1;
 
         ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
-                      "upstream sent too much data");
+                      "upstream sent more data than specified in "
+                      "\"Content-Length\" header");
     }
 
     return NGX_OK;