From: scantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Mon, 29 Oct 2012 17:56:33 +0000 (+0000)
Subject: https://issues.shibboleth.net/jira/browse/SSPCPP-518
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=49470773e2bb624d86073f7bb17d14266015b486

https://issues.shibboleth.net/jira/browse/SSPCPP-518

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3809 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/shibsp/ServiceProvider.cpp b/shibsp/ServiceProvider.cpp
index 6a56641..26d40e6 100644
--- a/shibsp/ServiceProvider.cpp
+++ b/shibsp/ServiceProvider.cpp
@@ -305,7 +305,9 @@ pair<bool,long> ServiceProvider::doAuthentication(SPRequest& request, bool handl
                 if (!qstr || !strstr(qstr, "shiblogoutdone=1")) {
                     // First leg of circuit, so we redirect to the logout endpoint specified with this URL as a return location.
                     string selfurl = request.getRequestURL();
-                    if (!qstr)
+                    if (qstr)
+                        selfurl += '&';
+                    else
                         selfurl += '?';
                     selfurl += "shiblogoutdone=1";
                     string loc = requireLogoutWith.second;