cvs: php-src(PHP_4_3) /main streams.c
| From: | Wez Furlong | Date: | Tue, 30 Mar 2004 11:04:33 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /main streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-26874@lists.php.net to get a copy of this message | ||
wez Tue Mar 30 06:04:33 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main streams.c
Log:
Fix for Bug #27762: SCO Openserver doesn't have S_ISSOCK
Possible side effect from this is that CLI scripts run from inetd won't
realize that stdin/stdout are sockets. But thats not our problem.
http://cvs.php.net/diff.php/php-src/main/streams.c?r1=1.125.2.87&r2=1.125.2.88&ty=u
Index: php-src/main/streams.c
diff -u php-src/main/streams.c:1.125.2.87 php-src/main/streams.c:1.125.2.88
--- php-src/main/streams.c:1.125.2.87 Tue Mar 16 18:23:25 2004
+++ php-src/main/streams.c Tue Mar 30 06:04:32 2004
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125.2.87 2004/03/16 23:23:25 iliaa Exp $ */
+/* $Id: streams.c,v 1.125.2.88 2004/03/30 11:04:32 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -2021,7 +2021,9 @@
int stat_ok;
stat_ok = fd >= 0 && fstat(fd, &sb) == 0;
+#endif
+#if defined(S_ISSOCK)
if (stat_ok && S_ISSOCK(sb.st_mode)) {
return _php_stream_sock_open_from_socket(fd, persistent_id STREAMS_CC TSRMLS_CC);
}