sniper Tue Nov 25 03:08:31 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/odbc config.m4
Log:
MFH: - Fixed bug #26376 (typo in ext/odbc/config.m4: DBMaker test fails)
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.477 php-src/NEWS:1.1247.2.478
--- php-src/NEWS:1.1247.2.477 Mon Nov 24 21:19:46 2003
+++ php-src/NEWS Tue Nov 25 03:08:25 2003
@@ -3,6 +3,7 @@
?? ??? 2003, Version 4.3.5
- Fixed header handler in NSAPI SAPI module (header->replace was ignored,
send_default_content_type now sends value from php.ini). (Uwe Schindler)
+- Fixed bug #26376 (typo in ext/odbc/config.m4: DBMaker test fails). (Jani)
- Fixed bug #26384 (crash in domxslt->process()). (Ilia)
- Fixed bug #26355 (flock() doesn't initialize the wouldblock argument). (Ilia)
- Fixed bug #26309 (Fixed argument parsing for imageftbbox()). (Ilia)
Index: php-src/ext/odbc/config.m4
diff -u php-src/ext/odbc/config.m4:1.55.2.7 php-src/ext/odbc/config.m4:1.55.2.8
--- php-src/ext/odbc/config.m4:1.55.2.7 Fri Oct 3 01:25:40 2003
+++ php-src/ext/odbc/config.m4 Tue Nov 25 03:08:30 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.55.2.7 2003/10/03 05:25:40 sniper Exp $
+dnl $Id: config.m4,v 1.55.2.8 2003/11/25 08:08:30 sniper Exp $
dnl
dnl
@@ -454,11 +454,9 @@
# check DBMaker version (from 5.0 to 2.0)
DBMAKER_VERSION=5.0
- while test test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a \
- "$DBMAKER_VERSION" != "2.9"; do
+ while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" != "2.9"; do
DM_VER=`echo $DBMAKER_VERSION | sed -e 's/\.//' | awk '{ print $1-1;}'`
- MAJOR_V=`echo $DM_VER | awk '{ print $1/10; }' \
- | awk -F. '{ print $1; }'`
+ MAJOR_V=`echo $DM_VER | awk '{ print $1/10; }' | awk -F. '{ print $1; }'`
MINOR_V=`echo $DM_VER | awk '{ print $1%10; }'`
DBMAKER_VERSION=$MAJOR_V.$MINOR_V
done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
