diff options
| author | Wez Furlong <wez@php.net> | 2002-09-28 22:12:23 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2002-09-28 22:12:23 +0000 |
| commit | 9509c209417af7726813c19a99adca37d4158662 (patch) | |
| tree | 7ab040407f6d0ed5725749b5acc1e3b2b477607e | |
| parent | 393d57d5be32b39dc84fa8159dbb52c3df5b3cee (diff) | |
| download | php-git-9509c209417af7726813c19a99adca37d4158662.tar.gz | |
remove chunk size setting code (it's now in streams.c).
Move timeout setting code.
| -rw-r--r-- | main/network.c | 33 | ||||
| -rw-r--r-- | main/php_network.h | 4 |
2 files changed, 7 insertions, 30 deletions
diff --git a/main/network.c b/main/network.c index 72a569ad0f..484550ac5d 100644 --- a/main/network.c +++ b/main/network.c @@ -670,16 +670,6 @@ PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int acti #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 @@ PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC) 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 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void 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; } } diff --git a/main/php_network.h b/main/php_network.h index e408fd4fbd..d9055a15a6 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -138,10 +138,6 @@ PHPAPI php_stream *_php_stream_sock_open_unix(const char *path, int pathlen, con /* }}} */ -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); #define php_stream_sock_ssl_activate(stream, activate) php_stream_sock_ssl_activate_with_method((stream), (activate), SSLv23_client_method(), NULL TSRMLS_CC) |