Patch mysql-client-ssl-handling-when-disabled.patch for MySQL related Bug #70063

Patch version 2015-07-13 12:11 UTC

• 2015-07-13 12:11 UTC [diff to current]

Developer: dominic.benson@thirdlight.com

diff -rupN php-5.4.43.orig/ext/mysqlnd/mysqlnd.c php-5.4.43/ext/mysqlnd/mysqlnd.c
--- php-5.4.43.orig/ext/mysqlnd/mysqlnd.c	2015-07-07 23:08:15.000000000 +0100
+++ php-5.4.43/ext/mysqlnd/mysqlnd.c	2015-07-13 12:43:12.385500682 +0100
@@ -465,9 +465,9 @@ mysqlnd_switch_to_ssl_if_needed(
 		}
 	}
 #else
-	auth_packet->client_flags &= ~CLIENT_SSL;
-	if (!PACKET_WRITE(auth_packet, conn)) {
-		goto close_conn;
+	if (mysql_flags & CLIENT_SSL) {
+		php_error(E_WARNING, "Unable to connect to MySQL using SSL as this PHP was not built with support for it");
+		auth_packet->client_flags &= ~CLIENT_SSL;
 	}
 #endif
 	ret = PASS;