Sync with upstream's fix for PR#3321.
(Imported from upstream's f710c3f198c9980a1056bac9b4b9617554254671)
This commit is contained in:
parent
041240485d
commit
45fb1eca0d
@ -675,10 +675,6 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
|
|||||||
SSL3_BUFFER *wb=&(s->s3->wbuf);
|
SSL3_BUFFER *wb=&(s->s3->wbuf);
|
||||||
SSL_SESSION *sess;
|
SSL_SESSION *sess;
|
||||||
|
|
||||||
if (wb->buf == NULL)
|
|
||||||
if (!ssl3_setup_write_buffer(s))
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
/* first check if there is a SSL3_BUFFER still being written
|
/* first check if there is a SSL3_BUFFER still being written
|
||||||
* out. This will happen with non blocking IO */
|
* out. This will happen with non blocking IO */
|
||||||
if (wb->left != 0)
|
if (wb->left != 0)
|
||||||
@ -693,7 +689,6 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
|
|||||||
/* if it went, fall through and send more stuff */
|
/* if it went, fall through and send more stuff */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Dispatching the alert may have released the write buffer. */
|
|
||||||
if (wb->buf == NULL)
|
if (wb->buf == NULL)
|
||||||
if (!ssl3_setup_write_buffer(s))
|
if (!ssl3_setup_write_buffer(s))
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user