From: Valentin Bartenev <vbart@nginx.com>
Date: Mon, 28 Jan 2013 15:34:09 +0000 (+0000)
Subject: SSL: removed conditions that always hold true.
X-Git-Tag: release-1.3.12~13
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=693ba0179e4126fe3490e1c499d982183931598d;p=nginx.git

SSL: removed conditions that always hold true.
---

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 378e72709..93ae06aab 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1210,7 +1210,7 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
 
         size = buf->last - buf->pos;
 
-        if (!flush && buf->last < buf->end && c->ssl->buffer) {
+        if (!flush && buf->last < buf->end) {
             break;
         }
 
@@ -1232,10 +1232,8 @@ ngx_ssl_send_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
             break;
         }
 
-        if (buf->pos == buf->last) {
-            buf->pos = buf->start;
-            buf->last = buf->start;
-        }
+        buf->pos = buf->start;
+        buf->last = buf->start;
 
         if (in == NULL || send == limit) {
             break;