Changeset 293

Timestamp:

06/13/10 12:44:01 (20 months ago)

Author:

ol

Message:

Libxml2 single init and cleanup. related to fastcgi architecture changes

Location:

trunk/src

Files:

• fe/fe_filter.c (modified) (3 diffs)
• ows/ows.c (modified) (3 diffs)
• ows/ows_config.c (modified) (3 diffs)
• ows/ows_request.c (modified) (3 diffs)
• struct/cgi_request.c (modified) (2 diffs)
• wfs/wfs_transaction.c (modified) (2 diffs)

trunk/src/fe/fe_filter.c

@@ -441 +441 @@
     }
 
-    xmlInitParser();
-    LIBXML_TEST_VERSION 
-
     xmldoc = xmlParseMemory(xmlchar->buf, xmlchar->use);
 
@@ -449 +446 @@
         fe->error_code = FE_ERROR_FILTER;
         xmlFreeDoc(xmldoc);
-        xmlCleanupParser();
         return fe;
     }
@@ -479 +475 @@
 
     xmlFreeDoc(xmldoc);
-    xmlCleanupParser();
 
     return fe;

trunk/src/ows/ows.c

@@ -337 +337 @@
         buffer_add_str(o->config_file, OWS_CONFIG_FILE_PATH);
 
+    LIBXML_TEST_VERSION
+
     /* Parse the configuration file and initialize ows struct */
     if (!o->exit) ows_parse_config(o, o->config_file->buf);
@@ -353 +355 @@
     if (!o->exit) ows_layers_storage_fill(o);
     if (!o->exit) ows_log(o, 2, "== Filling Storage ==");
-
 
 
@@ -446 +447 @@
     OS_LibShutdown();
 #endif
+    xmlCleanupParser();
     ows_log(o, 2, "== TINYOWS SHUTDOWN ==");
     if (o->log) fclose (o->log);

trunk/src/ows/ows_config.c

@@ -755 +755 @@
     assert(filename != NULL);
 
-    xmlInitParser();
     r = xmlReaderForFile(filename, "UTF-8", 0);
 
     if (r == NULL) {
-        xmlCleanupParser();
         ows_error(o, OWS_ERROR_CONFIG_FILE, "Unable to open config file !",
                   "parse_config_file");
@@ -800 +798 @@
     if (ret != 0) {
         xmlFreeTextReader(r);
-        xmlCleanupParser();
         ows_error(o, OWS_ERROR_CONFIG_FILE, "Unable to open config file !",
                   "parse_config_file");
@@ -807 +804 @@
 
     xmlFreeTextReader(r);
-    xmlCleanupParser();
 
     ows_config_check(o);

trunk/src/ows/ows_request.c

@@ -131 +131 @@
 /*
  * Valid an xml string against an XML schema
- * Inpired from: http://xml.developpez.com/sources/?page=validation#validate_XSD_CppCLI_2
  */
 int ows_schema_validation(const ows *o, buffer * xml_schema, buffer * xml, bool schema_is_file)
@@ -163 +162 @@
     if (schema == NULL) {
         xmlSchemaCleanupTypes();
-        xmlMemoryDump();
-        xmlCleanupParser();
         return ret;
     }
@@ -183 +180 @@
     xmlSchemaFree(schema);
     xmlFreeDoc(doc);
-    xmlCleanupParser();
 
     return ret;

trunk/src/struct/cgi_request.c

@@ -464 +464 @@
     n = NULL;
 
-    xmlInitParser();
     xmldoc = xmlParseMemory(query, strlen(query));
 
     if (!xmldoc || (n = xmlDocGetRootElement(xmldoc)) == NULL) {
         xmlFreeDoc(xmldoc);
-        xmlCleanupParser();
         ows_error(o, OWS_ERROR_INVALID_PARAMETER_VALUE, "xml isn't valid",
                   "request");
@@ -608 +606 @@
 
     xmlFreeDoc(xmldoc);
-    xmlCleanupParser();
 
     return arr;

trunk/src/wfs/wfs_transaction.c

@@ -914 +914 @@
     content = NULL;
 
-    xmlInitParser();
     xmldoc = xmlParseMemory(op->buf, op->use);
 
     if (!xmldoc) {
         xmlFreeDoc(xmldoc);
-        xmlCleanupParser();
         wfs_error(o, wr, WFS_ERROR_NO_MATCHING, "xml isn't valid", "transaction");
         return;
@@ -996 +994 @@
 
     xmlFreeDoc(xmldoc);
-    xmlCleanupParser();
 }