wez Sat Sep 28 18:12:23 2002 EDT
Modified files:
/php4/main network.c php_network.h
Log:
remove chunk size setting code (it's now in streams.c).
Move timeout setting code.
Index: php4/main/network.c
diff -u php4/main/network.c:1.69 php4/main/network.c:1.70
--- php4/main/network.c:1.69 Wed Sep 25 11:25:12 2002
+++ php4/main/network.c Sat Sep 28 18:12:23 2002
@@ -16,7 +16,7 @@
| Streams work by Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.69 2002/09/25 15:25:12 wez Exp $ */
+/* $Id: network.c,v 1.70 2002/09/28 22:12:23 wez Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -670,16 +670,6 @@
#endif
-PHPAPI void php_stream_sock_set_timeout(php_stream *stream, struct timeval *timeout
TSRMLS_DC)
-{
- php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
-
- if (!php_stream_is(stream, PHP_STREAM_IS_SOCKET))
- return;
-
- sock->timeout = *timeout;
- sock->timeout_event = 0;
-}
PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC)
{
@@ -711,20 +701,6 @@
return ret;
}
-PHPAPI size_t php_stream_sock_set_chunk_size(php_stream *stream, size_t size
TSRMLS_DC)
-{
- size_t oldsize;
-
- oldsize = stream->chunk_size;
- stream->chunk_size = size;
-
- return oldsize;
-}
-
-#define TOREAD(sock) ((sock)->writepos - (sock)->readpos)
-#define READPTR(sock) ((sock)->readbuf + (sock)->readpos)
-#define WRITEPTR(sock) ((sock)->readbuf + (sock)->writepos)
-
static size_t php_sockop_write(php_stream *stream, const char *buf, size_t count
TSRMLS_DC)
{
php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract;
@@ -897,10 +873,15 @@
return oldmode;
}
- return -1;
+ return PHP_STREAM_OPTION_RETURN_ERR;
+
+ case PHP_STREAM_OPTION_READ_TIMEOUT:
+ sock->timeout = *(struct timeval*)ptrparam;
+ sock->timeout_event = 0;
+ return PHP_STREAM_OPTION_RETURN_OK;
default:
- return -1;
+ return PHP_STREAM_OPTION_RETURN_NOTIMPL;
}
}
Index: php4/main/php_network.h
diff -u php4/main/php_network.h:1.29 php4/main/php_network.h:1.30
--- php4/main/php_network.h:1.29 Wed Sep 25 11:25:12 2002
+++ php4/main/php_network.h Sat Sep 28 18:12:23 2002
@@ -15,7 +15,7 @@
| Author: Stig Venaas <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_network.h,v 1.29 2002/09/25 15:25:12 wez Exp $ */
+/* $Id: php_network.h,v 1.30 2002/09/28 22:12:23 wez Exp $ */
#ifndef _PHP_NETWORK_H
#define _PHP_NETWORK_H
@@ -137,10 +137,6 @@
#define php_stream_sock_open_unix_rel(path, pathlen, persistent, timeval)
_php_stream_sock_open_unix((path), (pathlen), (persistent), (timeval) STREAMS_REL_CC
TSRMLS_CC)
/* }}} */
-
-PHPAPI void php_stream_sock_set_timeout(php_stream *stream, struct timeval *timeout
TSRMLS_DC);
-/* set the chunk size for the stream; return the old chunk size */
-PHPAPI size_t php_stream_sock_set_chunk_size(php_stream *stream, size_t size
TSRMLS_DC);
#if HAVE_OPENSSL_EXT
PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int activate,
SSL_METHOD *method, php_stream *session_stream TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
