wez Sat Oct 5 06:59:35 2002 EDT
Modified files:
/php4/main php_network.h streams.c
/php4/ext/standard file.c
Log:
EOF related fixes.
Index: php4/main/php_network.h
diff -u php4/main/php_network.h:1.30 php4/main/php_network.h:1.31
--- php4/main/php_network.h:1.30 Sat Sep 28 18:12:23 2002
+++ php4/main/php_network.h Sat Oct 5 06:59:34 2002
@@ -15,7 +15,7 @@
| Author: Stig Venaas <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_network.h,v 1.30 2002/09/28 22:12:23 wez Exp $ */
+/* $Id: php_network.h,v 1.31 2002/10/05 10:59:34 wez Exp $ */
#ifndef _PHP_NETWORK_H
#define _PHP_NETWORK_H
@@ -103,7 +103,6 @@
struct _php_netstream_data_t {
int socket;
- char eof;
char is_blocked;
struct timeval timeout;
char timeout_event;
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.96 php4/main/streams.c:1.97
--- php4/main/streams.c:1.96 Sat Oct 5 06:35:13 2002
+++ php4/main/streams.c Sat Oct 5 06:59:34 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.96 2002/10/05 10:35:13 wez Exp $ */
+/* $Id: streams.c,v 1.97 2002/10/05 10:59:34 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1246,6 +1246,7 @@
if (ret == 0 && feof(data->file))
stream->eof = 1;
}
+ return ret;
}
static int php_stdiop_close(php_stream *stream, int close_handle TSRMLS_DC)
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.267 php4/ext/standard/file.c:1.268
--- php4/ext/standard/file.c:1.267 Wed Oct 2 19:52:08 2002
+++ php4/ext/standard/file.c Sat Oct 5 06:59:35 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.267 2002/10/02 23:52:08 dreid Exp $ */
+/* $Id: file.c,v 1.268 2002/10/05 10:59:35 wez Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -633,7 +633,7 @@
add_assoc_bool(return_value, "timed_out", sock->timeout_event);
add_assoc_bool(return_value, "blocked", sock->is_blocked);
- add_assoc_bool(return_value, "eof", sock->eof);
+ add_assoc_bool(return_value, "eof", stream->eof);
} else {
add_assoc_bool(return_value, "timed_out", 0);
add_assoc_bool(return_value, "blocked", 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
