From: Xinchen Hui <laruence@php.net>
Date: Wed, 27 May 2015 08:47:15 +0000 (+0800)
Subject: Fixed the fix in f68dc94aa727085040650b4c9354672f2f62ee6a
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=151e52f6eb2cf378ea30b4b53bb5afc4a5e6ec99;p=php

Fixed the fix in f68dc94aa727085040650b4c9354672f2f62ee6a
---

diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c
index 47899abf66..70709eadc1 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;
 }