Changeset 278

Timestamp:

06/01/10 19:37:33 (20 months ago)

Author:

ol

Message:

Change error handler behaviour. ows/wfs_error don't die with EXIT anymore. Related to fast-cgi implementation. Add exit boolean in ows struct to indicate if we need/can continue to process code.

Location:

trunk/src

Files:

• ows/ows.c (modified) (7 diffs)
• ows/ows.h (modified) (1 diff)
• ows/ows_config.c (modified) (3 diffs)
• ows/ows_error.c (modified) (2 diffs)
• ows/ows_metadata.c (modified) (1 diff)
• ows/ows_request.c (modified) (11 diffs)
• ows/ows_storage.c (modified) (6 diffs)
• struct/cgi_request.c (modified) (5 diffs)
• wfs/wfs_describe.c (modified) (1 diff)
• wfs/wfs_error.c (modified) (4 diffs)
• wfs/wfs_get_feature.c (modified) (3 diffs)
• wfs/wfs_request.c (modified) (26 diffs)
• wfs/wfs_transaction.c (modified) (2 diffs)

trunk/src/ows/ows.c

@@ -58 +58 @@
     assert(o != NULL);
 
+    o->exit = false;
     o->request = NULL;
     o->cgi = NULL;
@@ -63 +64 @@
     o->pg = NULL;
     o->pg_dsn = NULL;
-    o->output = NULL;
+    o->output = stdout;
     o->config_file = NULL;
     o->online_resource = NULL;
@@ -101 +102 @@
     assert(output != NULL);
 
