diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2015-02-03 14:07:23 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2015-02-03 14:07:23 +0900 |
| commit | 1aa6242dcf856f799cd2c48a993fa507fbd949e6 (patch) | |
| tree | 254589fdcfa8aa26c1c4a815161dd5b0e0fbf3db /ext/json/JSON_parser.h | |
| parent | 5afe554d329cc7ebf054a42cc1d9bc3cff3e1b9a (diff) | |
| parent | 4dd7851208af77588b55bfcb4987f6fc16217784 (diff) | |
| download | php-git-1aa6242dcf856f799cd2c48a993fa507fbd949e6.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
Conflicts:
ext/session/mod_files.c
Diffstat (limited to 'ext/json/JSON_parser.h')
0 files changed, 0 insertions, 0 deletions