helly Tue Dec 10 17:02:53 2002 EDT
Modified files:
/php4/ext/dba dba.c
Log:
-remove second attempt to close lock file
-default to lock on db file instead on .lck file.
-try to use existing .lck file and only create it on failure (allows ro access)
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.67 php4/ext/dba/dba.c:1.68
--- php4/ext/dba/dba.c:1.67 Mon Dec 9 13:03:00 2002
+++ php4/ext/dba/dba.c Tue Dec 10 17:02:52 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.67 2002/12/09 18:03:00 helly Exp $ */
+/* $Id: dba.c,v 1.68 2002/12/10 22:02:52 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -219,7 +219,7 @@
if (info->fp && info->fp!=info->lock.fp) php_stream_close(info->fp);
if (info->lock.fd) {
php_flock(info->lock.fd, LOCK_UN);
- close(info->lock.fd);
+ /*close(info->lock.fd);*/
info->lock.fd = 0;
}
if (info->lock.fp) php_stream_close(info->lock.fp);
@@ -444,6 +444,7 @@
}
} else {
lock_flag = (hptr->flags&DBA_LOCK_ALL);
+ lock_dbf = 1;
}
switch (*pmode++) {
case 'r':
@@ -530,9 +531,14 @@
lock_file_mode = file_mode;
} else {
spprintf(&info->lock.name, 0, "%s.lck", info->path);
- lock_file_mode = "a+b";
+ lock_file_mode = "rb";
}
info->lock.fp = php_stream_open_wrapper(info->lock.name,
lock_file_mode, STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
+ if (!info->lock.fp && !lock_dbf) {
+ /* when using a .lck file and that could not be opened we try
+to create one */
+ lock_file_mode = "a+b";
+ info->lock.fp = php_stream_open_wrapper(info->lock.name,
+lock_file_mode, STREAM_MUST_SEEK|REPORT_ERRORS|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
+ }
if (!info->lock.fp) {
dba_close(info TSRMLS_CC);
/* stream operation already wrote an error message */
@@ -801,4 +807,3 @@
* vim600: sw=4 ts=4 fdm=marker
* vim<600: sw=4 ts=4
*/
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
