]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c100a74 7f33ab8)
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Sun, 18 Oct 2015 09:28:57 +0000 (11:28 +0200)
committerAnatol Belski <ab@php.net>
Sun, 18 Oct 2015 09:28:57 +0000 (11:28 +0200)
commitaf8937c0568fc33682c880ff42ba1c845be1b356
treea1597f5e2c07ae34e33d4cb5a34f30eb169e52a4tree | snapshot
parentc100a742dceaa0bb8dac5251b676155f4c1a8cd3commit | diff
parent7f33ab834d87452082526205c256a4827fb71142commit | diff
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
ext/pdo_dblib/dblib_stmt.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.