From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 9 Jul 2007 06:06:15 +0000 (+0000)
Subject: r1275 merge:
X-Git-Tag: release-0.5.27~1
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=8266ad4bf23ad733b9379aecea218b048b381875;p=nginx.git

r1275 merge:

omit unnecessary conditions
---

diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c
index 4263ea1ed..2e592824a 100644
--- a/src/http/modules/ngx_http_fastcgi_module.c
+++ b/src/http/modules/ngx_http_fastcgi_module.c
@@ -1144,16 +1144,16 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
             return NGX_OK;
         }
 
-        if (rc == NGX_OK && u->buffer.pos == u->buffer.last) {
+        if (rc == NGX_OK) {
             return NGX_AGAIN;
         }
 
-        if (rc == NGX_AGAIN) {
-            ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-                          "upstream split a header line in FastCGI records");
+        /* rc == NGX_AGAIN */
 
-            return NGX_HTTP_UPSTREAM_INVALID_HEADER;
-        }
+        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+                      "upstream split a header line in FastCGI records");
+
+        return NGX_HTTP_UPSTREAM_INVALID_HEADER;
     }
 }