[PHP-CVS] cvs: php-src(PHP_5_3) /main/streams xp_socket.c

2009-02-08 Thread Ilia Alshanetsky 
iliaa   Mon Feb  9 02:55:45 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main/streams   xp_socket.c 
  Log:
  
  MFB: Fixed bug #44874 (dead pfsockopen'ed sockets aren't reaped when
  the remote end restarts)
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.6.2.9r2=1.33.2.2.2.6.2.10diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.9 
php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.10
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.9   Wed Jan  7 20:21:46 2009
+++ php-src/main/streams/xp_socket.cMon Feb  9 02:55:45 2009
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.9 2009/01/07 20:21:46 felipe Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.10 2009/02/09 02:55:45 iliaa Exp $ */
 
 #include php.h
 #include ext/standard/file.h
@@ -281,7 +281,7 @@
if (sock-socket == -1) {
alive = 0;
} else if (php_pollfd_for(sock-socket, 
PHP_POLLREADABLE|POLLPRI, tv)  0) {
-   if (0 == recv(sock-socket, buf, 
sizeof(buf), MSG_PEEK)  php_socket_errno() != EWOULDBLOCK) {
+   if (0 = recv(sock-socket, buf, 
sizeof(buf), MSG_PEEK)  php_socket_errno() != EWOULDBLOCK) {
alive = 0;
}
}



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /main/streams xp_socket.c

2008-02-26 Thread Ilia Alshanetsky 
iliaa   Wed Feb 27 00:30:24 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/main/streams   xp_socket.c 
  Log:
  Fixed bug #44233 (MSG_PEEK undefined under BeOS R5)
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.6.2.1r2=1.33.2.2.2.6.2.2diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.1 
php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.2
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.1   Mon Dec 31 07:17:17 2007
+++ php-src/main/streams/xp_socket.cWed Feb 27 00:30:24 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.1 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.2 2008/02/27 00:30:24 iliaa Exp $ */
 
 #include php.h
 #include ext/standard/file.h
@@ -35,6 +35,10 @@
 # define MSG_DONTWAIT 0
 #endif
 
+#ifndef MSG_PEEK
+# define MSG_PEEK 0
+#endif
+
 php_stream_ops php_stream_generic_socket_ops;
 PHPAPI php_stream_ops php_stream_socket_ops;
 php_stream_ops php_stream_udp_socket_ops;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php