From 4b839cfc53d1aa5aa64adb940e122efe1475c9e9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 13 Jan 2010 21:35:47 -0800
Subject: fix for non-% memory soft limit

---
 lib/iomaster.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/iomaster.php')

diff --git a/lib/iomaster.php b/lib/iomaster.php
index aff5b145c..5d1071a39 100644
--- a/lib/iomaster.php
+++ b/lib/iomaster.php
@@ -231,7 +231,7 @@ class IoMaster
                 return -1;
             }
         } else {
-            return $this->parseMemoryLimit($limit);
+            return $this->parseMemoryLimit($softLimit);
         }
         return $softLimit;
     }
-- 
cgit v1.2.3-54-g00ecf


From 038287c1ffb71207f8028014f20005483364956d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Thu, 14 Jan 2010 17:14:41 -0800
Subject: fix for --skip-xmpp hack -- forgot to do it on the ping & confirm
 handlers

---
 lib/iomaster.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/iomaster.php')

diff --git a/lib/iomaster.php b/lib/iomaster.php
index 5d1071a39..ce77b53b2 100644
--- a/lib/iomaster.php
+++ b/lib/iomaster.php
@@ -70,7 +70,7 @@ class IoMaster
             $classes = array();
             if (Event::handle('StartIoManagerClasses', array(&$classes))) {
                 $classes[] = 'QueueManager';
-                if (common_config('xmpp', 'enabled')) {
+                if (common_config('xmpp', 'enabled') && !defined('XMPP_EMERGENCY_FLAG')) {
                     $classes[] = 'XmppManager'; // handles pings/reconnects
                     $classes[] = 'XmppConfirmManager'; // polls for outgoing confirmations
                 }
-- 
cgit v1.2.3-54-g00ecf