Mercurial > hg > nginx

changeset 5018:0ea36741bb35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SSL: removed conditions that always hold true.
author Valentin Bartenev <vbart@nginx.com>
date Mon, 28 Jan 2013 15:34:09 +0000
parents d89442dab4d1
children 69693a098655
files src/event/ngx_event_openssl.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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, 
 
         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, 
             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;