SOURCES: eventum-mem-limits.patch, eventum-irc-mem.patch - separat...

[glen]

Author: glen                         Date: Mon Sep  4 21:10:32 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- separate mem limits to be sent upstream and pld specific

---- Files affected:
SOURCES:
   eventum-mem-limits.patch (1.4 -> 1.5) , eventum-irc-mem.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/eventum-mem-limits.patch
diff -u SOURCES/eventum-mem-limits.patch:1.4 SOURCES/eventum-mem-limits.patch:1.5
--- SOURCES/eventum-mem-limits.patch:1.4	Mon Sep  4 23:08:17 2006
+++ SOURCES/eventum-mem-limits.patch	Mon Sep  4 23:10:27 2006
@@ -1,46 +1,3 @@
---- eventum-1.7.1/misc/process_mail_queue.php~	2006-06-19 17:50:25.747786986 +0300
-+++ eventum-1.7.1/misc/process_mail_queue.php	2006-06-19 17:59:33.490045125 +0300
-@@ -27,7 +27,9 @@
- // +----------------------------------------------------------------------+
- //
- // @(#) $Id$
--//
-+
-+ini_set("memory_limit", "256M");
-+
- include_once("../config.inc.php");
- include_once(APP_INC_PATH . "db_access.php");
- include_once(APP_INC_PATH . "class.mail_queue.php");
-@@ -60,8 +62,6 @@
-     exit;
- }
- 
--ini_set("memory_limit", "256M");
--
- // handle only pending emails
- $limit = 50;
- Mail_Queue::send('pending', $limit);
---- eventum-1.7.1/misc/download_emails.php~	2006-06-19 18:13:23.698634331 +0300
-+++ eventum-1.7.1/misc/download_emails.php	2006-06-19 18:16:24.672688641 +0300
-@@ -27,15 +27,15 @@
- // +----------------------------------------------------------------------+
- //
- // @(#) $Id$
--//
-+
-+ini_set("memory_limit", "256M");
-+
- include_once("../config.inc.php");
- include_once(APP_INC_PATH . "class.support.php");
- include_once(APP_INC_PATH . "class.lock.php");
- include_once(APP_INC_PATH . "class.project.php");
- include_once(APP_INC_PATH . "db_access.php");
- 
--ini_set("memory_limit", "256M");
--
- // we need the IMAP extension for this to work
- if (!function_exists('imap_open')) {
-     echo "Error: Eventum requires the IMAP extension in order to download messages saved on a IMAP/POP3 mailbox.\n";
 --- eventum-20060210/misc/route_drafts.php~	2006-02-11 07:27:35.000000000 +0200
 +++ eventum-20060210/misc/route_drafts.php	2006-02-11 07:28:23.000000000 +0200
 @@ -27,6 +27,7 @@

================================================================
Index: SOURCES/eventum-irc-mem.patch
diff -u SOURCES/eventum-irc-mem.patch:1.3 SOURCES/eventum-irc-mem.patch:1.4
--- SOURCES/eventum-irc-mem.patch:1.3	Mon Sep  4 23:07:55 2006
+++ SOURCES/eventum-irc-mem.patch	Mon Sep  4 23:10:27 2006
@@ -18,3 +18,49 @@
  // the following is the list of IRC channels that the bot should connect to,
  // and the associated project name
  $channels = array(
+
+
+# these should be sent to upstream too, as memory limit setting should be the very first thing
+--- eventum-1.7.1/misc/process_mail_queue.php~	2006-06-19 17:50:25.747786986 +0300
++++ eventum-1.7.1/misc/process_mail_queue.php	2006-06-19 17:59:33.490045125 +0300
+@@ -27,7 +27,9 @@
+ // +----------------------------------------------------------------------+
+ //
+ // @(#) $Id$
+-//
++
++ini_set("memory_limit", "256M");
++
+ include_once("../config.inc.php");
+ include_once(APP_INC_PATH . "db_access.php");
+ include_once(APP_INC_PATH . "class.mail_queue.php");
+@@ -60,8 +62,6 @@
+     exit;
+ }
+ 
+-ini_set("memory_limit", "256M");
+-
+ // handle only pending emails
+ $limit = 50;
+ Mail_Queue::send('pending', $limit);
+--- eventum-1.7.1/misc/download_emails.php~	2006-06-19 18:13:23.698634331 +0300
++++ eventum-1.7.1/misc/download_emails.php	2006-06-19 18:16:24.672688641 +0300
+@@ -27,15 +27,15 @@
+ // +----------------------------------------------------------------------+
+ //
+ // @(#) $Id$
+-//
++
++ini_set("memory_limit", "256M");
++
+ include_once("../config.inc.php");
+ include_once(APP_INC_PATH . "class.support.php");
+ include_once(APP_INC_PATH . "class.lock.php");
+ include_once(APP_INC_PATH . "class.project.php");
+ include_once(APP_INC_PATH . "db_access.php");
+ 
+-ini_set("memory_limit", "256M");
+-
+ // we need the IMAP extension for this to work
+ if (!function_exists('imap_open')) {
+     echo "Error: Eventum requires the IMAP extension in order to download messages saved on a IMAP/POP3 mailbox.\n";
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/eventum-mem-limits.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/eventum-irc-mem.patch?r1=1.3&r2=1.4&f=u