+    fprintf(output, "exit : %d\n", o->exit?1:0);
+
     if (o->config_file != NULL) {
         fprintf(output, "config_file: ");
@@ -264 +267 @@
 
 
-int main(int argc, char *argv[])
-{
-    char *query;
-    ows *o;
-
-    o = ows_init();
-    o->config_file = buffer_init();
-
-    /* Config Files */
-    if (getenv("TINYOWS_CONFIG_FILE") != NULL)
-        buffer_add_str(o->config_file, getenv("TINYOWS_CONFIG_FILE"));
-    else
-        buffer_add_str(o->config_file, OWS_CONFIG_FILE_PATH);
-
-    o->output = stdout;
-
-
-    /* retrieve the query in HTTP request */
-    query = cgi_getback_query(o);
-
-    /* Parse the configuration file and initialize ows struct */
-    ows_parse_config(o, o->config_file->buf);
-
-    /* Connect the ows to the database */
-    ows_pg(o, o->pg_dsn->buf);
-
-    /* Fill layers storage metadata */
-    ows_layers_storage_fill(o);
-
-    /* Open Log file */
-    if (o->log_file != NULL)
-        o->log = fopen(o->log_file->buf, "a");
-
-
-#if TINYOWS_FCGI
-   while (FCGI_Accept() >= 0)
-   {
-
-#endif
-
-    query = cgi_getback_query(o);
-
-    /* Usage or Version command line options */
-    if (query == NULL || strlen(query) == 0) {
-        if (argc > 1) {
-
-                if (    !strncmp(argv[1], "--help", 6)
-                     || !strncmp(argv[1], "-h", 2)     
-                     || !strncmp(argv[1], "--check", 7))
-                        ows_usage(o);
-
-                else if (    !strncmp(argv[1], "--version", 9) 
-                          || !strncmp(argv[1], "-v", 2))
-                        printf("%s\n", TINYOWS_VERSION);
-
-                else ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
-                             "Service Unknown", "service");
-
-                return EXIT_SUCCESS;
-        }
-
-    } 
-
-
-    /* Log input query if asked */
-   if (o->log != NULL)
-        fprintf(o->log, "[QUERY]\n%s\n---\n", query);
-
-    o->request = ows_request_init();
-
+static void ows_kvp_or_xml(ows *o, char *query)
+{
     /*
      * Request encoding and HTTP method WFS 1.1.0 -> 6.5
@@ -354 +289 @@
                  !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] == '<')
@@ -362 +296 @@
     else ows_error(o, OWS_ERROR_REQUEST_HTTP, "Wrong HTTP request Method", "http");
 
-    switch (o->request->method) {
-        case OWS_METHOD_KVP:
-            o->cgi = cgi_parse_kvp(o, query);
-            break;
-        case OWS_METHOD_XML:
-            o->cgi = cgi_parse_xml(o, query);
-            break;
-
-        default: ows_error(o, OWS_ERROR_REQUEST_HTTP,
+}
+
+
+int main(int argc, char *argv[])
+{
+    ows *o;
+    char *query=NULL;
+
+    o = ows_init();
+    o->config_file = buffer_init();
+
+    /* Config Files */
+    if (getenv("TINYOWS_CONFIG_FILE") != NULL)
+        buffer_add_str(o->config_file, getenv("TINYOWS_CONFIG_FILE"));
+    else
+        buffer_add_str(o->config_file, OWS_CONFIG_FILE_PATH);
+
+    /* Parse the configuration file and initialize ows struct */
+    if (!o->exit) ows_parse_config(o, o->config_file->buf);
+
+    /* Connect the ows to the database */
+    if (!o->exit) ows_pg(o, o->pg_dsn->buf);
+
+    /* Fill layers storage metadata */
+    if (!o->exit) ows_layers_storage_fill(o);
+
+    /* Open Log file */
+    if (o->log_file != NULL)
+        o->log = fopen(o->log_file->buf, "a");
+
+
+#if TINYOWS_FCGI
+   while (FCGI_Accept() >= 0)
+   {
+#endif
+
+    if (!o->exit) query = cgi_getback_query(o);
+
+    /* Usage or Version command line options */
+    if (query == NULL || strlen(query) == 0) {
+        if (argc > 1) {
+
+                if (    !strncmp(argv[1], "--help", 6)
+                     || !strncmp(argv[1], "-h", 2)     
+                     || !strncmp(argv[1], "--check", 7))
+                        ows_usage(o);
+
+                else if (    !strncmp(argv[1], "--version", 9) 
+                          || !strncmp(argv[1], "-v", 2))
+                        printf("%s\n", TINYOWS_VERSION);
+
+                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->exit) ows_kvp_or_xml(o, query);
+
+    if (!o->exit) {
+
+        switch (o->request->method) {
+            case OWS_METHOD_KVP:
+                o->cgi = cgi_parse_kvp(o, query);
+                break;
+            case OWS_METHOD_XML:
+                o->cgi = cgi_parse_xml(o, query);
+                break;
+
+            default: ows_error(o, OWS_ERROR_REQUEST_HTTP,
                         "Wrong HTTP request Method", "http");
-    }
-
-    o->psql_requests = list_init();
+        }
+    }
+
+    if (!o->exit) o->psql_requests = list_init();
 
     /* Fill service's metadata */
-    ows_metadata_fill(o, o->cgi);
+    if (!o->exit) ows_metadata_fill(o, o->cgi);
 
     /* Process service request */
-    ows_request_check(o, o->request, o->cgi, query);
+    if (!o->exit) ows_request_check(o, o->request, o->cgi, query);
 
     /* Run the right OWS service */
-    switch (o->request->service) {
-        case WFS:
-            o->request->request.wfs = wfs_request_init();
-            wfs_request_check(o, o->request->request.wfs, o->cgi);
-            wfs(o, o->request->request.wfs);
-            break;
-        default:
-            ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
+    if (!o->exit) {
+        switch (o->request->service) {
+            case WFS:
+                o->request->request.wfs = wfs_request_init();
+                wfs_request_check(o, o->request->request.wfs, o->cgi);
+                if (!o->exit) wfs(o, o->request->request.wfs);
+                break;
+            default:
+                ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                       "Service Unknown", "service");
-    }
-
-    ows_request_free(o->request);
-    o->request=NULL;
+        }
+    }
+
+    if (o->request) {
+        ows_request_free(o->request);
+        o->request=NULL;
+    }
 
 #if TINYOWS_FCGI
@@ -401 +408 @@
     OS_LibShutdown();
 #endif
-
     if (o->log) fclose (o->log);
     ows_free(o);

trunk/src/ows/ows.h

@@ -409 +409 @@
 
 typedef struct Ows {
+    bool exit;
     PGconn * pg;
     buffer * config_file;

trunk/src/ows/ows_config.c

@@ -686 +686 @@
 static void ows_config_check(ows * o)
 {
-    if (o->online_resource == NULL)
+    if (o->online_resource == NULL) {
         ows_error(o, OWS_ERROR_CONFIG_FILE,
                   "No 'online_resource' property in tinyows element",
                   "parse_config_file");
-
-    if (o->schema_dir == NULL)
+        return;
+    }
+
+    if (o->schema_dir == NULL) {
         ows_error(o, OWS_ERROR_CONFIG_FILE,
                   "No 'schema_dir' property in tinyows element",
                   "parse_config_file");
-
-    if (o->metadata == NULL)
+        return;
+    }
+
+    if (o->metadata == NULL) {
         ows_error(o, OWS_ERROR_CONFIG_FILE,
                   "No 'metadata' element", "parse_config_file");
-
-    if (o->metadata->name == NULL)
+        return;
+    }
+
+    if (o->metadata->name == NULL) {
         ows_error(o, OWS_ERROR_CONFIG_FILE,
                   "No 'name' property in metadata element",
                   "parse_config_file");
-
-    if (o->metadata->title == NULL)
+        return;
+    }
+
+    if (o->metadata->title == NULL) {
         ows_error(o, OWS_ERROR_CONFIG_FILE,
                   "No 'title' property in metadata element",
                   "parse_config_file");
-
-    if (o->pg_dsn == NULL)
+        return;
+    }
+
+    if (o->pg_dsn == NULL) {
         ows_error(o, OWS_ERROR_CONFIG_FILE,
                   "No 'pg' element",
                   "parse_config_file");
-
-    if (o->contact == NULL)
+        return;
+    }
+
+    if (o->contact == NULL) {
         ows_error(o, OWS_ERROR_CONFIG_FILE,
                   "No 'contact' element",
                   "parse_config_file");
-
-    if (o->contact->name == NULL)
+        return;
+    }
+
+    if (o->contact->name == NULL) {
         ows_error(o, OWS_ERROR_CONFIG_FILE,
                   "No 'name' property in contact element",
                   "parse_config_file");
+        return;
+    }
 }
 
@@ -746 +762 @@
         ows_error(o, OWS_ERROR_CONFIG_FILE, "Unable to open config file !",
                   "parse_config_file");
+        return;
     }
 
@@ -786 +803 @@
         ows_error(o, OWS_ERROR_CONFIG_FILE, "Unable to open config file !",
                   "parse_config_file");
+        return;
     }
 

trunk/src/ows/ows_error.c

@@ -75 +75 @@
     assert(locator != NULL);
 
+    assert(!o->exit);
+    o->exit = true;
+
     if (o->log != NULL)
         fprintf(o->log, "[ERROR] {%s:%s} %s\n",
@@ -93 +96 @@
     fprintf(o->output, " </ows:Exception>\n");
     fprintf(o->output, "</ows:ExceptionReport>\n");
-
-#if 0
-#if TINYOWS_FCGI
-    OS_LibShutdown();
-#endif
-#endif
-
-   if (o->log) fclose (o->log);
-   ows_free(o);
-   exit(EXIT_SUCCESS);
 }
-
 
 /*

trunk/src/ows/ows_metadata.c

@@ -203 +203 @@
         ows_error(o, OWS_ERROR_MISSING_PARAMETER_VALUE,
                   "service unknown", "service");
+        return;
     }
 

trunk/src/ows/ows_request.c

@@ -218 +218 @@
     } else {
         /* check if version format is x.y.z */
-        if (b->use < 5)
+        if (b->use < 5) {
             ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                       "VERSION parameter is not valid (use x.y.z)", "version");
+            return v;
+        }
 
         l = list_explode('.', b);
@@ -228 +230 @@
             ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                       "VERSION parameter is not valid (use x.y.z)", "version");
