Changeset 310

Timestamp:

07/12/10 17:07:01 (19 months ago)

Author:

ol

Message:

Udig compliancy session: remove CR/LF from KVP query URL. Add Buggy Udig CONTENT_TYPE for XML query

Location:

trunk/src

Files:

• ows/ows.c (modified) (2 diffs)
• struct/cgi_request.c (modified) (3 diffs)

trunk/src/ows/ows.c

@@ -299 +299 @@
      * Request encoding and HTTP method WFS 1.1.0 -> 6.5
      */
-
+   
     /* GET could only handle KVP */
     if (cgi_method_get()) o->request->method = OWS_METHOD_KVP;
@@ -316 +316 @@
                  !strcmp(getenv("CONTENT_TYPE"), "application/xml; charset=UTF-8") ||
                  !strcmp(getenv("CONTENT_TYPE"), "text/plain"))
+            o->request->method = OWS_METHOD_XML;
+
+        /* Udig buggy: to remove a day */
+        else if (!strcmp(getenv("CONTENT_TYPE"), "text/xml, application/xml"))
             o->request->method = OWS_METHOD_XML;
 

trunk/src/struct/cgi_request.c

@@ -145 +145 @@
 /*
  * Transform url's plus into spaces
- * Source : http://hoohoo.ncsa.uiuc.edu/docs/
  */
 static void cgi_plustospace(char *str)
@@ -151 +150 @@
     int x;
 
-    for (x = 0; str[x]; x++)
-        if (str[x] == '+')
-            str[x] = ' ';
-}
-
+    for (x=0 ; str[x] ; x++)
+        if (str[x] == '+') str[x] = ' ';
+}
+
+/*
+ * Remove CR or LF in URL 
+ */
+static void cgi_remove_crlf(char *str)
+{
+    int x;
+
+    for (x=0 ; str[x] ; x++)
+        if (str[x] == '\n' || str[x] == '\r')
+                str[x] = ' ';
+}
 
 /*
@@ -179 +188 @@
 
     cgi_unescape_url(query);
+    cgi_remove_crlf(query);
     cgi_plustospace(query);