svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/main/streams/memory.c branches/PHP_5_3/NEWS branches/PHP_5_3/main/streams/memory.c
trunk/main/streams/memory.c

srinatar Thu, 17 Sep 2009 02:45:25 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=288393 Log: - Fixed bug #49572 (use of C++ style comments causes build failure) Bug: http://bugs.php.net/49572 (Assigned) use of C++ style comments causes build failure Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/main/streams/memory.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/main/streams/memory.c U php/php-src/trunk/main/streams/memory.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2009-09-17 02:44:10 UTC (rev 288392) +++ php/php-src/branches/PHP_5_2/NEWS 2009-09-17 02:45:25 UTC (rev 288393) @@ -125,6 +125,8 @@ - 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) Modified: php/php-src/branches/PHP_5_2/main/streams/memory.c =================================================================== --- php/php-src/branches/PHP_5_2/main/streams/memory.c 2009-09-17 02:44:10 UTC (rev 288392) +++ php/php-src/branches/PHP_5_2/main/streams/memory.c 2009-09-17 02:45:25 UTC (rev 288393) @@ -563,7 +563,7 @@ 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; Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-09-17 02:44:10 UTC (rev 288392) +++ php/php-src/branches/PHP_5_3/NEWS 2009-09-17 02:45:25 UTC (rev 288393) @@ -16,6 +16,8 @@ (Ryan Sleevi, Ilia) - Fixed bug #49470 (FILTER_SANITIZE_EMAIL allows disallowed characters). (Ilia) +- Fixed bug #49572 (use of C++ style comments causes build failure). + (Sriram Natarajan) ?? ??? 2009, PHP 5.3.1 Modified: php/php-src/branches/PHP_5_3/main/streams/memory.c =================================================================== --- php/php-src/branches/PHP_5_3/main/streams/memory.c 2009-09-17 02:44:10 UTC (rev 288392) +++ php/php-src/branches/PHP_5_3/main/streams/memory.c 2009-09-17 02:45:25 UTC (rev 288393) @@ -563,7 +563,7 @@ 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; Modified: php/php-src/trunk/main/streams/memory.c =================================================================== --- php/php-src/trunk/main/streams/memory.c 2009-09-17 02:44:10 UTC (rev 288392) +++ php/php-src/trunk/main/streams/memory.c 2009-09-17 02:45:25 UTC (rev 288393) @@ -563,7 +563,7 @@ 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;