+            return v;
         }
 
@@ -240 +243 @@
             ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                       "VERSION parameter is not valid (use x.y.z)", "version");
+            return v;
         }
 
@@ -277 +281 @@
         /* Tests WFS 1.1.0 require a default value for requests
            encoded in XML if service is not set */
-        if (cgi_method_get())
+        if (cgi_method_get()) {
             ows_error(o, OWS_ERROR_MISSING_PARAMETER_VALUE,
                       "SERVICE is not set", "SERVICE");
-        else {
+            return;
+        } else {
             if (buffer_case_cmp(o->metadata->type, "WMS"))
                 or->service = WMS;
             else if (buffer_case_cmp(o->metadata->type, "WFS"))
                 or->service = WFS;
-            else
+            else {
                 ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                           "service unknown", "service");
+                return;
+            }
         }
     } else {
@@ -296 +303 @@
         else if (buffer_case_cmp(b, "WFS"))
             or->service = WFS;
-        else if (buffer_case_cmp(b, "WCS"))
-            ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
-                      "service not implemented", "service");
         else if (buffer_case_cmp(b, "")) {
             if (buffer_case_cmp(o->metadata->type, "WMS"))
@@ -304 +308 @@
             else if (buffer_case_cmp(o->metadata->type, "WFS"))
                 or->service = WFS;
-            else
+            else { 
                 ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                           "service unknown", "service");
-        } else
-            ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
+                return;
+            }
+        } else {
+                ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                       "service unknown", "service");
+                return;
+        }
     }
 
 
     /* check if REQUEST is set */
