From 9e9cf9630cbd7077e05929832ee45f344dc1dcfa Mon Sep 17 00:00:00 2001
From: "agentzh (Yichun Zhang)" <agentzh@gmail.com>
Date: Sun, 9 Sep 2012 21:58:41 -0700
Subject: [PATCH] removed an extra line from the
 nonbuffered-upstream-truncation patch.

---
 patches/nginx-1.2.3-nonbuffered-upstream-truncation.patch | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/patches/nginx-1.2.3-nonbuffered-upstream-truncation.patch b/patches/nginx-1.2.3-nonbuffered-upstream-truncation.patch
index 7f66442..551c50e 100644
--- a/patches/nginx-1.2.3-nonbuffered-upstream-truncation.patch
+++ b/patches/nginx-1.2.3-nonbuffered-upstream-truncation.patch
@@ -1,5 +1,5 @@
 --- nginx-1.2.3/src/http/ngx_http_upstream.c	2012-08-06 10:34:08.000000000 -0700
-+++ nginx-1.2.3-patched/src/http/ngx_http_upstream.c	2012-09-09 11:37:23.672421961 -0700
++++ nginx-1.2.3-patched/src/http/ngx_http_upstream.c	2012-09-09 21:58:04.727761891 -0700
 @@ -2383,7 +2383,7 @@
  
      if (c->read->timedout) {
@@ -29,7 +29,7 @@
                  b->pos = b->start;
                  b->last = b->start;
              }
-@@ -2710,7 +2714,17 @@
+@@ -2710,7 +2714,16 @@
  #if 0
              ngx_http_busy_unlock(u->conf->busy_lock, &u->busy_lock);
  #endif
@@ -41,14 +41,13 @@
 +                ngx_http_upstream_finalize_request(r, u, 0);
 +
 +            } else {
-+
 +                ngx_http_upstream_finalize_request(r, u, NGX_HTTP_BAD_GATEWAY);
 +            }
 +
              return;
          }
      }
-@@ -3073,6 +3087,13 @@
+@@ -3073,6 +3086,13 @@
          && rc != NGX_HTTP_REQUEST_TIME_OUT
          && (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE))
      {