com php-src: Fixed the fix in f68dc94aa727085040650b4c9354672f2f62ee6a: sapi/phpdbg/phpdbg_io.c
| From: | Xinchen Hui | Date: | Wed, 27 May 2015 08:47:15 +0000 |
| Subject: | com php-src: Fixed the fix in f68dc94aa727085040650b4c9354672f2f62ee6a: sapi/phpdbg/phpdbg_io.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86944@lists.php.net to get a copy of this message | ||
Commit: 151e52f6eb2cf378ea30b4b53bb5afc4a5e6ec99
Author: Xinchen Hui <laruence@php.net> Wed, 27 May 2015 16:47:15 +0800
Parents: 90df7e75e6b1ca301d053cbe6d1dee66c586ecb8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=151e52f6eb2cf378ea30b4b53bb5afc4a5e6ec99
Log:
Fixed the fix in f68dc94aa727085040650b4c9354672f2f62ee6a
Changed paths:
M sapi/phpdbg/phpdbg_io.c
Diff:
diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c
index 47899ab..70709ea 100644
--- a/sapi/phpdbg/phpdbg_io.c
+++ b/sapi/phpdbg/phpdbg_io.c
@@ -184,11 +184,9 @@ PHPDBG_API int phpdbg_mixed_read(int sock, char *ptr, int len, int tmo) {
return phpdbg_consume_bytes(sock, ptr, len, tmo);
}
- ret = read(sock, ptr, len);
- if (ret == -1 && errno == EINTR) {
- /* Read was interrupted, retry once */
+ do {
ret = read(sock, ptr, len);
- }
+ } while (ret == -1 && errno == EINTR);
return ret;
}