-    if (!array_is_key(cgi, "request"))
+    if (!array_is_key(cgi, "request")) {
         ows_error(o, OWS_ERROR_MISSING_PARAMETER_VALUE,
                   "REQUEST is not set", "REQUEST");
-    else
-        b = array_get(cgi, "request");
+        return;
+    } else b = array_get(cgi, "request");
 
     /* check if VERSION is set and init Version */
@@ -326 +334 @@
         if (!buffer_case_cmp(b, "GetCapabilities")) {
             /* WFS 1.1.0 with KVP need a version set */
-            if (o->request->method == OWS_METHOD_KVP)
+            if (o->request->method == OWS_METHOD_KVP) {
                 ows_error(o, OWS_ERROR_MISSING_PARAMETER_VALUE,
                           "VERSION is not set", "VERSION");
+                return;
+            }
             /* WFS 1.1.0 require a default value for requests
                encoded in XML if version is not set */
@@ -342 +352 @@
     /* check if layers have name or title and srs */
     for (ln = o->layers->first; ln != NULL; ln = ln->next) {
-        if (ln->layer->name == NULL)
+        if (ln->layer->name == NULL) {
             ows_error(o, OWS_ERROR_CONFIG_FILE,
                       "No layer name defined", "config_file");
+            return;
+        }
 
         if (ows_layer_match_table(o, ln->layer->name)) {
-            if (ln->layer->title == NULL)
+            if (ln->layer->title == NULL) {
                 ows_error(o, OWS_ERROR_CONFIG_FILE,
                           "No layer title defined", "config_file");
+                return;
+            }
 
             if (or->service == WFS) {
-                if (ln->layer->prefix == NULL)
+                if (ln->layer->prefix == NULL) {
                     ows_error(o, OWS_ERROR_CONFIG_FILE,
                               "No layer prefix defined", "config_file");
-
-                if (ln->layer->server == NULL)
+                    return;
+                }
+
+                if (ln->layer->server == NULL) {
                     ows_error(o, OWS_ERROR_CONFIG_FILE,
                               "No layer server defined", "config_file");
+                    return;
+                }
             }
 
@@ -371 +389 @@
                         if (!check_regexp(b->buf, "^http://www.opengis.net")
                                 && !check_regexp(b->buf, "^EPSG")
-                                && !check_regexp(b->buf, "^urn:"))
+                                && !check_regexp(b->buf, "^urn:")) {
                             ows_error(o, OWS_ERROR_CONFIG_FILE,
                                       "srsname isn't valid", "srsName");
+                            return;
+                        }
 
                         for (srid = ln->layer->srid->first; srid != NULL;
@@ -381 +401 @@
                         }
 
-                        if (srsname == false)
+                        if (srsname == false) {
                             ows_error(o, OWS_ERROR_CONFIG_FILE,
                                       "srsname doesn't match srid",
                                       "config_file");
+                            return;
+                        }
                     }
                 }
