This seems to resolve the issues with fgets.

I've moved EOF detection into the streams layer; a stream reader
implementation should set stream->eof when it detects EOF.
Fixed test for user streams - it still fails but that is due to an output
buffering bug.

Author: wez

ext/standard/php_fopen_wrapper.c

@@ -39,6 +39,7 @@ static size_t php_stream_output_write(php_stream *stream, const char *buf, size_
 
 static size_t php_stream_output_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
 {
+	stream->eof = 1;
 	return 0;
 }
 

ext/standard/tests/file/userstreams.phpt

@@ -243,11 +243,12 @@ foreach($line_lengths as $line_length) {
 
 		printf("\n--[%d] whence=%s offset=%d line_length=%d position_should_be=%d --\n",
 			$j, $whence_names[$whence], $offset, $line_length, $position);
-		printf("REAL: pos=(%d,%d,%d) ret=%d line=`%s'\n", $rpb, $rpa, ftell($tf), $rr, $rline);
-		printf("USER: pos=(%d,%d,%d) ret=%d line=`%s'\n", $upb, $upa, ftell($fp), $ur, $uline);
+		printf("REAL: pos=(%d,%d,%d) ret=%d line[%d]=`%s'\n", $rpb, $rpa, ftell($tf), $rr, strlen($rline), $rline);
+		printf("USER: pos=(%d,%d,%d) ret=%d line[%d]=`%s'\n", $upb, $upa, ftell($fp), $ur, strlen($uline), $uline);
 
 		if ($rr != $ur || $rline != $uline || $rpa != $position || $upa != $position) {
 			$fail_count++;
+			echo "###################################### FAIL!\n";
 			$dat = stream_get_meta_data($fp);
 			var_dump($dat);
 			break;
@@ -273,7 +274,7 @@ fseek($tf, $DATALEN / 2, SEEK_SET);
 
 while(!feof($fp)) {
 	$uline = fgets($fp, 1024);
-	$rline = fgets($fp, 1024);
+	$rline = fgets($tf, 1024);
 
 	if ($uline != $rline) {
 		echo "FGETS: FAIL\nuser=$uline\nreal=$rline\n";

ext/zlib/zlib_fopen_wrapper.c

@@ -32,14 +32,14 @@ struct php_gz_stream_data_t	{
 static size_t php_gziop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
 {
 	struct php_gz_stream_data_t *self = (struct php_gz_stream_data_t *)stream->abstract;
+	size_t ret;
+	
+	ret = gzread(self->gz_file, buf, count);
 
-	if (buf == NULL && count == 0) {
-		if (gzeof(self->gz_file))
-			return EOF;
-		return 0;
-	}
+	if (ret == 0 && gzeof(self->gz_file))
+		stream->eof = 1;
 
-	return gzread(self->gz_file, buf, count); 
+	return ret;
 }
 
 static size_t php_gziop_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC)

main/memory_streams.c

@@ -89,14 +89,6 @@ static size_t php_stream_memory_read(php_stream *stream, char *buf, size_t count
 	ms = stream->abstract;
 	assert(ms != NULL);
 
-	if (buf == NULL && count == 0)	{
-		/* check for EOF condition */
-		if (ms->fpos >= ms->fsize)	{
-			return EOF;
-		}
-		return 0;
-	}
-
 	if (ms->fpos + count > ms->fsize) {
 		count = ms->fsize - ms->fpos;
 	}
@@ -105,6 +97,8 @@ static size_t php_stream_memory_read(php_stream *stream, char *buf, size_t count
 		assert(buf!= NULL);
 		memcpy(buf, ms->data+ms->fpos, count);
 		ms->fpos += count;
+	} else {
+		stream->eof = 1;
 	}
 	return count;
 }

main/network.c

@@ -767,32 +767,6 @@ static size_t php_sockop_read(php_stream *stream, char *buf, size_t count TSRMLS
 	php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
 	size_t nr_bytes = 0;
 
-	if (buf == NULL && count == 0) {
-		/* check for EOF condition */
-		
-DUMP_SOCK_STATE("check for EOF", sock);
-		
-		if (sock->eof)
-			return EOF;
-
-		/* no data in the buffer - lets examine the socket */
-#if HAVE_SYS_POLL_H && HAVE_POLL
-		{
-			struct pollfd topoll;
-			
-			topoll.fd = sock->socket;
-			topoll.events = POLLIN;
-			topoll.revents = 0;
-			
-			if (poll(&topoll, 1, 0) == 1) {
-				return topoll.revents & POLLHUP ? EOF : 0;
-			}
-		}
-#endif
-		/* presume that we are not yet at the eof */
-		return 0;
-	}
-
 	if(sock->is_blocked) {
 		php_sock_stream_wait_for_data(stream, sock TSRMLS_CC);
 		if (sock->timeout_event)
@@ -811,7 +785,7 @@ DUMP_SOCK_STATE("check for EOF", sock);
 	php_stream_notify_progress_increment(stream->context, nr_bytes, 0);
 
 	if(nr_bytes == 0 || (nr_bytes < 0 && streams_socket_errno != EWOULDBLOCK)) {
-		sock->eof = 1;
+		stream->eof = 1;
 	}
 
 	return nr_bytes;

main/php_streams.h

@@ -269,6 +269,8 @@ struct _php_stream  {
 	/* how much data to read when filling buffer */
 	size_t chunk_size;
 
+	int eof;
+
 }; /* php_stream */
 /* state definitions when closing down; these are private to streams.c */
 #define PHP_STREAM_FCLOSE_NONE 0