diff options
author | Anatol Belski <ab@php.net> | 2014-09-29 17:29:00 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-09-29 17:29:00 +0200 |
commit | b428dc761deb46be0e137e6c9c43b743bd95ce83 (patch) | |
tree | c6c3dc4b566be67bab207530a871e70e954ebef8 /main/streams/plain_wrapper.c | |
parent | 78e23758b7efa10d7f7957534c101e344c880545 (diff) | |
parent | 231a311ecbfc2e680a4353ff6738024e52e02326 (diff) | |
download | php-git-b428dc761deb46be0e137e6c9c43b743bd95ce83.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
increase the polling period to not to break existing behaviours
Diffstat (limited to 'main/streams/plain_wrapper.c')
-rw-r--r-- | main/streams/plain_wrapper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 8f0b981100..28328c3cd5 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -367,7 +367,7 @@ static size_t php_stdiop_read(php_stream *stream, char *buf, size_t count TSRMLS if (0 == avail_read) { usleep(100000); } - } while (0 == avail_read && retry++ < 180); + } while (0 == avail_read && retry++ < 320); /* Reduce the required data amount to what is available, otherwise read() will block.*/ |