mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not set read->eof, ready, and error prematurely

Browse Source
This commit is contained in:
Igor Sysoev 2007-08-27 19:44:35 +00:00
parent 121bf2f955
commit 6fe1303fb5
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/event/ngx_event_openssl.c
View File

@ -593,10 +593,13 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
int n, bytes; int n, bytes;
if (c->ssl->last == NGX_ERROR) { if (c->ssl->last == NGX_ERROR) {
c->read->error = 1;
return NGX_ERROR; return NGX_ERROR;
} }
if (c->ssl->last == NGX_DONE) { if (c->ssl->last == NGX_DONE) {
c->read->ready = 0;
c->read->eof = 1;
return 0; return 0;
} }
@ -619,26 +622,38 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size)
c->ssl->last = ngx_ssl_handle_recv(c, n); c->ssl->last = ngx_ssl_handle_recv(c, n);
if (c->ssl->last != NGX_OK) { if (c->ssl->last == NGX_OK) {
if (bytes) { size -= n;
if (size == 0) {
return bytes; return bytes;
} }
if (c->ssl->last == NGX_DONE) { buf += n;
return 0;
}
return c->ssl->last; continue;
} }
size -= n; if (bytes) {
if (size == 0) {
return bytes; return bytes;
} }
buf += n; switch (c->ssl->last) {
case NGX_DONE:
c->read->ready = 0;
c->read->eof = 1;
return 0;
case NGX_ERROR:
c->read->error = 1;
/* fall thruogh */
case NGX_AGAIN:
return c->ssl->last;
}
} }
} }
@ -703,8 +718,6 @@ ngx_ssl_handle_recv(ngx_connection_t *c, int n)
c->ssl->no_wait_shutdown = 1; c->ssl->no_wait_shutdown = 1;
c->ssl->no_send_shutdown = 1; c->ssl->no_send_shutdown = 1;
c->read->ready = 0;
c->read->eof = 1;
if (sslerr == SSL_ERROR_ZERO_RETURN || ERR_peek_error() == 0) { if (sslerr == SSL_ERROR_ZERO_RETURN || ERR_peek_error() == 0) {
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
@ -712,7 +725,6 @@ ngx_ssl_handle_recv(ngx_connection_t *c, int n)
return NGX_DONE; return NGX_DONE;
} }
c->read->error = 1;
ngx_ssl_connection_error(c, sslerr, err, "SSL_read() failed"); ngx_ssl_connection_error(c, sslerr, err, "SSL_read() failed");
return NGX_ERROR; return NGX_ERROR;