diff options
| author | Anatol Belski <ab@php.net> | 2014-09-29 17:28:27 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-29 17:28:27 +0200 |
| commit | 231a311ecbfc2e680a4353ff6738024e52e02326 (patch) | |
| tree | 648bb3046db1108e69c4d2a80c4a60ab89a778f3 /main/streams/plain_wrapper.c | |
| parent | 7e16bb263f959ddbb5ea9eac8326db9101dd5d5e (diff) | |
| parent | 46aa2c396bf32b81c76ed2330e8e116eef8886a8 (diff) | |
| download | php-git-231a311ecbfc2e680a4353ff6738024e52e02326.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 1969401111..69c6a3ce26 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -361,7 +361,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.*/ |