From: Wez Furlong <wez@php.net>
Date: Fri, 28 Nov 2003 22:48:31 +0000 (+0000)
Subject: Probable fix for #25575; STDIN/STDOUT/STDERR streams not registered
X-Git-Tag: php-4.3.5RC1~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5fd7263f01d49145f6d45a8a16e7b7b68d9e61d0;p=php

Probable fix for #25575; STDIN/STDOUT/STDERR streams not registered
as network sockets when PHP run from x?inetd.
---

diff --git a/main/streams.c b/main/streams.c
index 62028f0a81..76647f1db6 100755
--- a/main/streams.c
+++ b/main/streams.c
@@ -2016,6 +2016,16 @@ PHPAPI php_stream *_php_stream_fopen_from_fd(int fd, const char *mode, const cha
 {
 	php_stdio_stream_data *self;
 	php_stream *stream;
+#if defined(S_ISFIFO) || defined(S_ISSOCK)
+	struct stat sb;
+	int stat_ok;
+
+	stat_ok = fd >= 0 && fstat(fd, &sb) == 0;
+
+	if (stat_ok && S_ISSOCK(sb.st_mode)) {
+		return _php_stream_sock_open_from_socket(fd, persistent_id STREAMS_CC TSRMLS_CC);
+	}
+#endif
 
 	self = pemalloc_rel_orig(sizeof(*self), persistent_id);
 	memset(self, 0, sizeof(*self));
@@ -2027,9 +2037,8 @@ PHPAPI php_stream *_php_stream_fopen_from_fd(int fd, const char *mode, const cha
 
 #ifdef S_ISFIFO
 	/* detect if this is a pipe */
-	if (self->fd >= 0) {
-		struct stat sb;
-		self->is_pipe = (fstat(self->fd, &sb) == 0 && S_ISFIFO(sb.st_mode)) ? 1 : 0;
+	if (stat_ok) {
+		self->is_pipe = S_ISFIFO(sb.st_mode) ? 1 : 0;
 	}
 #elif defined(PHP_WIN32)
 	{