summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorValentin Bartenev <vbart@nginx.com>2013-01-28 15:34:09 +0000
committerValentin Bartenev <vbart@nginx.com>2013-01-28 15:34:09 +0000
commit693ba0179e4126fe3490e1c499d982183931598d (patch)
tree2d8939d8ce45073ff640bb1d44edd9f84f7784b8
parent4b46b7fc5b09c8afeb106db3c409cb7ba948fbfa (diff)
downloadnginx-693ba0179e4126fe3490e1c499d982183931598d.tar.gz
nginx-693ba0179e4126fe3490e1c499d982183931598d.tar.bz2
SSL: removed conditions that always hold true.
Diffstat (limited to '')
-rw-r--r--src/event/ngx_event_openssl.c8
1 files changed, 3 insertions, 5 deletions
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;