diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-01 12:17:32 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-01 12:17:32 +0300 |
| commit | f863d89b5cc991ebfbb69caacc724ad90513924b (patch) | |
| tree | bfc86167f42d781ab5140fb10e6eab887f9a0328 /ext/json/json_parser.tab.c | |
| parent | 4758505b27dbfbade703d80737b9d50a9c2b9dea (diff) | |
| parent | 9031a902e3393ff7dc8a02615430a7d894c740fa (diff) | |
| download | php-git-f863d89b5cc991ebfbb69caacc724ad90513924b.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69732 (can induce segmentation fault with basic php code).
Conflicts:
Zend/zend_vm_execute.h
Diffstat (limited to 'ext/json/json_parser.tab.c')
0 files changed, 0 insertions, 0 deletions