cvs: php-src(PHP_5_2) / NEWS /ext/filter config.m4

iliaa Tue Dec 5 23:37:57 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/filter config.m4 /php-src NEWS Log: Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension). http://cvs.php.net/viewvc.cgi/php-src/ext/filter/config.m4?r1=1.6.2.1&r2=1.6.2.2&diff_format=u Index: php-src/ext/filter/config.m4 diff -u php-src/ext/filter/config.m4:1.6.2.1 php-src/ext/filter/config.m4:1.6.2.2 --- php-src/ext/filter/config.m4:1.6.2.1 Fri Nov 3 20:08:38 2006 +++ php-src/ext/filter/config.m4 Tue Dec 5 23:37:57 2006 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6.2.1 2006/11/03 20:08:38 iliaa Exp $ +dnl $Id: config.m4,v 1.6.2.2 2006/12/05 23:37:57 iliaa Exp $ dnl config.m4 for input filtering extension PHP_ARG_ENABLE(filter, whether to enable input filter support, @@ -40,56 +40,12 @@ fi if test "$PHP_PCRE_REGEX" != "yes"; then - dnl - dnl If PCRE extension is enabled we can use the already found paths, - dnl otherwise we have to detect them here: - dnl - if test "$PHP_PCRE_REGEX" = "no" || test "$PHP_PCRE_REGEX" = "pecl"; then - dnl Set the PCRE search dirs correctly - case "$PHP_PCRE_DIR" in - yes|no) - PCRE_SEARCH_DIR="/usr/local /usr" - ;; - *) - PCRE_SEARCH_DIR="$PHP_PCRE_DIR" - ;; - esac - - for i in $PCRE_SEARCH_DIR; do - if test -f $i/include/pcre/pcre.h; then - PCRE_INCDIR=$i/include/pcre - break - elif test -f $i/include/pcre.h; then - PCRE_INCDIR=$i/include - break - elif test -f $i/pcre.h; then - PCRE_INCDIR=$i - break - fi - done - - if test -z "$PCRE_INCDIR"; then - AC_MSG_ERROR([Could not find pcre.h anywhere under $PCRE_SEARCH_DIR]) - fi - - for j in $PCRE_SEARCH_DIR/$PHP_LIBDIR $PCRE_SEARCH_DIR; do - if test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME; then - PCRE_LIBDIR=$j - break - fi - done - - if test -z "$PCRE_LIBDIR" ; then - AC_MSG_ERROR([Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) anywhere under $PCRE_SEARCH_DIR]) - fi - fi - - PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, FILTER_SHARED_LIBADD) - PHP_ADD_INCLUDE($PCRE_INCDIR) + AC_MSG_ERROR([Could not compile filter extension against PHP without pcre support]) fi PHP_NEW_EXTENSION(filter, filter.c sanitizing_filters.c logical_filters.c callback_filter.c, $ext_shared) PHP_SUBST(FILTER_SHARED_LIBADD) PHP_INSTALL_HEADERS([ext/filter/php_filter.h]) + PHP_ADD_EXTENSION_DEP(filter, pcre, true) fi http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.405&r2=1.2027.2.547.2.406&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.405 php-src/NEWS:1.2027.2.547.2.406 --- php-src/NEWS:1.2027.2.547.2.405 Tue Dec 5 19:03:50 2006 +++ php-src/NEWS Tue Dec 5 23:37:57 2006 @@ -48,6 +48,8 @@ . Invalid filters fails instead of returning unsafe value - Fixed wrong signature initialization in imagepng (Takeshi Abe) - Added optimization for imageline with horizontal and vertial lines (Pierre) +- Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension). + (Tony, Ilia) - Fixed bug #39718 (possible crash if assert.callback is set in ini). (Ilia) - Fixed bug #39702 (php crashes in the allocator on linux-m68k). (Dmitry) - Fixed bug #39673 (file_get_contents causes bus error on certain offsets).