Skip to content

Commit 1605e6f

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Fix coding style from previous commit
2 parents 1f0661d + 82b8830 commit 1605e6f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

ext/mysqlnd/mysqlnd_wireprotocol.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,9 @@ php_mysqlnd_greet_read(MYSQLND_CONN_DATA * conn, void * _packet)
373373

374374
/* MariaDB always sends 5.5.5 before version string: 5.5.5 was never released,
375375
so just ignore it */
376-
if (!strncmp((char *) p, MARIADB_RPL_VERSION_HACK, sizeof(MARIADB_RPL_VERSION_HACK) - 1))
377-
p+= sizeof(MARIADB_RPL_VERSION_HACK) - 1;
376+
if (!strncmp((char *) p, MARIADB_RPL_VERSION_HACK, sizeof(MARIADB_RPL_VERSION_HACK) - 1)) {
377+
p += sizeof(MARIADB_RPL_VERSION_HACK) - 1;
378+
}
378379

379380
packet->server_version = estrdup((char *)p);
380381
p+= strlen(packet->server_version) + 1; /* eat the '\0' */

0 commit comments

Comments
 (0)