Mercurial > hg > nginx-vendor-current

diff src/http/modules/ngx_http_proxy_module.c @ 642:d3cf6c6b0043 NGINX_1_1_5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.5 *) Feature: the "uwsgi_buffering" and "scgi_buffering" directives. Thanks to Peter Smit. *) Bugfix: non-cacheable responses might be cached if "proxy_cache_bypass" directive was used. Thanks to John Ferlito. *) Bugfix: in HTTP/1.1 support in the ngx_http_proxy_module. *) 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_session_cache builtin" directive caused segmentation fault; the bug had appeared in 1.1.1.
author Igor Sysoev <http://sysoev.ru>
date Wed, 05 Oct 2011 00:00:00 +0400
parents eb208e0cf44d
children 6f21ae02fb01
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -1559,7 +1559,7 @@ ngx_http_proxy_copy_filter(ngx_event_pip
         r = p->input_ctx;
         p->upstream_done = 1;
 
-        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+        ngx_log_error(NGX_LOG_WARN, r->connection->log, 0,
                       "upstream sent too many data");
     }
 
@@ -1647,6 +1647,8 @@ ngx_http_proxy_parse_chunked(ngx_http_re
                     state = sw_trailer;
                     break;
                 case ';':
+                case ' ':
+                case '\t':
                     state = sw_last_chunk_extension;
                     break;
                 default:
@@ -1664,6 +1666,8 @@ ngx_http_proxy_parse_chunked(ngx_http_re
                 state = sw_chunk_data;
                 break;
             case ';':
+            case ' ':
+            case '\t':
                 state = sw_chunk_extension;
                 break;
             default:
@@ -1813,9 +1817,6 @@ done:
 
 invalid:
 
-    ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-                  "upstream sent invalid chunked response");
-
     return NGX_ERROR;
 }
 
@@ -1929,7 +1930,7 @@ ngx_http_proxy_chunked_filter(ngx_event_
 
         /* invalid response */
 
-        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "upstream sent invalid chunked response");
 
         return NGX_ERROR;
@@ -2085,7 +2086,7 @@ ngx_http_proxy_non_buffered_chunked_filt
 
         /* invalid response */
 
-        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+        ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "upstream sent invalid chunked response");
 
         return NGX_ERROR;