Merge pull request #680 from tauceti2/fix_disco_url_creation

Disco URL can already contain parameters

Author: c00kiemon5ter

src/saml2/client_base.py

@@ -925,7 +925,11 @@ def create_discovery_service_request(url, entity_id, **kwargs):
         }
 
         params = urlencode({k: v for k, v in args.items() if v})
-        return "%s?%s" % (url, params)
+        # url can already contain some parameters
+        if '?' in url:
+            return "%s&%s" % (url, params)
+        else:
+            return "%s?%s" % (url, params)
 
     @staticmethod
     def parse_discovery_service_response(url="", query="",