diff options
| author | Michael Wallner <mike@php.net> | 2013-09-17 13:59:49 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-09-17 13:59:49 +0200 |
| commit | e6084da4735c945cb071c4d9259ea0d702eb77c6 (patch) | |
| tree | 066a6f1e3359e7df07750c9506972c084d48bd20 | |
| parent | 423c70fb4d79b7831b1db41ea217c8e1afd5cf8e (diff) | |
| download | php-git-e6084da4735c945cb071c4d9259ea0d702eb77c6.tar.gz | |
final bits
| -rw-r--r-- | ext/soap/soap.c | 1 | ||||
| -rw-r--r-- | ext/standard/php_fopen_wrapper.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 980c9248aa..c5900dc645 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -1599,6 +1599,7 @@ PHP_METHOD(SoapServer, handle) if (zf) { php_stream_filter_remove(zf, 1 TSRMLS_CC); + } } else { zval_ptr_dtor(&retval); return; diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c index 064eee21eb..76f77ebf7b 100644 --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@ -91,7 +91,7 @@ static size_t php_stream_input_read(php_stream *stream, char *buf, size_t count } php_stream_seek(*input->body_ptr, input->position, SEEK_SET); - read = (*input->body_ptr)->ops->read(*input->body_ptr, buf, count TSRMLS_CC); + read = php_stream_read(*input->body_ptr, buf, count); if (!read || read == (size_t) -1) { stream->eof = 1; @@ -105,6 +105,9 @@ static size_t php_stream_input_read(php_stream *stream, char *buf, size_t count static int php_stream_input_close(php_stream *stream, int close_handle TSRMLS_DC) /* {{{ */ { + efree(stream->abstract); + stream->abstract = NULL; + return 0; } /* }}} */ |