jani Thu May 14 13:43:53 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/readline config.m4
/php-src NEWS
Log:
MFH:- Fixed bug #48256 (Crash due to double-linking of history.o)
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/config.m4?r1=1.25.2.3&r2=1.25.2.3.2.1&diff_format=u
Index: php-src/ext/readline/config.m4
diff -u php-src/ext/readline/config.m4:1.25.2.3
php-src/ext/readline/config.m4:1.25.2.3.2.1
--- php-src/ext/readline/config.m4:1.25.2.3 Mon Nov 28 23:04:01 2005
+++ php-src/ext/readline/config.m4 Thu May 14 13:43:52 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.25.2.3 2005/11/28 23:04:01 sniper Exp $
+dnl $Id: config.m4,v 1.25.2.3.2.1 2009/05/14 13:43:52 jani Exp $
dnl
PHP_ARG_WITH(libedit,for libedit readline replacement,
@@ -50,15 +50,6 @@
-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
])
- PHP_CHECK_LIBRARY(history, add_history,
- [
- PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/$PHP_LIBDIR,
READLINE_SHARED_LIBADD)
- ], [
- AC_MSG_ERROR(history library required by readline not found)
- ], [
- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
- ])
-
AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
elif test "$PHP_LIBEDIT" != "no"; then
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1506&r2=1.2027.2.547.2.1507&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1506 php-src/NEWS:1.2027.2.547.2.1507
--- php-src/NEWS:1.2027.2.547.2.1506 Thu May 14 01:31:50 2009
+++ php-src/NEWS Thu May 14 13:43:52 2009
@@ -12,6 +12,8 @@
- Fixed segfault on invalid session.save_path. (Hannes)
- Fixed leaks in imap when a mail_criteria is used. (Pierre)
+- Fixed bug #48256 (Crash due to double-linking of history.o).
+ (tstarling at wikimedia dot org)
- Fixed bug #48248 (SIGSEGV when access to private property via &__get).
(Felipe)
- Fixed bug #48240 (DBA Segmentation fault dba_nextkey). (Felipe)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
