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

Merge branch 'PHP-7.2' into PHP-7.3

Browse Source 
* PHP-7.2:
  Fix #77944: Wrong meta pdo_type for bigint on LLP64
This commit is contained in:
Christoph M. Becker
2019-04-27 18:46:57 +02:00
parent 70239ea1d3 16609880f8
commit e561d4100b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -8,6 +8,9 @@ PHP NEWS
- JSON:
. Fixed bug #77843 (Use after free with json serializer). (Nikita)
- PDO_MySQL:
. Fixed bug #77944 (Wrong meta pdo_type for bigint on LLP64). (cmb)
- Session:
. Fixed bug #77911 (Wrong warning for session.sid_bits_per_character). (cmb)

2
ext/pdo_mysql/mysql_statement.c
View File

@@ -874,7 +874,7 @@ static int pdo_mysql_stmt_col_meta(pdo_stmt_t *stmt, zend_long colno, zval *retu
case MYSQL_TYPE_SHORT:
case MYSQL_TYPE_INT24:
case MYSQL_TYPE_LONG:
#if SIZEOF_LONG==8
#if SIZEOF_ZEND_LONG==8
case MYSQL_TYPE_LONGLONG:
#endif
add_assoc_long(return_value, "pdo_type", PDO_PARAM_INT);