From 588fe5d603abe40c45a1147eba18c8b5143babc4 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sun, 21 Feb 2010 10:48:48 -0800
Subject: [PATCH 1/2] OStatus: debug aid - log the received Salmon post when it
 can't be parsed properly as an <atom:entry>

---
 plugins/OStatus/lib/salmonaction.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index abd8d4c833..4e5ed7fe6a 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -51,6 +51,7 @@ class SalmonAction extends Action
 
         if ($dom->documentElement->namespaceURI != Activity::ATOM ||
             $dom->documentElement->localName != 'entry') {
+            common_log(LOG_DEBUG, "Got invalid Salmon post: $xml");
             $this->clientError(_m('Salmon post must be an Atom entry.'));
         }
         // XXX: check the signature

From 3e7a2a4014dd93637f5a666e238dde13e397523c Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sun, 21 Feb 2010 11:11:37 -0800
Subject: [PATCH 2/2] Fix for doc action on systems that return false for
 globbing in a non-existing dir

---
 actions/doc.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/actions/doc.php b/actions/doc.php
index eaf4b7df2d..459f5f0968 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -173,6 +173,10 @@ class DocAction extends Action
         }
 
         $local = glob(INSTALLDIR.'/local/doc-src/'.$this->title.'.*');
+        if ($local === false) {
+            // Some systems return false, others array(), if dir didn't exist.
+            $local = array();
+        }
 
         if (count($local) || isset($localDef)) {
             return $this->negotiateLanguage($local, $localDef);
@@ -183,6 +187,9 @@ class DocAction extends Action
         }
 
         $dist = glob(INSTALLDIR.'/doc-src/'.$this->title.'.*');
+        if ($dist === false) {
+            $dist = array();
+        }
 
         if (count($dist) || isset($distDef)) {
             return $this->negotiateLanguage($dist, $distDef);