backout both r2162 and r2128 and implement a new fix
This commit is contained in:
parent
be76a05b53
commit
b0dc32eec3
2 changed files with 2 additions and 6 deletions
|
@ -505,12 +505,6 @@ ngx_ssl_handshake(ngx_connection_t *c)
|
|||
|
||||
if (n == 1) {
|
||||
|
||||
if (ngx_event_flags & NGX_USE_LEVEL_EVENT) {
|
||||
c->read->ready = 0;
|
||||
}
|
||||
|
||||
c->write->ready = 1;
|
||||
|
||||
if (ngx_handle_read_event(c->read, 0) == NGX_ERROR) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
|
|
@ -198,6 +198,8 @@ ngx_mail_ssl_handshake_handler(ngx_connection_t *c)
|
|||
return;
|
||||
}
|
||||
|
||||
c->read->ready = 0;
|
||||
|
||||
ngx_mail_init_session(c);
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue