helly Mon Dec 30 12:42:55 2002 EDT
Modified files:
/php4/ext/dba config.m4 dba_db3.c dba_db4.c
Log:
-disallow using db-<n> with libraries of different major versions
-disallow using db-4.1 with patch level < 25
-fix db-4.1
-added undocumented DB_FCNTL_LOCKING flag for version 3 and 4
# wow the sleepycat guys answered *very* fast
Index: php4/ext/dba/config.m4
diff -u php4/ext/dba/config.m4:1.33 php4/ext/dba/config.m4:1.34
--- php4/ext/dba/config.m4:1.33 Mon Dec 30 03:55:21 2002
+++ php4/ext/dba/config.m4 Mon Dec 30 12:42:55 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.33 2002/12/30 08:55:21 derick Exp $
+dnl $Id: config.m4,v 1.34 2002/12/30 17:42:55 helly Exp $
dnl
dnl Suppose we need FlatFile if no support or only CDB is used.
@@ -144,7 +144,7 @@
AC_TRY_RUN([
#include "$THIS_INCLUDE"
int main() {
- return DB_VERSION_MAJOR >= $1 ? 0 : 1;
+ return (DB_VERSION_MAJOR == $1) ? 0 : 1;
}
],[
THIS_LIBS=$LIB
@@ -156,6 +156,21 @@
])
])
done
+ if test "$1" = "4"; then
+ AC_MSG_CHECKING(for db4 minor version and patch level)
+ AC_TRY_RUN([
+#include "$THIS_INCLUDE"
+int main() {
+ return (DB_VERSION_MINOR != 1 || DB_VERSION_PATCH >= 25) ? 0 : 1;
+}
+ ],[
+ AC_MSG_RESULT(ok)
+ ],[
+ AC_MSG_ERROR(Version 4.1 requires patch level 25)
+ ],[
+ AC_MSG_RESULT(crosscompiling)
+ ])
+ fi
if test -n "$THIS_LIBS"; then
AC_DEFINE(DBA_DB$1, 1, [ ])
if test -n "$THIS_INCLUDE"; then
@@ -194,7 +209,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(4, db-4.1 db-4 db4 db, db_create)
+ PHP_DBA_DB_CHECK(4, db-4.1 db-4.0 db-4 db4 db, db_create)
fi
])
AC_DBA_STD_RESULT(db4,Berkeley DB4)
@@ -229,7 +244,7 @@
break
fi
done
- PHP_DBA_DB_CHECK(3, db-3.3 db-3.2 db-3.1 db-3 db3 db, db_create)
+ PHP_DBA_DB_CHECK(3, db-3.3 db-3.2 db-3.1 db-3.0 db-3 db3 db, db_create)
fi
])
AC_DBA_STD_RESULT(db3,Berkeley DB3)
Index: php4/ext/dba/dba_db3.c
diff -u php4/ext/dba/dba_db3.c:1.25 php4/ext/dba/dba_db3.c:1.26
--- php4/ext/dba/dba_db3.c:1.25 Mon Dec 30 08:07:29 2002
+++ php4/ext/dba/dba_db3.c Mon Dec 30 12:42:55 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_db3.c,v 1.25 2002/12/30 13:07:29 helly Exp $ */
+/* $Id: dba_db3.c,v 1.26 2002/12/30 17:42:55 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -81,14 +81,13 @@
filemode = Z_LVAL_PP(info->argv[0]);
}
+#ifdef DB_FCNTL_LOCKING
+ gmode |= DB_FCNTL_LOCKING;
+#endif
+
if ((err=db_create(&dbp, NULL, 0)) == 0) {
dbp->set_errcall(dbp, php_dba_db3_errcall_fcn);
- if (
-#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
- (err=dbp->open(dbp, 0, info->path, NULL, type, gmode,
filemode)) == 0) {
-#else
- (err=dbp->open(dbp, info->path, NULL, type, gmode, filemode))
== 0) {
-#endif
+ if ((err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
dba_db3_data *data;
data = pemalloc(sizeof(*data), info->flags&DBA_PERSISTENT);
Index: php4/ext/dba/dba_db4.c
diff -u php4/ext/dba/dba_db4.c:1.5 php4/ext/dba/dba_db4.c:1.6
--- php4/ext/dba/dba_db4.c:1.5 Mon Dec 30 08:09:03 2002
+++ php4/ext/dba/dba_db4.c Mon Dec 30 12:42:55 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba_db4.c,v 1.5 2002/12/30 13:09:03 helly Exp $ */
+/* $Id: dba_db4.c,v 1.6 2002/12/30 17:42:55 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -80,6 +80,10 @@
convert_to_long_ex(info->argv[0]);
filemode = Z_LVAL_PP(info->argv[0]);
}
+
+#ifdef DB_FCNTL_LOCKING
+ gmode |= DB_FCNTL_LOCKING;
+#endif
if ((err=db_create(&dbp, NULL, 0)) == 0) {
dbp->set_errcall(dbp, php_dba_db4_errcall_fcn);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
