Commit 21a5c040 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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.
parent ba64ae6c

ssl/s3_srvr.c

+15 −1
Original line number Diff line number Diff line
@@ -484,6 +484,20 @@ int ssl3_accept(SSL *s) 
		

		case SSL3_ST_SW_FLUSH:

			/* number of bytes to be flushed */

			/* 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)

				{