diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-02-19 01:28:37 +0000 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-02-19 01:28:37 +0000 |
| commit | a3a5157286a7a3cca159926801f0a5b3936d17c0 (patch) | |
| tree | 091893ff14ad1c8807fccc29ab2f74e110aaef08 /main | |
| parent | 356b6194879738c905ee1816c460491803826a88 (diff) | |
| download | php-git-a3a5157286a7a3cca159926801f0a5b3936d17c0.tar.gz | |
- PHP_STREAM_OPTION_WRITE_BUFFER no longer disables the read buffer of a plain
stream when 0 is given as the value.
- PHP_STREAM_OPTION_WRITE_BUFFER no longer changes the chunk size in socket
streams.
- Added stream_set_chunk_size() function.
- Some signedness fixes.
- Test for commit r308474, now that it's possible to actually test it.
Diffstat (limited to 'main')
| -rw-r--r-- | main/streams/plain_wrapper.c | 3 | ||||
| -rw-r--r-- | main/streams/xp_socket.c | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index b345a186d7..62ae48e4dd 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -588,15 +588,12 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void switch(value) { case PHP_STREAM_BUFFER_NONE: - stream->flags |= PHP_STREAM_FLAG_NO_BUFFER; return setvbuf(data->file, NULL, _IONBF, 0); case PHP_STREAM_BUFFER_LINE: - stream->flags ^= PHP_STREAM_FLAG_NO_BUFFER; return setvbuf(data->file, NULL, _IOLBF, size); case PHP_STREAM_BUFFER_FULL: - stream->flags ^= PHP_STREAM_FLAG_NO_BUFFER; return setvbuf(data->file, NULL, _IOFBF, size); default: diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index a085e859ed..7ddf8e1a34 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -400,10 +400,6 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void } #endif - case PHP_STREAM_OPTION_WRITE_BUFFER: - php_stream_set_chunk_size(stream, (ptrparam ? *(size_t *)ptrparam : PHP_SOCK_CHUNK_SIZE)); - return PHP_STREAM_OPTION_RETURN_OK; - default: return PHP_STREAM_OPTION_RETURN_NOTIMPL; } |