From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Sat, 6 Nov 2010 19:19:53 +0000 (+0000)
Subject: Collapse feeds to a single array, sanitize JSON strings.
X-Git-Tag: 2.4.2~35
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=1205fe4a284d86e6410eafa4a606a5665d8d2bd6

Collapse feeds to a single array, sanitize JSON strings.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/branches/REL_2@3367 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/shibsp/handler/impl/DiscoveryFeed.cpp b/shibsp/handler/impl/DiscoveryFeed.cpp
index fbad37a..1298bc1 100644
--- a/shibsp/handler/impl/DiscoveryFeed.cpp
+++ b/shibsp/handler/impl/DiscoveryFeed.cpp
@@ -304,7 +304,8 @@ void DiscoveryFeed::feedToFile(const Application& application, string& cacheTag)
             ofstream ofile(fname.c_str());
             if (!ofile)
                 throw ConfigurationException("Unable to create feed in ($1).", params(1,fname.c_str()));
-            m->outputFeed(ofile);
+            bool first = true;
+            m->outputFeed(ofile, first);
             ofile.close();
             m_feedQueue.push(make_pair(feedTag, now));
         }
@@ -338,7 +339,8 @@ void DiscoveryFeed::feedToStream(const Application& application, string& cacheTa
         }
 
         cacheTag = feedTag;
-        m->outputFeed(os);
+        bool first = true;
+        m->outputFeed(os, first);
     }
     else {
         throw MetadataException("MetadataProvider does not support discovery feed.");