@@ -425 +447 @@
             buffer_free(xmlstring);
             
-            if (valid != 0)
+            if (valid != 0) {
                 ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                       "xml isn't valid", "request");
+                return;
+            }
         }
     }

trunk/src/ows/ows_storage.c

@@ -170 +170 @@
         ows_error(o, OWS_ERROR_REQUEST_SQL_FAILED,
                   "Unable to access pg_* tables.", "not_null columns");
+        return;
     }
 
@@ -221 +222 @@
         ows_error(o, OWS_ERROR_REQUEST_SQL_FAILED,
                   "Unable to access pg_* tables.", "pkey column");
+        return;
     }
 
@@ -248 +250 @@
             ows_error(o, OWS_ERROR_REQUEST_SQL_FAILED,
                   "Unable to find pkey column number.", "pkey_column number");
+            return;
         }
 
@@ -271 +274 @@
             ows_error(o, OWS_ERROR_REQUEST_SQL_FAILED,
                   "Unable to use pg_get_serial_sequence.", "pkey_sequence retrieve");
+            return;
         }
         
@@ -320 +324 @@
         ows_error(o, OWS_ERROR_REQUEST_SQL_FAILED,
                   "Unable to access pg_* tables.", "fill_attributes");
+        return;
     }
 
@@ -364 +369 @@
                   "Some layer(s) described in config file are not available in geometry_columns or geography_columns",
                   "storage");
+        return;
     }
 

trunk/src/struct/cgi_request.c

@@ -83 +83 @@
         query_size = atoi(getenv("CONTENT_LENGTH"));
 
-        if (query_size > CGI_QUERY_MAX)
+        if (query_size > CGI_QUERY_MAX) {
             ows_error(o, OWS_ERROR_REQUEST_HTTP, "QUERY_STRING too long",
                       "request");
+            return NULL;
+        }
 
         query = malloc(sizeof(char) * CGI_QUERY_MAX);
@@ -210 +212 @@
                               "QUERY_STRING contains forbidden characters",
                               "request");
+                    return NULL;
                 }
             else {
@@ -224 +227 @@
                               "QUERY_STRING contains forbidden characters",
                               "request");
+                    return NULL;
                 }
             }
@@ -235 +239 @@
         ows_error(o, OWS_ERROR_REQUEST_HTTP, "QUERY_STRING too long",
                   "request");
+        return NULL;
     }
 
@@ -461 +466 @@
         ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE, "xml isn't valid",
                   "request");
+        return NULL;
     }
 

trunk/src/wfs/wfs_describe.c

@@ -104 +104 @@
                     "Not a single layer is available. Check config file",
                     "describe");
+            return;
     }
 

trunk/src/wfs/wfs_error.c

@@ -68 +68 @@
     assert(locator != NULL);
 
