LOCK_EX is not allowed in read mode -> try using existing .lck file in read

only mode only when in read mode.

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 743611e27b980a981b1a495b183dd11556ecf023..a229b8195cee26f30209bbd40a476498caf4a88d 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -531,12 +531,18 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
                        lock_file_mode = file_mode;
                } else {
                        spprintf(&info->lock.name, 0, "%s.lck", info->path);
-                       lock_file_mode = "rb";
+                       if (!strcmp(file_mode, "r")) {
+                               /* when in read only mode try to use existing .lck file first */
+                               /* do not log errors for .lck file while in read ony mode on .lck file */
+                               lock_file_mode = "rb";
+                               info->lock.fp = php_stream_open_wrapper(info->lock.name, lock_file_mode, STREAM_MUST_SEEK|IGNORE_PATH|ENFORCE_SAFE_MODE, NULL);
+                       }
+                       if (!info->lock.fp) {
+                               /* when not in read mode or failed to open .lck file read only. now try again in create(write) mode and log errors */
+                               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 && !lock_dbf) {
-                       /* when using a .lck file and that could not be opened we try to create one */
-                       lock_file_mode = "a+b";
+               if (!info->lock.fp) {
                        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) {