Branch '2.3-stable' - 2 commits - pear/Kolab_Server release-notes.txt

[Gunnar Wrobel]

 pear/Kolab_Server/ChangeLog                                 |    7 
 pear/Kolab_Server/package.info                              |    2 
 pear/Kolab_Server/patches/Kolab_Server-0.5.1/issue388.patch |  101 ++++++++++++
 release-notes.txt                                           |    5 
 4 files changed, 114 insertions(+), 1 deletion(-)

New commits:
commit 0d30bb0b7426949917893adae8de21992906eae5
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Sep 2 10:39:13 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 29225fa..e397881 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -25,6 +25,11 @@ the 1st.README file in the package directory.
 
 	kolab/issue4765 (Freebusy trigger fails if using localpart of user)
 
+    - Kolab_Server-0.5.1-20110902
+
+	bugzilla.kolabsys.com #388 (Large Kolab objects may lead to an
+	exceeded PHP memory limit)
+
     - Kolab_Storage-0.5.2-20110729
 
 	kolab/issue4466 (Horde warning "Invalid shutdown callback" in


commit dbf609659146cb8d4c33a6f4e6d3b09b146f6db0
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Sep 2 10:39:02 2011 +0000

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

diff --git a/pear/Kolab_Server/ChangeLog b/pear/Kolab_Server/ChangeLog
index 5cf51bd..d9738a8 100644
--- a/pear/Kolab_Server/ChangeLog
+++ b/pear/Kolab_Server/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-02  Gunnar Wrobel  <p at rdus.de>
+
+	* patches/Kolab_Server-0.5.1/issue388.patch:
+
+	bugzilla.kolabsys.com #388 (Large Kolab objects may lead to an
+	exceeded PHP memory limit)
+
 2011-05-30  Gunnar Wrobel  <p at rdus.de>
 
 	* package.info:  Update to 0.5.1
diff --git a/pear/Kolab_Server/package.info b/pear/Kolab_Server/package.info
index cd1b175..5ff83c1 100644
--- a/pear/Kolab_Server/package.info
+++ b/pear/Kolab_Server/package.info
@@ -16,7 +16,7 @@ package_origin='WGET'
 version='0.5.1'
 
 # Package release number
-release='20100530'
+release='20110902'
 
 # Source URL to download from
 sourceurl='http://files.kolab.org/server/development-2.3/externals'
diff --git a/pear/Kolab_Server/patches/Kolab_Server-0.5.1/issue388.patch b/pear/Kolab_Server/patches/Kolab_Server-0.5.1/issue388.patch
new file mode 100644
index 0000000..1d07d93
--- /dev/null
+++ b/pear/Kolab_Server/patches/Kolab_Server-0.5.1/issue388.patch
@@ -0,0 +1,101 @@
+From: Gunnar Wrobel <wrobel at pardus.de>
+Subject: [PATCH] issue388.patch
+
+Allow to detect the message size.
+
+STATUS: MERGED
+
+REF: https://bugzilla.kolabsys.com/show_bug.cgi?id=388
+
+Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>
+
+--- a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/cclient.php	6 Jan 2009 15:23:15 -0000	1.1.2.2
++++ b/framework/Kolab_Server/lib/Horde/Kolab/IMAP/cclient.php	2 Sep 2011 10:23:40 -0000
+@@ -439,6 +439,30 @@
+     }
+ 
+     /**
++     * Retrieves the message size for a given message id.
++     *
++     * @param integer $uid            The message id.
++     *
++     * @return mixed  The message sizw or a PEAR error in case of an error.
++     */
++    function getMessageSize($uid)
++    {
++        if (!isset($this->_imap)) {
++            $result = $this->_connect();
++            if (is_a($result, 'PEAR_Error')) {
++                return $result;
++            }
++        }
++
++        $result = @imap_fetch_overview($this->_imap, $uid, FT_UID);
++        if (!$result) {
++            return PEAR::raiseError(sprintf(_("IMAP error. Message: %s. Error: %s"), $uid, @imap_last_error()));
++        }
++
++        return $result[0]->size;
++    }
++
++    /**
+      * Retrieves a list of mailboxes on the server.
+      *
+      * @return mixed  The list of mailboxes or a PEAR error in case of an
+--- a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/pear.php	6 Jan 2009 15:23:15 -0000	1.1.2.2
++++ b/framework/Kolab_Server/lib/Horde/Kolab/IMAP/pear.php	2 Sep 2011 10:23:40 -0000
+@@ -289,6 +289,33 @@
+     }
+ 
+     /**
++     * Retrieves the message size for a given message id.
++     *
++     * @param integer $uid            The message id.
++     *
++     * @return mixed  The message sizw or a PEAR error in case of an error.
++     */
++    function getMessageSize($uid)
++    {
++        $ret = $this->_imap->cmdUidFetch($uid, 'RFC822.SIZE');
++        if (String::upper($ret['RESPONSE']['CODE']) != 'OK') {
++            return PEAR::raiseError(sprintf(_("Failed fetching body of IMAP message %s. Error was %s"),
++                                            $uid,
++                                            $ret['RESPONSE']['CODE'] . ', ' . $ret['RESPONSE']['STR_CODE']));
++        }
++
++        if (isset($ret['PARSED'])) {
++            foreach ($ret['PARSED'] as $msg) {
++                if (isset($msg['EXT']['RFC822.SIZE'])) {
++                    return $msg['EXT']['RFC822.SIZE'];
++                }
++            }
++        }
++
++        return 0;
++    }
++
++    /**
+      * Retrieves a list of mailboxes on the server.
+      *
+      * @return mixed  The list of mailboxes or a PEAR error in case of an
+--- a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php	30 May 2011 09:19:32 -0000	1.1.2.5
++++ b/framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php	2 Sep 2011 10:23:40 -0000
+@@ -338,6 +338,18 @@
+     }
+ 
+     /**
++     * Retrieves the message size for a given message id.
++     *
++     * @param integer $uid            The message id.
++     *
++     * @return mixed  The message sizw or a PEAR error in case of an error.
++     */
++    function getMessageSize($uid)
++    {
++        return strlen($this->getMessage($uid));
++    }
++
++    /**
+      * Retrieves a list of mailboxes on the server.
+      *
+      * @return mixed  The list of mailboxes or a PEAR error in case of an