From: Anatol Belski <ab@php.net>
Date: Mon, 29 Sep 2014 14:30:40 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~94^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78e23758b7efa10d7f7957534c101e344c880545;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fixed bug #51800 proc_open on Windows hangs forever

Conflicts:
	main/streams/plain_wrapper.c
---

78e23758b7efa10d7f7957534c101e344c880545
diff --cc main/streams/plain_wrapper.c
index 2b8dcc478e,1969401111..8f0b981100
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@@ -348,7 -342,35 +348,35 @@@ static size_t php_stdiop_read(php_strea
  	assert(data != NULL);
  
  	if (data->fd >= 0) {
+ #ifdef PHP_WIN32
+ 		php_stdio_stream_data *self = (php_stdio_stream_data*)stream->abstract;
+ 
+ 		if (self->is_pipe || self->is_process_pipe) {
+ 			HANDLE ph = (HANDLE)_get_osfhandle(data->fd);
+ 			int retry = 0;
+ 			DWORD avail_read = 0;
+ 
+ 			do {
+ 				/* Look ahead to get the available data amount to read. Do the same
+ 					as read() does, however not blocking forever. In case it failed,
+ 					no data will be read (better than block). */
+ 				if (!PeekNamedPipe(ph, NULL, 0, NULL, &avail_read, NULL)) {
+ 					break;
+ 				}
+ 				/* If there's nothing to read, wait in 100ms periods. */
+ 				if (0 == avail_read) {
+ 					usleep(100000);
+ 				}
+ 			} while (0 == avail_read && retry++ < 180);
+ 
+ 			/* Reduce the required data amount to what is available, otherwise read()
+ 				will block.*/
+ 			if (avail_read < count) {
+ 				count = avail_read;
+ 			}
+ 		}
+ #endif
 -		ret = read(data->fd, buf, count);
 +		ret = read(data->fd, buf,  PLAIN_WRAP_BUF_SIZE(count));
  
  		if (ret == (size_t)-1 && errno == EINTR) {
  			/* Read was interrupted, retry once,