diff options
| author | Anatol Belski <ab@php.net> | 2015-02-06 19:05:13 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-02-06 19:05:13 +0100 |
| commit | e46e208819f4ce18390d77131f79b5b498d59bb7 (patch) | |
| tree | 17b4d34cdb6d15a2a7a2186ace39e46b8cbeb864 /ext/json/php_json_parser.h | |
| parent | 63761ab91e57c33faf8a1053b431dd16d030970c (diff) | |
| parent | a41aa46759d20e23af92df00b917ca66c6102412 (diff) | |
| download | php-git-e46e208819f4ce18390d77131f79b5b498d59bb7.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68964 Allowed memory size exhausted with odbc_exec
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions