CVS update: php3/functions
| From: | sas | Date: | Mon, 14 Jun 1999 05:46:26 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-6943@lists.php.net to get a copy of this message | ||
Date: Monday June 14, 1999 @ 1:46
Author: sas
Update of /repository/php3/functions
In directory php:/tmp/cvs-serv10800
Modified Files:
fsock.c
Log Message:
There is a bug in all releases of the GNU C library prior to release 2.1.2
(this includes all 2.0.x releases) where not all MSG_* flags are defined
properly. Since glibc is only used together with Linux kernels, we can
savely assume that the value for MSG_DONTWAIT is 0x40 (checked kernel 2.[02])
Index: php3/functions/fsock.c
diff -u php3/functions/fsock.c:1.114 php3/functions/fsock.c:1.115
--- php3/functions/fsock.c:1.114 Sun Jun 13 06:07:43 1999
+++ php3/functions/fsock.c Mon Jun 14 01:46:25 1999
@@ -27,7 +27,7 @@
| Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.114 1999/06/13 10:07:43 sas Exp $ */
+/* $Id: fsock.c,v 1.115 1999/06/14 05:46:25 sas Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
@@ -502,6 +502,10 @@
return nr_read;
}
+
+#if !defined(MSG_DONTWAIT) && defined(__GLIBC__) && __GLIBC__ == 2
+#define MSG_DONTWAIT 0x40
+#endif
/* only for blocking sockets */
static size_t _php3_sock_queued_data(php3i_sockbuf *sock)