summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2013-11-07 18:09:53 -0800
committerRasmus Lerdorf <rasmus@php.net>2013-11-07 18:09:53 -0800
commit756dc19e59c76acca5118e2ea37ff119b02f3b13 (patch)
tree6d5da2a7c22b25df93565e2659360fd46748205b /ext/json/php_json.h
parent929bf11e910ec3fc85617a1c766bba31bad22c26 (diff)
parentb3d522d215681d641e9827e10f1b09a7659bc589 (diff)
downloadphp-git-756dc19e59c76acca5118e2ea37ff119b02f3b13.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions