diff options
| author | Anatol Belski <ab@php.net> | 2017-07-12 14:49:58 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-07-12 14:49:58 +0200 |
| commit | 8b04e89ef0100932a451870b84666a36fa2fa43f (patch) | |
| tree | bbcb2ff0b9dc84b278b5901547fd2f734875ad5f /ext/json/json_encoder.c | |
| parent | 82acb58d8a1d2d4bf3833797833f2d3dff720e2c (diff) | |
| parent | 04cc2f6473e8439929ba8448f038058d5e20ba86 (diff) | |
| download | php-git-8b04e89ef0100932a451870b84666a36fa2fa43f.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
increase poll timeout as false positives mitigation
Diffstat (limited to 'ext/json/json_encoder.c')
0 files changed, 0 insertions, 0 deletions