wez Thu Sep 26 06:17:42 2002 EDT
Modified files:
/php4/ext/standard file.c file.h http_fopen_wrapper.c
Log:
Remove an unused variable and a now-unused function.
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.261 php4/ext/standard/file.c:1.262
--- php4/ext/standard/file.c:1.261 Thu Sep 26 06:14:40 2002
+++ php4/ext/standard/file.c Thu Sep 26 06:17:40 2002
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.261 2002/09/26 10:14:40 wez Exp $ */
+/* $Id: file.c,v 1.262 2002/09/26 10:17:40 wez Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1113,41 +1113,6 @@
}
#endif /* HAVE_SYS_TIME_H || defined(PHP_WIN32) */
/* }}} */
-
-
-/* {{{ proto array socket_get_status(resource socket_descriptor)
- Return an array describing socket status */
-PHP_FUNCTION(socket_get_status)
-{
- zval **socket;
- php_stream *stream;
-
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(ZEND_NUM_ARGS(), &socket)
== FAILURE) {
- WRONG_PARAM_COUNT;
- }
-
- php_stream_from_zval(stream, socket);
-
-
- array_init(return_value);
-
- if (php_stream_is(stream, PHP_STREAM_IS_SOCKET)) {
-
- php_netstream_data_t *sock = PHP_NETSTREAM_DATA_FROM_STREAM(stream);
-
- 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_long(return_value, "unread_bytes", stream->writepos -
stream->readpos);
-
- }
- else {
- RETURN_FALSE;
- }
-
-}
-/* }}} */
-
/* {{{ proto string fgets(resource fp[, int length])
Get a line from file pointer */
Index: php4/ext/standard/file.h
diff -u php4/ext/standard/file.h:1.66 php4/ext/standard/file.h:1.67
--- php4/ext/standard/file.h:1.66 Thu Sep 26 06:14:41 2002
+++ php4/ext/standard/file.h Thu Sep 26 06:17:40 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.h,v 1.66 2002/09/26 10:14:41 wez Exp $ */
+/* $Id: file.h,v 1.67 2002/09/26 10:17:40 wez Exp $ */
/* Synced with php 3.0 revision 1.30 1999-06-16 [ssb] */
@@ -57,7 +57,6 @@
PHP_FUNCTION(set_socket_blocking); /* deprecated */
PHP_FUNCTION(socket_set_blocking);
PHP_FUNCTION(socket_set_timeout);
-PHP_FUNCTION(socket_get_status);
PHP_FUNCTION(set_file_buffer);
PHP_FUNCTION(get_meta_tags);
PHP_FUNCTION(flock);
Index: php4/ext/standard/http_fopen_wrapper.c
diff -u php4/ext/standard/http_fopen_wrapper.c:1.50
php4/ext/standard/http_fopen_wrapper.c:1.51
--- php4/ext/standard/http_fopen_wrapper.c:1.50 Thu Sep 26 06:14:41 2002
+++ php4/ext/standard/http_fopen_wrapper.c Thu Sep 26 06:17:41 2002
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.50 2002/09/26 10:14:41 wez Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.51 2002/09/26 10:17:41 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -283,7 +283,7 @@
while (!body && !php_stream_eof(stream)) {
if (php_stream_gets(stream, http_header_line,
HTTP_HEADER_BLOCK_SIZE-1) != NULL) {
- char *p, *ws;
+ char *p;
int found_eol = 0;
int http_header_line_length;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
