From: Marcus Boerger <helly@php.net>
Date: Tue, 10 Dec 2002 22:49:33 +0000 (+0000)
Subject: LOCK_EX is not allowed in read mode -> try using existing .lck file in read
X-Git-Tag: RELEASE_1_0b3~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b94e0d9eacfca8413ec32f59fd2759cfbc8cbd7f;p=php

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 743611e27b..a229b8195c 100644
--- 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) {