Fix feof hanging on TLS streams (bug #77390)

kelunik · kelunik · commit 0e15056874ee · 2018-12-31T18:32:01.000+01:00
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
@@ -2413,13 +2413,12 @@ static int php_openssl_sockop_set_option(php_stream *stream, int option, int val
 								int err = SSL_get_error(sslsock->ssl_handle, n);
 
 								if (err == SSL_ERROR_SYSCALL) {
-									alive = php_socket_errno() == EAGAIN;
+									alive = n == -1 && php_socket_errno() == EAGAIN;
 									break;
 								}
 
 								if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE) {
-									/* re-negotiate */
-									continue;
+									break;
 								}
 
 								/* any other problem is a fatal error */

Original file line number	Diff line number	Diff line change
`@@ -2413,13 +2413,12 @@ static int php_openssl_sockop_set_option(php_stream *stream, int option, int val`
`2413`	`2413`	`int err = SSL_get_error(sslsock->ssl_handle, n);`
`2414`	`2414`
`2415`	`2415`	`if (err == SSL_ERROR_SYSCALL) {`
`2416`		`- alive = php_socket_errno() == EAGAIN;`
	`2416`	`+ alive = n == -1 && php_socket_errno() == EAGAIN;`
`2417`	`2417`	`break;`
`2418`	`2418`	`}`
`2419`	`2419`
`2420`	`2420`	`if (err == SSL_ERROR_WANT_READ \|\| err == SSL_ERROR_WANT_WRITE) {`
`2421`		`- /* re-negotiate */`
`2422`		`- continue;`
	`2421`	`+ break;`
`2423`	`2422`	`}`
`2424`	`2423`
`2425`	`2424`	`/* any other problem is a fatal error */`