cvs: php4 /main network.c
| From: | Wez Furlong | Date: | Tue, 30 Apr 2002 00:20:36 +0000 |
| Subject: | cvs: php4 /main network.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11544@lists.php.net to get a copy of this message | ||
wez Mon Apr 29 20:20:36 2002 EDT
Modified files:
/php4/main network.c
Log:
Remove this; it should not have been commited
Index: php4/main/network.c
diff -u php4/main/network.c:1.49 php4/main/network.c:1.50
--- php4/main/network.c:1.49 Mon Apr 29 20:16:00 2002
+++ php4/main/network.c Mon Apr 29 20:20:34 2002
@@ -15,7 +15,7 @@
| Author: Stig Venaas <venaas@uninett.no> |
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.49 2002/04/30 00:16:00 wez Exp $ */
+/* $Id: network.c,v 1.50 2002/04/30 00:20:34 wez Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
#define MAX_CHUNKS_PER_READ 10
@@ -601,7 +601,7 @@
static void php_sock_stream_wait_for_data(php_stream *stream, php_netstream_data_t *sock TSRMLS_DC)
{
- fd_set fdr, tfdr, fdx;
+ fd_set fdr, tfdr;
int retval;
struct timeval timeout, *ptimeout;
@@ -617,12 +617,11 @@
while(1) {
tfdr = fdr;
- fdx = fdr;
timeout = sock->timeout;
DUMP_SOCK_STATE("wait_for_data", sock);
- retval = select(sock->socket + 1, &tfdr, NULL, &fdx, ptimeout);
+ retval = select(sock->socket + 1, &tfdr, NULL, NULL, ptimeout);
if (retval == 0)
sock->timeout_event = 1;