From: Antony Dovgal <tony2001@php.net>
Date: Fri, 23 Feb 2007 16:22:20 +0000 (+0000)
Subject: MFH: fix #40606 (umask is not being restored when request is finished)
X-Git-Tag: php-5.2.2RC1~314
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3a9413b287e9adee449f035612a730f57c5a805;p=php

MFH: fix #40606 (umask is not being restored when request is finished)
---

diff --git a/NEWS b/NEWS
index 9dab3f2e77..da3f2b68b4 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PHP                                                                        NEWS
 - Added --ri switch to CLI which allows to check extension information. (Marcus)
 - Added tidyNode::getParent() method (John, Nuno)
 - Fixed zend_llist_remove_tail (Michael Wallner, Dmitry)
+- Fixed bug #40606 (umask is not being restored when request is finished). 
+  (Tony)
 - Fixed bug #40598 (libxml segfault). (Rob)
 - Fixed bug #40578 (imagettftext() multithreading issue). (Tony, Pierre)
 - Fixed bug #40576 (double values are truncated to 6 decimal digits when 
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 5d2bd6f2ae..993842e17a 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -1488,7 +1488,7 @@ PHP_FUNCTION(umask)
 
 	oldumask = umask(077);
 
-	if (BG(umask) != -1) {
+	if (BG(umask) == -1) {
 		BG(umask) = oldumask;
 	}