diff options
| author | Wez Furlong <wez@php.net> | 2002-09-23 18:12:39 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2002-09-23 18:12:39 +0000 |
| commit | c74b9faca5fbd00b0be1dc0ac9906eb5a85b6ef2 (patch) | |
| tree | ec2d7fc126798f475afb9e8726343bbeea0f4d2e /main/network.c | |
| parent | 8dde69004255a6f9696182f0f55423f9d09a2073 (diff) | |
| download | php-git-c74b9faca5fbd00b0be1dc0ac9906eb5a85b6ef2.tar.gz | |
Implement a default_socket_timeout and auto_detect_line_endings ini options.
Also move user_agent from BG to FG.
Diffstat (limited to 'main/network.c')
| -rw-r--r-- | main/network.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/main/network.c b/main/network.c index 4f51d6cb16..64ecd75cfb 100644 --- a/main/network.c +++ b/main/network.c @@ -19,8 +19,6 @@ /* $Id$ */ /*#define DEBUG_MAIN_NETWORK 1*/ -#define MAX_CHUNKS_PER_READ 10 -#define SOCKET_DEFAULT_TIMEOUT 60 #include "php.h" @@ -540,7 +538,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->timeout.tv_sec = SOCKET_DEFAULT_TIMEOUT; + sock->timeout.tv_sec = FG(default_socket_timeout); sock->socket = socket; stream = php_stream_alloc_rel(&php_stream_socket_ops, sock, persistent, "r+"); |