Changeset 279

Timestamp:

06/02/10 08:09:32 (20 months ago)

Author:

ol

Message:

Fix FastCGI exit handle. Improve log output. Null query check on top

Files:

• trunk/src/ows/ows.c (modified) (6 diffs)

trunk/src/ows/ows.c

@@ -275 +275 @@
     /* GET could only handle KVP */
     if (cgi_method_get()) o->request->method = OWS_METHOD_KVP;
+
     /* POST could handle KVP or XML encoding */
     else if (cgi_method_post()) {
@@ -289 +290 @@
                  !strcmp(getenv("CONTENT_TYPE"), "text/plain"))
             o->request->method = OWS_METHOD_XML;
+
         /* Command line Unit Test cases with XML values (not HTTP) */
     } else if (!cgi_method_post() && !cgi_method_get() && query[0] == '<')
@@ -294 +296 @@
     else if (!cgi_method_post() && !cgi_method_get())
         o->request->method = OWS_METHOD_KVP;
+
     else ows_error(o, OWS_ERROR_REQUEST_HTTP, "Wrong HTTP request Method", "http");
 
@@ -334 +337 @@
     if (!o->exit) query = cgi_getback_query(o);
 
-    /* Usage or Version command line options */
     if (query == NULL || strlen(query) == 0) {
+
+        /* Usage or Version command line options */
         if (argc > 1) {
 
@@ -349 +353 @@
                 else ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                              "Service Unknown", "service");
-
                 o->exit = true;
-        }
+
+        } else {
+                ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE, 
+                             "Service Unknown", "service");
+                o->exit = true;
+        }
     } 
 
-
     /* Log input query if asked */
-   if (o->log != NULL)
-        fprintf(o->log, "[QUERY]\n%s\n---\n", query);
-
-    o->request = ows_request_init();
+   if (o->log && query)
+        fprintf(o->log, "[QUERY]\n%s\n", query);
+
+    if (!o->exit) o->request = ows_request_init();
     if (!o->exit) ows_kvp_or_xml(o, query);
 
@@ -405 +412 @@
 
 #if TINYOWS_FCGI
-    } 
+    if (o->log) fprintf(o->log, "---\n"); 
+    o->exit = false;
+    }
+    if (o->log) fprintf(o->log, "== FCGI SHUTDOWN == \n");
     OS_LibShutdown();
 #endif