sniper Mon Mar 14 16:12:27 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS configure.in
Log:
MFH
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.288&r2=1.1760.2.289&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.288 php-src/NEWS:1.1760.2.289
--- php-src/NEWS:1.1760.2.288 Mon Mar 14 16:00:29 2005
+++ php-src/NEWS Mon Mar 14 16:12:25 2005
@@ -11,13 +11,13 @@
- Updated bundled oniguruma library (used for multibyte regular expression)
to 3.7.0. (Moriyoshi)
- Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
-- Fixed bug preventing from building oci8 as shared.
- (stanislav dot voroniy at portavita dot nl, Tony)
Fixed bugs:
. Bug #32063 (mb_convert_encoding ignores named entity 'alpha')
. Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)
. bug #30573 (compiler warnings in libmbfl due to invalid type cast)
. Bug #30549 (incorrect character translations for some ISO8859 charsets).
+- Fixed bug preventing from building oci8 as shared.
+ (stanislav dot voroniy at portavita dot nl, Tony)
- Fixed a bug in mysql_affected_rows and mysql_stmt_affected_rows when the
api function returns -1 (Georg)
- Fixed several leaks in ext/browscap and sapi/embed. (Andrei)
@@ -33,6 +33,8 @@
child class). (Marcus)
- Fixed bug #32238 (spl_array.c: void function cannot return value). (Johannes)
- Fixed bug #32210 (proc_get_status() sets "running" always to true). (Ilia)
+- Fixed bug #32200 (Prevent using both --with-apxs2 and --with-apxs2filter).
+ (Jani)
- Fixed bug #32160 (file truncation in copy() when source & destination are
the same). (Ilia)
- Fixed bug #32134 (Overloading offsetGet/offsetSet). (Marcus)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.39&r2=1.514.2.40&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.39 php-src/configure.in:1.514.2.40
--- php-src/configure.in:1.514.2.39 Mon Mar 14 04:33:15 2005
+++ php-src/configure.in Mon Mar 14 16:12:26 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.39 2005/03/14 09:33:15 hyanantha Exp $ -*-
sh -*-
+dnl ## $Id: configure.in,v 1.514.2.40 2005/03/14 21:12:26 sniper Exp $ -*- sh
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -81,7 +81,11 @@
AC_MSG_ERROR([--with-apache and --with-apxs cannot be used together])
fi
+if test -n "$with_apxs2filter" && test -n "$with_apxs2"; then
+ AC_MSG_ERROR([--with-apxs2filter and --with-apxs2 cannot be used together])
+fi
+
dnl Settings we want to make before the checks.
dnl -------------------------------------------------------------------------
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
