]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d2948d4 30925cd)
Merge branch 'PHP-5.6' into PHP-7.0
authorMatteo Beccati <mbeccati@php.net>
Mon, 4 Apr 2016 22:07:02 +0000 (00:07 +0200)
committerMatteo Beccati <mbeccati@php.net>
Mon, 4 Apr 2016 22:07:02 +0000 (00:07 +0200)
commit4090e709aa3505e414243d4e19e18804ea8371e4
tree28f584fee54edc03efda45ba3f95a78051b10f57tree | snapshot
parentd2948d4b71cefe31b686e6354ba06cc675537e78commit | diff
parent30925cd49826c59ea8459a24bcb24d47c2ce562dcommit | diff
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #71447 (Quotes inside comments not properly handled)
  Fixed a few PDO tests to conform to PDO Common standards
  news entry #69537
  Fix #69537: __debugInfo with empty string for key gives error

Conflicts:
Zend/zend_compile.c
NEWS diff1 | diff2 | blob | history
ext/pdo/pdo_sql_parser.c diff1 | diff2 | blob | history
ext/pdo/pdo_sql_parser.re diff1 | diff2 | blob | history
ext/pdo/tests/bug_47769.phpt diff1 | diff2 | blob | history
ext/pdo/tests/bug_65946.phpt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.