diff options
| author | Adam Baratz <adambaratz@php.net> | 2016-09-13 17:02:53 -0400 |
|---|---|---|
| committer | Adam Baratz <adambaratz@php.net> | 2016-09-13 17:02:53 -0400 |
| commit | f6b6e97b29b7155efabbd935fc5f1cbdf548d601 (patch) | |
| tree | 61513a6abe431c2c242365cef27d451ee443564b /ext/json/json.c | |
| parent | 45850213bd1c924e83e4b291bc475788762e103b (diff) | |
| parent | bcee34c649c7a26bebf282ca94e08ef06b882017 (diff) | |
| download | php-git-f6b6e97b29b7155efabbd935fc5f1cbdf548d601.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add special case for earlier versions of TDS
Adjust error formatting so ext/pdo/tests/bug_43130.phpt passes with pdo_dblib
Free error and message strings when cleaning up PDO instances that use pdo_dblib
Add common suite
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions