php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 06:02:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0' into PHP-8.1

Browse Source 
* PHP-8.0:
  Fix coding style from previous commit
This commit is contained in:
Kamil Tekiela
2022-01-20 11:18:03 +00:00
parent 1f0661d3e5 82b883034c
commit 1605e6fd9f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/mysqlnd/mysqlnd_wireprotocol.c
View File

@@ -373,8 +373,9 @@ php_mysqlnd_greet_read(MYSQLND_CONN_DATA * conn, void * _packet)
/* MariaDB always sends 5.5.5 before version string: 5.5.5 was never released,
so just ignore it */
if (!strncmp((char *) p, MARIADB_RPL_VERSION_HACK, sizeof(MARIADB_RPL_VERSION_HACK) - 1))
p+= sizeof(MARIADB_RPL_VERSION_HACK) - 1;
if (!strncmp((char *) p, MARIADB_RPL_VERSION_HACK, sizeof(MARIADB_RPL_VERSION_HACK) - 1)) {
p += sizeof(MARIADB_RPL_VERSION_HACK) - 1;
}
packet->server_version = estrdup((char *)p);
p+= strlen(packet->server_version) + 1; /* eat the '\0' */