From 464ce741a41297e3d711668f27be190f8dc47d81 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 13 Jan 2010 16:19:20 -0800
Subject: remove session info in syslog

---
 lib/util.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib')

diff --git a/lib/util.php b/lib/util.php
index 9255b9b37..ef8a5d1f0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -173,10 +173,8 @@ function common_ensure_session()
         }
 	if (array_key_exists(session_name(), $_GET)) {
 	    $id = $_GET[session_name()];
-	    common_log(LOG_INFO, 'Setting session from GET parameter: '.$id);
 	} else if (array_key_exists(session_name(), $_COOKIE)) {
 	    $id = $_COOKIE[session_name()];
-	    common_log(LOG_INFO, 'Setting session from COOKIE: '.$id);
 	}
 	if (isset($id)) {
 	    session_id($id);
-- 
cgit v1.2.3-54-g00ecf


From 82e57b620453033cde487d95e4def27089425155 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 13 Jan 2010 16:33:03 -0800
Subject: Fix for dbqueuehandler: if a queue is unrecognized, discard entries
 rather than attempting to re-run them forever!

---
 lib/dbqueuemanager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php
index a5c6fd28b..889365b64 100644
--- a/lib/dbqueuemanager.php
+++ b/lib/dbqueuemanager.php
@@ -99,8 +99,8 @@ class DBQueueManager extends QueueManager
                 $this->_fail($notice, $queue);
             }
         } else {
-            $this->_log(LOG_INFO, "[$queue:notice $notice->id] No handler for queue $queue");
-            $this->_fail($notice, $queue);
+            $this->_log(LOG_INFO, "[$queue:notice $notice->id] No handler for queue $queue; discarding.");
+            $this->_done($notice, $queue);
         }
         return true;
     }
-- 
cgit v1.2.3-54-g00ecf


From 52bbb2262a6030f811e8adeaf5e177228f66351c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 13 Jan 2010 17:29:58 -0800
Subject: rev version in lib/common.php

---
 lib/common.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/common.php b/lib/common.php
index 00e80373e..243ac3e79 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_VERSION', '0.9.0rc2');
+define('STATUSNET_VERSION', '0.9.0rc3');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
 define('STATUSNET_CODENAME', 'Stand');
@@ -136,7 +136,6 @@ try {
     exit;
 }
 
-
 // XXX: other formats here
 
 define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
-- 
cgit v1.2.3-54-g00ecf