diff options
| author | Anatol Belski <ab@php.net> | 2015-10-18 11:28:57 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-10-18 11:28:57 +0200 |
| commit | af8937c0568fc33682c880ff42ba1c845be1b356 (patch) | |
| tree | a1597f5e2c07ae34e33d4cb5a34f30eb169e52a4 /sapi/phpdbg/phpdbg.init.d | |
| parent | c100a742dceaa0bb8dac5251b676155f4c1a8cd3 (diff) | |
| parent | 7f33ab834d87452082526205c256a4827fb71142 (diff) | |
| download | php-git-af8937c0568fc33682c880ff42ba1c845be1b356.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
C89 compat
use spprintf instead (no need to estrdup afterwards).
dblib's dbcolname can return null in some cases
testcase fot bug #69757
Segmentation fault on pdo_dblib::nextRowset (bug #69757)
Conflicts:
ext/pdo_dblib/dblib_stmt.c
Diffstat (limited to 'sapi/phpdbg/phpdbg.init.d')
0 files changed, 0 insertions, 0 deletions