diff options
| author | Wez Furlong <wez@php.net> | 2002-03-19 17:49:02 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2002-03-19 17:49:02 +0000 |
| commit | 14a3911866c0f69f4e5eafc8f7d320878d1b995c (patch) | |
| tree | 561d813ef64f5fb9a27bc0f2ca4615c846b96d6e /main/network.c | |
| parent | b92f2da5fa2fd69de34f3f0136078db7410ae15f (diff) | |
| download | php-git-14a3911866c0f69f4e5eafc8f7d320878d1b995c.tar.gz | |
fix for bug #16168
Diffstat (limited to 'main/network.c')
| -rw-r--r-- | main/network.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/network.c b/main/network.c index 0d80527018..be15ae2677 100644 --- a/main/network.c +++ b/main/network.c @@ -17,7 +17,6 @@ */ /* $Id$ */ -#define PHP_SOCK_CHUNK_SIZE 8192 #define MAX_CHUNKS_PER_READ 10 #include "php.h" @@ -71,6 +70,8 @@ int inet_aton(const char *, struct in_addr *); #include <sys/un.h> #endif +#include "ext/standard/file.h" + #ifdef PHP_WIN32 # define SOCK_ERR INVALID_SOCKET # define SOCK_CONN_ERR SOCKET_ERROR @@ -425,7 +426,7 @@ PHPAPI php_stream *_php_stream_sock_open_from_socket(int socket, int persistent memset(sock, 0, sizeof(php_netstream_data_t)); sock->is_blocked = 1; - sock->chunk_size = PHP_SOCK_CHUNK_SIZE; + sock->chunk_size = FG(def_chunk_size); sock->timeout.tv_sec = -1; sock->socket = socket; @@ -780,7 +781,7 @@ static int php_sockop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC) if (ret) { /* DANGER!: data buffered in stream->readbuf will be forgotten! */ if (TOREAD(sock) > 0) - zend_error(E_WARNING, "%s(): buffered data lost during conversion to FILE*!", get_active_function_name(TSRMLS_C)); + zend_error(E_WARNING, "%s(): %d bytes of buffered data lost during conversion to FILE*!", get_active_function_name(TSRMLS_C), TOREAD(sock)); *ret = fdopen(sock->socket, stream->mode); if (*ret) return SUCCESS; |