Browse Source

Fixed #48448 (Compile failure under IRIX 6.5.30 building cast.c)

# Only in this branch, looks like a missing merge compared to PHP_5_3/HEAD
PHP-5.2.1RC1
Kalle Sommer Nielsen 17 years ago
parent
commit
09ac5ebe7f
  1. 4
      NEWS
  2. 2
      main/streams/cast.c

4
NEWS

@ -1,10 +1,12 @@
PHP NEWS
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Jun 2009, PHP 5.2.10
- Added "ignore_errors" option to http fopen wrapper. (David Zulke, Sara)
- Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4).
(Jani, spisek at kerio dot com)
- Fixed bug #48448 (Compile failure under IRIX 6.5.30 building cast.c).
(Kalle)
- Fixed bug #48434 (memory_get_usage() accuracy). (Arnaud)
- Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory usage).
(Scott)

2
main/streams/cast.c

@ -219,7 +219,7 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
if (ret != SUCCESS) {
php_stream_close(newstream);
} else {
int retcode = php_stream_cast(newstream, castas | flags, ret, show_err);
int retcode = php_stream_cast(newstream, castas | flags, (void **)ret, show_err);
if (retcode == SUCCESS)
rewind(*(FILE**)ret);

Loading…
Cancel
Save