nginx-vendor-current: src/event/ngx_event

nginx 0.3.20 *) Bugfix: in SSI handling. *) Bugfix: the ngx_http_memcached_module did not support the keys in the "/usr?args" form.

comparison

equal deleted inserted replaced

-:85a84f8da62b
+:36af50a5582d
 int          n;
 ngx_uint_t   flush;
 ssize_t      send, size;
 ngx_buf_t   *buf;
-if (!c->ssl->buffer || (in && in->next == NULL && !c->buffered)) {
+if (!c->ssl->buffer
+|| (in && in->next == NULL && !(c->buffered & NGX_SSL_BUFFERED)))
+{
 /*
 * we avoid a buffer copy if
 *     we do not need to buffer the output
 *     or the incoming buf is a single and our buffer is empty
 if (n == NGX_ERROR) {
 return NGX_CHAIN_ERROR;
 }
 if (n == NGX_AGAIN) {
-c->buffered = 1;
+c->buffered |= NGX_SSL_BUFFERED;
 return in;
 }
 in->buf->pos += n;
 if (n == NGX_ERROR) {
 return NGX_CHAIN_ERROR;
 }
 if (n == NGX_AGAIN) {
-c->buffered = 1;
+c->buffered |= NGX_SSL_BUFFERED;
 return in;
 }
 buf->pos += n;
 send += n;
 if (in == NULL || send == limit) {
 break;
 }
 }
-c->buffered = (buf->pos < buf->last) ? 1 : 0;
+if (buf->pos < buf->last) {
+c->buffered |= NGX_SSL_BUFFERED;
+} else {
+c->buffered &= ~NGX_SSL_BUFFERED;
+}
 return in;
 }

Mercurial > hg > nginx-vendor-current