diff options
| author | Sriram Natarajan <srinatar@php.net> | 2009-09-17 02:45:25 +0000 |
|---|---|---|
| committer | Sriram Natarajan <srinatar@php.net> | 2009-09-17 02:45:25 +0000 |
| commit | b91f37fdc0d69cd87769b27d6abdc2186df7eaad (patch) | |
| tree | 5f4a8b5af33f1a4c2c4420051224e5f9b82d91e3 | |
| parent | 77fd5b807594065704dfc829f1e41c9cce4d4c5a (diff) | |
| download | php-git-b91f37fdc0d69cd87769b27d6abdc2186df7eaad.tar.gz | |
- Fixed bug #49572 (use of C++ style comments causes build failure)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | main/streams/memory.c | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -125,6 +125,8 @@ PHP NEWS - Fixed bug #42434 (ImageLine w/ antialias = 1px shorter). (wojjie at gmail dot com, Kalle) - Fixed bug #28038 (Sent incorrect RCPT TO commands to SMTP server) (Garrett) +- Fixed bug #49572 (use of C++ style comments causes build failure). + (Sriram Natarajan) 17 Jun 2009, PHP 5.2.10 - Added "ignore_errors" option to http fopen wrapper. (David Zulke, Sara) diff --git a/main/streams/memory.c b/main/streams/memory.c index a44fba4c24..0643d3efa9 100644 --- a/main/streams/memory.c +++ b/main/streams/memory.c @@ -563,7 +563,7 @@ PHPAPI php_stream *_php_stream_temp_create(int mode, size_t max_memory_usage STR stream = php_stream_alloc_rel(&php_stream_temp_ops, self, 0, mode & TEMP_STREAM_READONLY ? "rb" : "w+b"); stream->flags |= PHP_STREAM_FLAG_NO_BUFFER; self->innerstream = php_stream_memory_create_rel(mode); - php_stream_auto_cleanup(self->innerstream); // do not warn if innerstream is GC'ed before stream + php_stream_auto_cleanup(self->innerstream); /* do not warn if innerstream is GC'ed before stream */ ((php_stream_memory_data*)self->innerstream->abstract)->owner_ptr = &self->innerstream; return stream; |