[Pkg-php-commits] [php/debian-sid] Merged r308688 fix s/raiseErro/raiseError/ and fixed parenthese in r309043 (Closes: #619307) (Courtesy of upstream and Ernesto Domato)

[Ondřej Surý]

---
 debian/patches/CVE-2011-1144.patch |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/debian/patches/CVE-2011-1144.patch b/debian/patches/CVE-2011-1144.patch
index a3ab7cb..bccb24f 100644
--- a/debian/patches/CVE-2011-1144.patch
+++ b/debian/patches/CVE-2011-1144.patch
@@ -1,11 +1,38 @@
 --- a/PEAR/REST.php	2011/03/08 22:46:27	309041
 +++ b/PEAR/REST.php	2011/03/08 23:16:30	309042
+@@ -102,7 +102,7 @@
+                 // reset the age of the cache if the server says it was unmodified
+                 $result = $this->saveCache($url, $ret, null, true, $cacheId);
+                 if (PEAR::isError($result)) {
+-                    return PEAR::raiseErro($result->getMessage());
++                    return PEAR::raiseError($result->getMessage());
+                 }
+             }
+ 
+@@ -122,7 +122,7 @@
+         if ($forcestring) {
+             $result = $this->saveCache($url, $content, $lastmodified, false, $cacheId);
+             if (PEAR::isError($result)) {
+-                return PEAR::raiseErro($result->getMessage());
++                return PEAR::raiseError($result->getMessage());
+             }
+ 
+             return $content;
+@@ -162,7 +162,7 @@
+ 
+         $result = $this->saveCache($url, $content, $lastmodified, false, $cacheId);
+         if (PEAR::isError($result)) {
+-            return PEAR::raiseErro($result->getMessage());
++            return PEAR::raiseError($result->getMessage());
+         }
+ 
+         return $content;
 @@ -228,59 +228,75 @@
          $cacheidfile = $d . 'rest.cacheid';
          $cachefile   = $d . 'rest.cachefile';
  
 +        if (!is_dir($cache_dir)) {
-+            if (System::mkdir(array('-p', $cache_dir) === false)) {
++            if (System::mkdir(array('-p', $cache_dir)) === false) {
 +              return PEAR::raiseError("The value of config option cache_dir ($cache_dir) is not a directory and attempts to create the directory failed.");
 +            }
 +        }
-- 
1.7.1