Branch '2.3-stable' - 3 commits - pear/Kolab_Storage release-notes.txt

Gunnar Wrobel wrobel at kolabsys.com
Fri Sep 2 12:52:34 CEST 2011


 pear/Kolab_Storage/ChangeLog                                  |    7 +
 pear/Kolab_Storage/package.info                               |    2 
 pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/issue388.patch |   41 ++++++++++
 release-notes.txt                                             |    4 
 4 files changed, 52 insertions(+), 2 deletions(-)

New commits:
commit 56795677766ad579f013d149176afba723f40db2
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Sep 2 10:52:26 2011 +0000

    Was merged.

diff --git a/pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/issue388.patch b/pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/issue388.patch
index c75c05f..dd11793 100644
--- a/pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/issue388.patch
+++ b/pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/issue388.patch
@@ -3,7 +3,7 @@ Subject: [PATCH] issue388.patch
 
 Do not attempt parsing messages that exceed a defined size limit.
 
-STATUS: UNMERGED
+STATUS: MERGED
 
 REF: https://bugzilla.kolabsys.com/show_bug.cgi?id=388
 


commit 01b927363b5247cca9dd8e0784a545820841f476
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Sep 2 10:50:29 2011 +0000

    Bug 388 - Large Kolab objects may lead to an exceeded PHP memory limit

diff --git a/release-notes.txt b/release-notes.txt
index e397881..0b6e47c 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -30,7 +30,7 @@ the 1st.README file in the package directory.
 	bugzilla.kolabsys.com #388 (Large Kolab objects may lead to an
 	exceeded PHP memory limit)
 
-    - Kolab_Storage-0.5.2-20110729
+    - Kolab_Storage-0.5.2-20110902
 
 	kolab/issue4466 (Horde warning "Invalid shutdown callback" in
 	                 Kolab/Storage/List.php) 
@@ -46,6 +46,8 @@ the 1st.README file in the package directory.
 	bugzilla.kolabsys.com #138 (ACL/MYRIGHTS result is not cached)
 	bugzilla.kolabsys.com #205 (Horde_Kolab_Storage must use MYRIGHTS, not
 	GETACL)
+	bugzilla.kolabsys.com #388 (Large Kolab objects may lead to an
+	exceeded PHP memory limit)
 
 Changes between 2.3.1 and 2.3.2:
 


commit e563386cc7b514d1a1f4266227beb5c3d5117a11
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Sep 2 10:50:24 2011 +0000

    Bug 388 - Large Kolab objects may lead to an exceeded PHP memory limit

diff --git a/pear/Kolab_Storage/ChangeLog b/pear/Kolab_Storage/ChangeLog
index 14e03d3..827bc4b 100644
--- a/pear/Kolab_Storage/ChangeLog
+++ b/pear/Kolab_Storage/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-02  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Storage-0.5.2/issue388.patch:
+
+	bugzilla.kolabsys.com #388 (Large Kolab objects may lead to an
+	exceeded PHP memory limit)
+
 2011-08-26  Gunnar Wrobel  <p at rdus.de>
 
 	* patches/Kolab_Storage-0.5.2/Kolab_Storage_0.5.2_p1.patch:
diff --git a/pear/Kolab_Storage/package.info b/pear/Kolab_Storage/package.info
index ed2846c..09d8731 100644
--- a/pear/Kolab_Storage/package.info
+++ b/pear/Kolab_Storage/package.info
@@ -16,7 +16,7 @@ package_origin='WGET'
 version='0.5.2'
 
 # Package release number
-release='20110826'
+release='20110902'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/incoming/wrobel'
diff --git a/pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/issue388.patch b/pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/issue388.patch
new file mode 100644
index 0000000..c75c05f
--- /dev/null
+++ b/pear/Kolab_Storage/patches/Kolab_Storage-0.5.2/issue388.patch
@@ -0,0 +1,41 @@
+From: Gunnar Wrobel <wrobel at pardus.de>
+Subject: [PATCH] issue388.patch
+
+Do not attempt parsing messages that exceed a defined size limit.
+
+STATUS: UNMERGED
+
+REF: https://bugzilla.kolabsys.com/show_bug.cgi?id=388
+
+Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>
+
+--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	29 Jul 2011 05:15:35 -0000	1.7.2.25
++++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php	2 Sep 2011 10:26:26 -0000
+@@ -1127,12 +1127,27 @@
+     function parseMessage($id, $mime_type, $parse_headers = true,
+                           $formats = array('XML'))
+     {
++        global $conf;
++
+         $session = &Horde_Kolab_Session::singleton();
+         $imap = &$session->getImap();
+         if (is_a($imap, 'PEAR_Error')) {
+             return $imap;
+         }
+ 
++        if (!empty($conf['kolab']['imap']['size_limit'])) {
++            $size = $imap->getMessageSize($id);
++            if (is_a($size, 'PEAR_Error')) {
++                return PEAR::raiseError(sprintf(_("Failed retrieving the message size for message ID %s. Original error: %s."),
++                                                $id, $size->getMessage()));
++            }
++            if ($size > $conf['kolab']['imap']['size_limit']) {
++                return PEAR::raiseError(sprintf(_("Message size %s for message ID %s exceeds the limit (%s)."),
++                                                $size, $id, $conf['kolab']['imap']['size_limit']));
++            }
++        }
++
++
+         $raw_headers = $imap->getMessageHeader($id);
+         if (is_a($raw_headers, 'PEAR_Error')) {
+             return PEAR::raiseError(sprintf(_("Failed retrieving the message with ID %s. Original error: %s."),





More information about the commits mailing list