+    assert(!o->exit);
+    o->exit = true;
+
+    if (o->log != NULL)
+        fprintf(o->log, "[ERROR] {%s:%s} %s\n",
+        wfs_error_code_string(code), locator, message);
+
     fprintf(o->output, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
     fprintf(o->output, "<ServiceExceptionReport\n");
@@ -79 +86 @@
     fprintf(o->output, "</ServiceException>\n");
     fprintf(o->output, "</ServiceExceptionReport>\n");
-
-#if TINYOWS_FCGI
-    OS_LibShutdown();
-#endif
-    if (o->log) fclose (o->log);
-    ows_free(o);
-
-    exit(EXIT_SUCCESS);
 }
 
@@ -101 +100 @@
     assert(locator != NULL);
 
+    assert(!o->exit);
+    o->exit = true;
+
+    if (o->log != NULL)
+        fprintf(o->log, "[ERROR] {%s:%s} %s\n",
+        wfs_error_code_string(code), locator, message);
+
     fprintf(o->output, "<?xml version='1.0' encoding='UTF-8'?>\n");
     fprintf(o->output, "<ExceptionReport\n");
@@ -113 +119 @@
     fprintf(o->output, " </Exception>\n");
     fprintf(o->output, "</ExceptionReport>\n");
-
-#if TINYOWS_FCGI
-    OS_LibShutdown();
-#endif
-    if (o->log) fclose (o->log);
-    ows_free(o);
-
-    exit(EXIT_SUCCESS);
 }
 

trunk/src/wfs/wfs_get_feature.c

@@ -651 +651 @@
                           "error : an id_column is required to use featureid",
                           "GetFeature");
+                return NULL;
             }
         }
@@ -673 +674 @@
                     buffer_free(layer_name);
                     fe_error(o, fe);
+                    return NULL;
                 }
 
@@ -860 +862 @@
     /* retrieve a list of SQL requests from the GetFeature parameters */
     request_list = wfs_retrieve_sql_request_list(o, wr);
-
+    if (!request_list) return;
        
     if (wr->format == WFS_GML2 || wr->format == WFS_GML3) {

trunk/src/wfs/wfs_request.c

@@ -282 +282 @@
                 wfs_error(o, wr, WFS_ERROR_LAYER_NOT_DEFINED,
                           "unknown layer name", "typename");
+                return NULL;
             }
 
@@ -291 +292 @@
                           "not-retrievable layer(s), GetFeature Operation impossible, change configuration file",
                           "typename");
+                return NULL;
             }
 
@@ -300 +302 @@
                           "not-writable layer(s), Transaction Operation impossible, change configuration file",
                           "typename");
+                return NULL;
             }
         }
@@ -342 +345 @@
                       "featureid list size and typename list size must be similar",
                       "");
+            return NULL;
         }
 
@@ -361 +365 @@
                               "featureid values and typename values don't match",
                               "");
+                    return NULL;
                 }
             }
@@ -371 +376 @@
                 ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                           "featureid must match layer.id", "GetFeature");
-
+                return NULL;
             }
 
@@ -390 +395 @@
                 wfs_error(o, wr, WFS_ERROR_LAYER_NOT_DEFINED,
                           "unknown layer name", "GetFeature");
+                return NULL;
             }
 
@@ -401 +407 @@
                           "not-retrievable layer(s), GetFeature Operation impossible, change configuration file",
                           "GetFeature");
+                return NULL;
             }
 
@@ -412 +419 @@
                           "not-writable layer(s), Transaction Operation impossible, change configuration file",
                           "Transaction");
+                return NULL;
             }
 
@@ -459 +467 @@
                               "layers in TYPENAME must have the same SRS",
                               "GetFeature");
+                    return;
                 }
             }
@@ -468 +477 @@
                         "srsName value use an unsupported value, for requested layer(s)",
                         "GetFeature");
