]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c96a9ca 1896ca4)
Merge branch 'PHP-5.6' into PHP-7.0
authorJulien Pauli <jpauli@php.net>
Tue, 12 Jul 2016 13:50:58 +0000 (15:50 +0200)
committerJulien Pauli <jpauli@php.net>
Tue, 12 Jul 2016 13:50:58 +0000 (15:50 +0200)
commit152d53c8440f7f9f4c97af899ef3d5cf5126084d
treef899f25f18778f80cd3619d7a6109c72c303052atree | snapshot
parentc96a9ca6f5630495fe2b34ca709111160a156684commit | diff
parent1896ca4e88451d5190d3ce921d6f7a52b3ec6e9fcommit | diff
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Updated NEWS
  Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
  Revert "Fix test for #52384"

Conflicts:
ext/pdo/pdo_stmt.c
ext/pdo/pdo_stmt.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.