gunnar: server/php-kolab/Kolab_Filter issue3868.patch, NONE, 1.1.2.1 ChangeLog, 1.29.2.6, 1.29.2.7 Kolab_Filter.spec, 1.19.2.9, 1.19.2.10 Makefile, 1.8.2.5, 1.8.2.6
cvs at kolab.org
cvs at kolab.org
Tue Sep 22 18:28:10 CEST 2009
Author: gunnar
Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv28369/php-kolab/Kolab_Filter
Modified Files:
Tag: kolab_2_2_branch
ChangeLog Kolab_Filter.spec Makefile
Added Files:
Tag: kolab_2_2_branch
issue3868.patch
Log Message:
kolab/issue3868 (Resmgr eats up all memory and dies on some recuring events)
--- NEW FILE: issue3868.patch ---
--- a/lib/Horde/Kolab/Resource.php 9 May 2009 22:05:59 -0000 1.15.2.6
+++ b/lib/Horde/Kolab/Resource.php 22 Sep 2009 16:17:52 -0000
@@ -510,18 +510,21 @@
$duration = $dtend - $dtstart;
$events = array();
$next_start = $vfbstart;
- while ($next = $recurrence->nextActiveRecurrence($next_start)) {
- $next_start = $next->timestamp();
- if ($next_start < $vfbend) {
- $events[$next_start] = $next_start + $duration;
- } else {
- break;
- }
+ $next = $recurrence->nextActiveRecurrence($vfbstart);
+ while ($next !== false && $next->compareDate($vfbend) <= 0) {
+ $next_ts = $next->timestamp();
+ $events[$next_ts] = $next_ts + $duration;
+ $next = $recurrence->nextActiveRecurrence(array('year' => $next->year,
+ 'month' => $next->month,
+ 'mday' => $next->mday + 1,
+ 'hour' => $next->hour,
+ 'min' => $next->min,
+ 'sec' => $next->sec));
}
} else {
$events = array($dtstart => $dtend);
}
-
+
foreach ($events as $dtstart => $dtend) {
foreach ($busyperiods as $busyfrom => $busyto) {
if (empty($busyfrom) && empty($busyto)) {
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -d -r1.29.2.6 -r1.29.2.7
--- ChangeLog 4 May 2009 20:43:39 -0000 1.29.2.6
+++ ChangeLog 22 Sep 2009 16:28:07 -0000 1.29.2.7
@@ -1,3 +1,8 @@
+2009-09-22 Gunnar Wrobel <p at rdus.de>
+
+ * Kolab_Filter.spec: kolab/issue3868 (Resmgr eats up all memory
+ and dies on some recuring events)
+
2009-05-04 Gunnar Wrobel <p at rdus.de>
* Kolab_Filter.spec: kolab/issue3521 (kolabmailboxfilter does not
Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19.2.9
retrieving revision 1.19.2.10
diff -u -d -r1.19.2.9 -r1.19.2.10
--- Kolab_Filter.spec 4 May 2009 20:43:39 -0000 1.19.2.9
+++ Kolab_Filter.spec 22 Sep 2009 16:28:07 -0000 1.19.2.10
@@ -1,7 +1,7 @@
# Variables
%define V_package Kolab_Filter
%define V_version 0.1.4
-%define V_release 20090504
+%define V_release 20090922
# Package Information
Name: %{V_package}
@@ -27,6 +27,7 @@
Patch5: issue3521.patch
Patch6: issue3558.patch
Patch7: issue3568.patch
+Patch8: issue3868.patch
# Build Info
Prefix: %{l_prefix}
@@ -69,6 +70,7 @@
%patch -p3 -P 5
%patch -p1 -P 6
%patch -p1 -P 7
+ %patch -p1 -P 8
cp %{S:1} .
%build
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -u -d -r1.8.2.5 -r1.8.2.6
--- Makefile 29 Apr 2009 16:06:21 -0000 1.8.2.5
+++ Makefile 22 Sep 2009 16:28:07 -0000 1.8.2.6
@@ -21,7 +21,7 @@
SOURCE_URL=http://pear.horde.org/get
SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3521.patch revert_issue2499.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch dovecotlda-quoting.patch package.xml
+EXTRA=ChangeLog issue3521.patch revert_issue2499.patch issue3435.patch issue3192.patch issue3441.patch issue3558.patch issue3568.patch issue3868.patch dovecotlda-quoting.patch package.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
More information about the commits
mailing list