From: Rasmus Lerdorf <rasmus@php.net>
Date: Mon, 5 Jun 2000 19:35:15 +0000 (+0000)
Subject: Oops, fixed slight miscue there.  Now it works.
X-Git-Tag: PRE_EIGHT_BYTE_ALLOC_PATCH~96
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cefd77f1c6ec98c23ba04998ca3a07c8c4e7b68;p=php

Oops, fixed slight miscue there.  Now it works.
---

diff --git a/ext/standard/file.c b/ext/standard/file.c
index d8b7c83222..b5df693593 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -289,10 +289,10 @@ PHP_MINIT_FUNCTION(file)
 	REGISTER_LONG_CONSTANT("SEEK_SET", SEEK_SET, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SEEK_CUR", SEEK_CUR, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SEEK_END", SEEK_END, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("LOCK_SH", LOCK_SH, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("LOCK_EX", LOCK_EX, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("LOCK_UN", LOCK_UN, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("LOCK_NB", LOCK_NB, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("LOCK_SH", 1, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("LOCK_EX", 2, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("LOCK_UN", 3, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("LOCK_NB", 4, CONST_CS | CONST_PERSISTENT);
 
 	return SUCCESS;
 }
@@ -324,15 +324,15 @@ PHP_FUNCTION(flock)
 	
     convert_to_long_ex(arg2);
 
-    act = (*arg2)->value.lval & (LOCK_SH | LOCK_EX | LOCK_NB | LOCK_UN);
-    if (act < 1) {
+    act = (*arg2)->value.lval & 3;
+    if (act < 1 || act > 3) {
 		php_error(E_WARNING, "Illegal operation argument");
 		RETURN_FALSE;
     }
 
     /* flock_values contains all possible actions
        if (arg2 & 4) we won't block on the lock */
-    act = flock_values[act - 1] | ((*arg2)->value.lval & LOCK_NB ? LOCK_NB : 0);
+    act = flock_values[act - 1] | ((*arg2)->value.lval & 4 ? LOCK_NB : 0);
     if ((ret=flock(fd, act)) == -1) {
         RETURN_FALSE;
     }