-            }
+             return;
+        }
 
     } else {
@@ -477 +487 @@
                         "srsName value use an unsupported value, for requested layer(s)",
                         "GetFeature");
-             }
+             return;
+        }
     }
 }
@@ -505 +516 @@
                   "Bad parameters for Bbox, must be Xmin,Ymin,Xmax,Ymax",
                   "NULL");
+        return;
     }
 
@@ -693 +705 @@
                   "propertyname list size and typename list size must be similar",
                   "GetFeature");
+        return;
     }
 
@@ -713 +726 @@
                               "propertyname values and typename values don't match",
                               "GetFeature");
+                    return;
                 }
 
@@ -738 +752 @@
                 ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                           "propertyname values not available", "GetFeature");
+                return;
             }
         }
@@ -764 +779 @@
     wr->filter = list_explode_start_end('(', ')', filter);
 
-    if (wr->filter->size != wr->typename->size) {
-        buffer_free(filter);
+    if (wr->filter->size != wr->typename->size)
         wfs_error(o, wr, WFS_ERROR_INCORRECT_SIZE_PARAMETER,
                   "filter list size and typename list size must be similar",
                   "GetFeature");
-    }
 
     buffer_free(filter);
@@ -785 +798 @@
 
     /* operation parameter is mandatory */
-    if (!array_is_key(o->cgi, "operation")) 
+    if (!array_is_key(o->cgi, "operation")) {
         ows_error(o, OWS_ERROR_MISSING_PARAMETER_VALUE,
                   "Operation (Delete) must be specified", "Operation");
+        return;
+    }
 
     wr->operation = buffer_init();
     buffer_copy(wr->operation, array_get(o->cgi, "operation"));
 
-    if (buffer_cmp(wr->operation, "Delete") == false)
+    if (buffer_cmp(wr->operation, "Delete") == false) {
         ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                   "only Delete operation is supported with GET method, use POST method for insert and update operations",
                   "Transaction");
+        return;
+    }
 }
 
@@ -807 +824 @@
     assert(wr != NULL);
 
-    if (!array_is_key(o->cgi, "typename") && !array_is_key(o->cgi, "featureid"))
+    if (!array_is_key(o->cgi, "typename") && !array_is_key(o->cgi, "featureid")) {
         ows_error(o, OWS_ERROR_MISSING_PARAMETER_VALUE,
                   "Typename or FeatureId must be set", "request");
+        return;
+    }
 
     /* test mutually exclusive parameters (filter,bbox and featureid) */
@@ -870 +889 @@
         list_free(l);
         /* if versions weren't 1.0.0 or 1.1.0, raise an error */
-        if (version == false)
+        if (version == false) {
             ows_error(o, OWS_ERROR_VERSION_NEGOTIATION_FAILED,
                       "VERSION parameter is not valid (use 1.0.0 or 1.1.0)",
                       "AcceptVersions");
+            return;
+        }
 
     }
@@ -881 +902 @@
         b = array_get(cgi, "updatesequence");
 
-        if (!buffer_cmp(b, "0"))
+        if (!buffer_cmp(b, "0")) {
             ows_error(o, OWS_ERROR_INVALID_UPDATE_SEQUENCE,
                       "updateSequence's value must be 0, UpdateSequence not available",
                       "updateSequence");
+            return;
+        }
     }
 
@@ -963 +986 @@
 
     layer_name = list_init();
+
     /* typename (requisite except if there is a featureid parameter */
-    layer_name = wfs_request_check_typename(o, wr, layer_name);
+    if (!o->exit) layer_name = wfs_request_check_typename(o, wr, layer_name);
 
     /* Featureid, if no typename defined, list of layer_name must be extracted from featureid */
-    layer_name = wfs_request_check_fid(o, wr, layer_name);
+    if (!o->exit) layer_name = wfs_request_check_fid(o, wr, layer_name);
 
     /* srsName */
