Use shibboleth-sp as package name for compatibility.

[shibboleth/cpp-sp.git] / shibsp / util / CGIParser.h

diff --git a/shibsp/util/CGIParser.h b/shibsp/util/CGIParser.h
index b76953d..3e8c1c2 100644 (file)
--- a/shibsp/util/CGIParser.h
+++ b/shibsp/util/CGIParser.h
@@ -1,30 +1,40 @@
-/*
- *  Copyright 2001-2007 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
  * @file shibsp/util/CGIParser.h
  * 
- * CGI GET/POST parameter parsing
+ * CGI GET/POST parameter parsing.
  */
 
 #ifndef __shibsp_cgi_h__
 #define __shibsp_cgi_h__
 
 #include <shibsp/base.h>
-#include <xmltooling/io/HTTPRequest.h>
+
+#include <map>
+#include <string>
+
+namespace xmltooling {
+    class XMLTOOL_API HTTPRequest;
+};
 
 namespace shibsp {
 
@@ -41,11 +51,12 @@ namespace shibsp {
         MAKE_NONCOPYABLE(CGIParser);
     public:
         /**
-         * Constructor
+         * Constructor.
          * 
          * @param request   HTTP request interface
+         * @param queryOnly true iff the POST body should be ignored
          */
-        CGIParser(const xmltooling::HTTPRequest& request);
+        CGIParser(const xmltooling::HTTPRequest& request, bool queryOnly=false);
 
         ~CGIParser();
 
@@ -55,16 +66,13 @@ namespace shibsp {
         /**
          * Returns a pair of bounded iterators around the values of a parameter.
          * 
-         * @param name  name of parameter
+         * @param name  name of parameter, or nullptr to return all parameters
          * @return  a pair of multimap iterators surrounding the matching value(s)
          */
         std::pair<walker,walker> getParameters(const char* name) const;
         
     private:
-        char* fmakeword(char stop, size_t *cl, const char** ppch);
-        char* makeword(char *line, char stop);
-        void plustospace(char *str);
-
+        void parse(const char* pch);
         std::multimap<std::string,char*> kvp_map;
     };