diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-05-31 01:18:02 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-05-31 01:18:02 +0200 |
| commit | 33849c2211891cc69d26b3633412635016d05626 (patch) | |
| tree | 53c02d7f9527bc6ffa5bd0ba825fab167e8cbfac | |
| parent | 56532895a851851b4eacebb58cd3a0c7294031b3 (diff) | |
| parent | 303dd7f3469106f8cd91a8648de1c4fed51374b3 (diff) | |
| download | php-git-33849c2211891cc69d26b3633412635016d05626.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix bug #62186 readline fails to compile
fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)
| -rw-r--r-- | ext/readline/readline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 1054b0ea3b..92236a54f7 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -198,7 +198,7 @@ PHP_RSHUTDOWN_FUNCTION(readline) PHP_MINFO_FUNCTION(readline) { - return PHP_MINFO(cli_readline)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU); + PHP_MINFO(cli_readline)(ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU); } /* }}} */ |