summaryrefslogtreecommitdiff
path: root/main/streams/plain_wrapper.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-09-29 17:29:00 +0200
committerAnatol Belski <ab@php.net>2014-09-29 17:29:00 +0200
commitb428dc761deb46be0e137e6c9c43b743bd95ce83 (patch)
treec6c3dc4b566be67bab207530a871e70e954ebef8 /main/streams/plain_wrapper.c
parent78e23758b7efa10d7f7957534c101e344c880545 (diff)
parent231a311ecbfc2e680a4353ff6738024e52e02326 (diff)
downloadphp-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.c2
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.*/