-    wfs_request_check_srs(o, wr, layer_name);
+    if (!o->exit) wfs_request_check_srs(o, wr, layer_name);
 
     /* BBox : BBOX=xmin,ymin,xmax,ymax */
-    wfs_request_check_bbox(o, wr, layer_name);
+    if (!o->exit)  wfs_request_check_bbox(o, wr, layer_name);
 
     /* PropertyName */
-    wfs_request_check_propertyname(o, wr, layer_name);
-    list_free(layer_name);
+    if (!o->exit) wfs_request_check_propertyname(o, wr, layer_name);
+
+    if (!o->exit) list_free(layer_name);
 
     /* outputFormat */
-    wfs_request_check_output(o, wr);
+    if (!o->exit) wfs_request_check_output(o, wr);
 
     /* resultType */
-    wfs_request_check_resulttype(o, wr);
+    if (!o->exit) wfs_request_check_resulttype(o, wr);
 
     /* sortBy */
-    wfs_request_check_sortby(o, wr);
+    if (!o->exit) wfs_request_check_sortby(o, wr);
 
     /* maxFeatures */
-    wfs_request_check_maxfeatures(o, wr);
+    if (!o->exit) wfs_request_check_maxfeatures(o, wr);
 
     /*Filter */
-    wfs_request_check_filter(o, wr);
+    if (!o->exit) wfs_request_check_filter(o, wr);
 }
 
@@ -1009 +1034 @@
 
     /* general checks */
-    wfs_request_check_operation(o, wr);
-    wfs_request_check_parameters(o, wr);
+    if (!o->exit) wfs_request_check_operation(o, wr);
+    if (!o->exit) wfs_request_check_parameters(o, wr);
 
     layer_name = list_init();
     /* typename */
-    layer_name = wfs_request_check_typename(o, wr, layer_name);
+    if (!o->exit) layer_name = wfs_request_check_typename(o, wr, layer_name);
 
     /* featureid */
-    layer_name = wfs_request_check_fid(o, wr, layer_name);
+    if (!o->exit) layer_name = wfs_request_check_fid(o, wr, layer_name);
 
     /* bbox */
-    wfs_request_check_bbox(o, wr, layer_name);
+    if (!o->exit) wfs_request_check_bbox(o, wr, layer_name);
     list_free(layer_name);
 
     /* filter */
-    wfs_request_check_filter(o, wr);
+    if (!o->exit) wfs_request_check_filter(o, wr);
 }
 
@@ -1041 +1066 @@
     b = array_get(cgi, "request");
 
-    if (o->request->service != WFS)
+    if (o->request->service != WFS) {
         ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                   "bad service, should be WFS", "SERVICE");
+        return;
+    }
 
     /* version */
-    if (!buffer_case_cmp(b, "GetCapabilities"))
+    if (!buffer_case_cmp(b, "GetCapabilities")) {
         wfs_request_check_version(o, wr, cgi);
+        if (o->exit) return;
+    }
 
     /* check if request parameter is correct */
@@ -1101 +1130 @@
                 if (buffer_cmp(wf->operation, "Delete"))
                     wfs_delete(o, wf);
-                else
+                else {
                     ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                               "only Delete operation is supported with GET method, use POST method for insert and update operations",
                               "Transaction");
+                    return;
+                }
 
             } else {
@@ -1110 +1141 @@
                     op = array_get(o->cgi, "operations");
                     wfs_parse_operation(o, wf, op);
-                } else
+                } else {
                     ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE,
                               "Operation parameter must be set", "Transaction");
+                    return;
+                }
             }
 

trunk/src/wfs/wfs_transaction.c

@@ -608 +608 @@
                           "error : an id_column is required to use featureid",
                           "Delete");
+                return;
             }
         }
@@ -920 +921 @@
         xmlCleanupParser();
         wfs_error(o, wr, WFS_ERROR_NO_MATCHING, "xml isn't valid", "transaction");
+        return;
     }