This patch renders other patches obsolete
Obsolete patches:
Index: PEAR/Registry.php
===================================================================
RCS file: /repository/pear-core/PEAR/Registry.php,v
retrieving revision 1.166
diff -u -r1.166 Registry.php
--- PEAR/Registry.php 16 Jun 2007 18:41:59 -0000 1.166
+++ PEAR/Registry.php 18 Aug 2007 21:55:35 -0000
@@ -795,6 +795,7 @@
}
if (!is_resource($this->lock_fp)) {
+ $this->lock_fp = null;
return $this->raiseError("could not create lock file" .
(isset($php_errormsg) ? ": " . $php_errormsg : ""));
}
@@ -805,6 +806,9 @@
case LOCK_UN: $str = 'unlock'; break;
default: $str = 'unknown'; break;
}
+ //is resource at this point, close it on error.
+ fclose($this->lock_fp);
+ $this->lock_fp = null;
return $this->raiseError("could not acquire $str lock ($this->lockfile)",
PEAR_REGISTRY_ERROR_LOCK);
}
