Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit 4155f53dbef5 · 2019-02-21T18:26:00.000+01:00
* PHP-7.4:
  Fix typo in error message
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
@@ -1061,7 +1061,7 @@ mysqlnd_caching_sha2_handle_server_response(struct st_mysqlnd_authentication_plu
 			// The server tried to send a key, which we didn't expect
 			// fall-through
 		default:
-			php_error_docref(NULL, E_WARNING, "Unexpected server respose while doing caching_sha2 auth: %i", result_packet.response_code);
+			php_error_docref(NULL, E_WARNING, "Unexpected server response while doing caching_sha2 auth: %i", result_packet.response_code);
 	}
 
 	DBG_VOID_RETURN;

Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,7 @@ mysqlnd_caching_sha2_handle_server_response(struct st_mysqlnd_authentication_plu`
`1061`	`1061`	`// The server tried to send a key, which we didn't expect`
`1062`	`1062`	`// fall-through`
`1063`	`1063`	`default:`
`1064`		`- php_error_docref(NULL, E_WARNING, "Unexpected server respose while doing caching_sha2 auth: %i", result_packet.response_code);`
	`1064`	`+ php_error_docref(NULL, E_WARNING, "Unexpected server response while doing caching_sha2 auth: %i", result_packet.response_code);`
`1065`	`1065`	`}`
`1066`	`1066`
`1067`	`1067`	`DBG_VOID_RETURN;`