From: Marcus Boerger <helly@php.net>
Date: Sun, 10 Nov 2002 22:56:29 +0000 (+0000)
Subject: Add $lock_flag which allows to change lock behaviour for both 'l' and 'd'
X-Git-Tag: php-4.3.0RC1~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f636c6b3bc6cbe3654dda070227b4bf076e15b3;p=php

Add $lock_flag which allows to change lock behaviour for both 'l' and 'd'
Remember gdbm has its own locking so 't' does not work here - maybe a
warning is needed for that, too.
---

diff --git a/ext/dba/tests/dba_gdbm.phpt b/ext/dba/tests/dba_gdbm.phpt
index 79b41dadea..11e267d650 100644
--- a/ext/dba/tests/dba_gdbm.phpt
+++ b/ext/dba/tests/dba_gdbm.phpt
@@ -9,6 +9,7 @@ DBA GDBM handler test
 <?php
 	require_once('test.inc');
 	$handler = 'gdbm';
+	$lock_flag = ''; // lock in library
 	require_once('dba_handler.inc');
 ?>
 --EXPECT--
diff --git a/ext/dba/tests/dba_handler.inc b/ext/dba/tests/dba_handler.inc
index acc8dd4e2a..98048bb7c0 100644
--- a/ext/dba/tests/dba_handler.inc
+++ b/ext/dba/tests/dba_handler.inc
@@ -1,7 +1,7 @@
 <?php
 	echo "database handler: $handler\n";
 	@unlink($db_filename);
-	if (($db_file = @dba_open($db_filename, "nl", $handler))!==FALSE) {
+	if (($db_file = dba_open($db_filename, 'n'.$lock_flag, $handler))!==FALSE) {
 		dba_insert("key1", "Content String 1", $db_file);
 		dba_insert("key2", "Content String 2", $db_file);
 		dba_insert("key3", "Third Content String", $db_file);
@@ -27,8 +27,8 @@
 	} else {
 		echo "Error creating database\n";
 	}
-	$db_writer = @dba_open($db_filename, "wl", $handler);
-	if (($dba_reader = @dba_open($db_filename, "rlt", $handler))===false) {
+	$db_writer = dba_open($db_filename, 'w'.$lock_flag, $handler);
+	if (($dba_reader = dba_open($db_filename, 'r'.$lock_flag.($lock_flag ? 't' : ''), $handler))===false) {
 		echo "Cannot read during write operation\n";
 	} else {
 		echo "Read during write permitted\n";
@@ -44,7 +44,7 @@
 	} else {
 		die("Error reopening database\n");
 	}
-	if (($db_file = @dba_open($db_filename, "rd", $handler))!==FALSE) {
+	if (($db_file = dba_open($db_filename, 'r'.$lock_flag, $handler))!==FALSE) {
 		$key = dba_firstkey($db_file);
 		$res = array();
 		while($key) {
diff --git a/ext/dba/tests/test.inc b/ext/dba/tests/test.inc
index 0f920838ce..bd617bc8d6 100644
--- a/ext/dba/tests/test.inc
+++ b/ext/dba/tests/test.inc
@@ -10,4 +10,5 @@
 	} else {
 		$handler = $handler[0];
 	}
+	$lock_flag = 'l';
 ?>