diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-01-24 13:54:07 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-01-24 13:54:07 +0000 |
| commit | ef1b6b2cf26715a2da8ab502b10b0b0dce9d31ac (patch) | |
| tree | 691caf3ece4d1f0098b00283b98f5c27f8a6a5e5 /ssl | |
| parent | 1699389a4691ea94455ac73fda58b8be9c1f7708 (diff) | |
The fix for PR#1949 unfortunately broke cases where the BIO_CTRL_WPENDING
ctrl is incorrectly implemented (e.g. some versions of Apache). As a workaround
call both BIO_CTRL_INFO and BIO_CTRL_WPENDING if it returns zero. This should
both address the original bug and retain compatibility with the old behaviour.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_srvr.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 00fc2616b7..c8bed170b5 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -484,7 +484,21 @@ int ssl3_accept(SSL *s) case SSL3_ST_SW_FLUSH: /* number of bytes to be flushed */ - num1=BIO_ctrl(s->wbio,BIO_CTRL_WPENDING,0,NULL); + /* This originally and incorrectly called BIO_CTRL_INFO + * The reason why this is wrong is mentioned in PR#1949. + * Unfortunately, as suggested in that bug some + * versions of Apache unconditionally return 0 + * for BIO_CTRL_WPENDING meaning we don't correctly + * flush data and some operations, like renegotiation, + * don't work. Other software may also be affected so + * call BIO_CTRL_INFO to retain compatibility with + * previous behaviour and BIO_CTRL_WPENDING if we + * get zero to address the PR#1949 case. + */ + + num1=BIO_ctrl(s->wbio,BIO_CTRL_INFO,0,NULL); + if (num1 == 0) + num1=BIO_ctrl(s->wbio,BIO_CTRL_WPENDING,0,NULL); if (num1 > 0) { s->rwstate=SSL_WRITING; |