com php-src: Fixed bug #69900 Too long timeout on pipes: main/streams/plain_wrapper.c
| From: | Anatol Belski | Date: | Tue, 28 Jul 2015 08:28:45 +0000 |
| Subject: | com php-src: Fixed bug #69900 Too long timeout on pipes: main/streams/plain_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88198@lists.php.net to get a copy of this message | ||
Commit: 20e765b841756a00a4b6f35783bbf74eab5d91ac
Author: Anatol Belski <ab@php.net> Tue, 28 Jul 2015 10:28:45 +0200
Parents: e4153e9144d442540e35fc48fa4e394623a238af
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=20e765b841756a00a4b6f35783bbf74eab5d91ac
Log:
Fixed bug #69900 Too long timeout on pipes
Bugs:
https://bugs.php.net/69900
Changed paths:
M main/streams/plain_wrapper.c
Diff:
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 8ef0619..7ffb666 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -358,11 +358,11 @@ static size_t php_stdiop_read(php_stream *stream, char *buf, size_t count
TSRMLS
if (!PeekNamedPipe(ph, NULL, 0, NULL, &avail_read, NULL)) {
break;
}
- /* If there's nothing to read, wait in 100ms periods. */
+ /* If there's nothing to read, wait in 10ms periods. */
if (0 == avail_read) {
- usleep(100000);
+ usleep(10);
}
- } while (0 == avail_read && retry++ < 320);
+ } while (0 == avail_read && retry++ < 3200000);
/* Reduce the required data amount to what is available, otherwise read()
will block.*/