diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-08-12 16:35:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-08-12 16:35:41 +0800 |
| commit | dd618664a09dd81d8b8c44d6329bf5b8459cd173 (patch) | |
| tree | 6530b7cbee054cbb5fac27f36ed55c0a07f2a680 /ext/json/json.c | |
| parent | 3467526a65bfb15eaf9ec49a0b5673b84e26bca4 (diff) | |
| parent | fe41f87e468f8ae5ab68f9e4abfd58fa4bbc3f9d (diff) | |
| download | php-git-dd618664a09dd81d8b8c44d6329bf5b8459cd173.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72813 (Segfault with __get returned by ref)
Fix URL rewriter partially
Conflicts:
Zend/zend_object_handlers.c
ext/standard/url_scanner_ex.c
ext/standard/url_scanner_ex.re
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions