diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2013-11-07 18:09:15 -0800 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2013-11-07 18:09:15 -0800 |
| commit | b3d522d215681d641e9827e10f1b09a7659bc589 (patch) | |
| tree | 5f402ff33ee10e0beaed0f01d751a11ae0ac8288 /ext/json/php_json.h | |
| parent | 54fe719953eec91e4416addae1bda2c3f9ce82bb (diff) | |
| parent | 890ea8411f908ee8ab84389b42066f66d4a033e6 (diff) | |
| download | php-git-b3d522d215681d641e9827e10f1b09a7659bc589.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
Conflicts:
ext/pdo/pdo_sql_parser.c
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions