Changeset 549 for branches

Timestamp:

Feb 2, 2015, 10:04:56 AM (10 years ago)

Author:

david

Message:

• Adding Process Management

Location:

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel

Files:

• Makefile.in (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• service_internal.c (modified) (28 diffs)
• service_internal.h (modified) (5 diffs)
• service_internal_js.c (modified) (2 diffs)
• service_internal_python.c (modified) (5 diffs)
• service_internal_python.h (modified) (1 diff)
• service_loader.c (modified) (1 diff)
• service_zcfg.c (modified) (4 diffs)
• service_zcfg.h (modified) (1 diff)
• ulinet.h (modified) (1 diff)
• zoo_loader.c (modified) (15 diffs)
• zoo_service_loader.c (modified) (74 diffs)

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/Makefile.in

@@ -12 +12 @@
 JAVA_FILE=@JAVA_FILE@
 
-CFLAGS=@DEB_DEF@ -fpic ${GLIB_CPPFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
-LDFLAGS=-lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${GLIB_LDFLAGS}  ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${YAML_LDFLAGS} 
+CFLAGS=@DEB_DEF@  -fpic ${GLIB_CPPFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
+LDFLAGS=  -lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${GLIB_LDFLAGS}  ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${YAML_LDFLAGS} 
 
 PHPCFLAGS=@PHP_CPPFLAGS@
@@ -59 +59 @@
         gcc -fPIC ${XML2CFLAGS} ${CFLAGS} ${JSCFLAGS} ${JS_ENABLED} -c ulinet.c
 
-service_zcfg.o: service_zcfg.c
-        gcc -fPIC ${GLIB_CPPFLAGS} ${XML2CFLAGS} -c service_zcfg.c
+service_zcfg.o: service_zcfg.c service.h
+        g++ ${GLIB_CPPFLAGS} ${XML2CFLAGS} -c service_zcfg.c
 
 service_internal.o: service_internal.c service.h

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/configure.ac

@@ -340 +340 @@
         LIBS="$PYTHON_LDFLAGS"
         PY_LIB=`$PYTHONCONFIG --libs | sed -e 's/^.*\(python2\..\)$/\1/'`
-        AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
+        #AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
         AC_SUBST([PYTHON_CPPFLAGS])
         AC_SUBST([PYTHON_LDFLAGS])

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/service_internal.c

@@ -58 +58 @@
 
 void
-printHeaders (maps * m)
+printHeaders (maps * m,FCGX_Stream *out)
 {
   maps *_tmp = getMaps (m, "headers");
@@ -66 +66 @@
       while (_tmp1 != NULL)
         {
-          printf ("%s: %s\r\n", _tmp1->name, _tmp1->value);
+          FCGX_FPrintF(out,"%s: %s\r\n", _tmp1->name, _tmp1->value);
+          //printf ("%s: %s\r\n", _tmp1->name, _tmp1->value);
           _tmp1 = _tmp1->next;
         }
@@ -100 +101 @@
 
 #include <windows.h>
-#include <fcgi_stdio.h>
+//#include <fcgi_stdio.h>
 #include <stdio.h>
 #include <conio.h>
@@ -1689 +1690 @@
 printProcessResponse (maps * m, map * request, int pid, service * serv,
                       const char *service, int status, maps * inputs,
-                      maps * outputs)
+                      maps * outputs, FCGX_Stream* out)
 {
   xmlNsPtr ns, ns_ows, ns_xlink, ns_xsi;
@@ -1990 +1991 @@
           map *errormap = createMap ("text", tmpMsg);
           addToMap (errormap, "code", "InternalError");
-          printExceptionReportResponse (m, errormap);
+          printExceptionReportResponse (m, errormap,out);
           freeMap (&errormap);
           free (errormap);
@@ -2005 +2006 @@
       fclose (output);
     }
-  printDocument (m, doc, pid);
+  printDocument (m, doc, pid,out);
 
   xmlCleanupParser ();
@@ -2013 +2014 @@
 
 void
-printDocument (maps * m, xmlDocPtr doc, int pid)
+printDocument (maps * m, xmlDocPtr doc, int pid,FCGX_Stream * out)
 {
   char *encoding = getEncoding (m);
   if (pid == getpid ())
     {
-      printHeaders (m);
-      printf ("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",
-              encoding);
-    }
-  fflush (stdout);
+      printHeaders (m,out);
+      FCGX_FPrintF(out,"Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
+      //printf ("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
+    }
+  //fflush (stdout);
   xmlChar *xmlbuff;
   int buffersize;
@@ -2030 +2031 @@
    */
   xmlDocDumpFormatMemoryEnc (doc, &xmlbuff, &buffersize, encoding, 1);
-  printf ("%s", xmlbuff);
-  fflush (stdout);
+  FCGX_FPrintF(out,(char *)xmlbuff);
+  FCGX_FFlush(out);
+  //printf ("%s", xmlbuff);
+  //fflush (stdout);
   /*
    * Free associated memory.
@@ -2462 +2465 @@
 
 void
-printExceptionReportResponse (maps * m, map * s)
+printExceptionReportResponse (maps * m, map * s,FCGX_Stream * out)
 {
   if (getMapFromMaps (m, "lenv", "hasPrinted") != NULL)
@@ -2504 +2507 @@
           if (getpid () == atoi (tmpSid->value))
             {
-              printHeaders (m);
-              printf
-                ("Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",
-                 encoding, exceptionCode);
+              printHeaders (m,out);
+              FCGX_FPrintF(out,"Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",encoding, exceptionCode);
+              //printf("Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",encoding, exceptionCode);
             }
         }
       else
         {
-          printHeaders (m);
-          printf ("Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",
-                  encoding, exceptionCode);
+          printHeaders (m,out);
+          FCGX_FPrintF(out,"Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",
+                            encoding, exceptionCode);
+          //printf ("Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",encoding, exceptionCode);
         }
     }
   else
-    {
-      printf ("Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",
-              encoding, exceptionCode);
+    { 
+      FCGX_FPrintF(out,"Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",encoding, exceptionCode);
+      //printf ("Content-Type: text/xml; charset=%s\r\nStatus: %s\r\n\r\n",encoding, exceptionCode);
     }
   n = createExceptionReportNode (m, s, 1);
   xmlDocSetRootElement (doc, n);
   xmlDocDumpFormatMemoryEnc (doc, &xmlbuff, &buffersize, encoding, 1);
-  printf ("%s", xmlbuff);
-  fflush (stdout);
+  //printf ("%s", xmlbuff);
+  FCGX_FPrintF(out,"%s",xmlbuff);
+FCGX_FFlush(out);
+  //fflush (stdout);
   xmlFreeDoc (doc);
   xmlFree (xmlbuff);
@@ -2595 +2600 @@
 void
 outputResponse (service * s, maps * request_inputs, maps * request_outputs,
-                map * request_inputs1, int cpid, maps * m, int res)
-{
+                map * request_inputs1, int cpid, maps * m, int res,FCGX_Stream *out,FCGX_Stream *err)
+{
+
+
 #ifdef DEBUG
   dumpMaps (request_inputs);
@@ -2655 +2662 @@
           addToMap (errormap, "code", "InternalError");
 
-          printExceptionReportResponse (m, errormap);
+          printExceptionReportResponse (m, errormap,out);
           freeMap (&errormap);
           free (errormap);
@@ -2670 +2677 @@
   if (asRaw == 0)
     {
+
+
 #ifdef DEBUG
       fprintf (stderr, "REQUEST_OUTPUTS FINAL\n");
@@ -2760 +2769 @@
                   map *errormap = createMap ("text", tmpMsg);
                   addToMap (errormap, "code", "InternalError");
-                  printExceptionReportResponse (m, errormap);
+
+                  printExceptionReportResponse (m, errormap,out);
                   freeMap (&errormap);
                   free (errormap);
@@ -2833 +2843 @@
       printProcessResponse (m, request_inputs1, cpid,
                             s, r_inputs->value, res,
-                            request_inputs, request_outputs);
+                            request_inputs, request_outputs,out);
     }
   else
     {
+
       if (res == SERVICE_FAILED)
         {
+
           map *errormap;
           map *lenv;
@@ -2871 +2883 @@
           free (tmp0);
           addToMap (errormap, "code", "InternalError");
-          printExceptionReportResponse (m, errormap);
+          printExceptionReportResponse (m, errormap,out);
           freeMap (&errormap);
           free (errormap);
@@ -2880 +2892 @@
        * requested one is not present in the resulting outputs maps.
        */
+
+
       maps *tmpI = NULL;
       map *tmpIV = getMap (request_inputs1, "RawDataOutput");
@@ -2905 +2919 @@
               map *errormap = createMap ("text", tmpMsg);
               addToMap (errormap, "code", "InvalidParameterValue");
-              printExceptionReportResponse (m, errormap);
+              printExceptionReportResponse (m, errormap,out);
               freeMap (&errormap);
               free (errormap);
@@ -2912 +2926 @@
           map *fname = getMapFromMaps (tmpI, tmpI->name, "filename");
           if (fname != NULL)
-            printf ("Content-Disposition: attachment; filename=\"%s\"\r\n",
-                    fname->value);
+            FCGX_FPrintF(out,"Content-Disposition: attachment; filename=\"%s\"\r\n",fname->value);
+            //printf ("Content-Disposition: attachment; filename=\"%s\"\r\n",fname->value);
           map *rs = getMapFromMaps (tmpI, tmpI->name, "size");
           if (rs != NULL)
-            printf ("Content-Length: %s\r\n", rs->value);
-          printHeaders (m);
+            FCGX_FPrintF(out,"Content-Length: %s\r\n", rs->value);
+            //printf ("Content-Length: %s\r\n", rs->value);
+          printHeaders (m,out);
           char mime[1024];
           map *mi = getMap (tmpI->content, "mimeType");
@@ -2937 +2952 @@
             sprintf (mime,
                      "Content-Type: text/plain; charset=utf-8\r\nStatus: 200 OK\r\n\r\n");
-          printf ("%s", mime);
+          FCGX_FPrintF(out,"%s", mime);
+
+          //printf ("%s", mime);
           if (rs != NULL)
-            fwrite (toto->value, 1, atoi (rs->value), stdout);
+            FCGX_PutStr(toto->value,atoi(rs->value),out);
+            //fwrite (toto->value, 1, atoi (rs->value), stdout);
           else
-            fwrite (toto->value, 1, strlen (toto->value), stdout);
+             FCGX_PutStr(toto->value,strlen (toto->value),out);
+            //fwrite (toto->value, 1, strlen (toto->value), stdout);
+
+          FCGX_FFlush(out);
 #ifdef DEBUG
           dumpMap (toto);
@@ -3400 +3421 @@
 printBoundingBoxDocument (maps * m, maps * boundingbox, FILE * file)
 {
-  if (file == NULL)
-    rewind (stdout);
+  //if (file == NULL)
+   // rewind (stdout);
   xmlNodePtr n;
   xmlDocPtr doc;
@@ -3421 +3442 @@
              encoding);
         }
-      fflush (stdout);
+      //fflush (stdout);
     }
 
@@ -3583 +3604 @@
                       return errorException (*m,
                                              _("Unable to allocate memory."),
-                                             "InternalError", NULL);
+                                             "InternalError", NULL,NULL);
                     }
                   size_t dwRead;
@@ -3603 +3624 @@
                       return errorException (*m,
                                              _("Unable to allocate memory."),
-                                             "InternalError", NULL);
+                                             "InternalError", NULL,NULL);
                     }
                   memcpy (tmpMap->value, fcontent,
@@ -3667 +3688 @@
     {
       return errorException (*m, _("Unable to download the file."),
-                             "InternalError", NULL);
+                             "InternalError", NULL,NULL);
     }
   if (mimeType != NULL)
@@ -3680 +3701 @@
   if (tmpMap->value == NULL)
     return errorException (*m, _("Unable to allocate memory."),
-                           "InternalError", NULL);
+                           "InternalError", NULL,NULL);
   memcpy (tmpMap->value, fcontent, (fsize + 1) * sizeof (char));
 
@@ -3698 +3719 @@
 int
 errorException (maps * m, const char *message, const char *errorcode,
-                const char *locator)
+                const char *locator,FCGX_Stream * out)
 {
   map *errormap = createMap ("text", message);
@@ -3706 +3727 @@
   else
     addToMap (errormap, "locator", "NULL");
-  printExceptionReportResponse (m, errormap);
+  printExceptionReportResponse (m, errormap,out);
   freeMap (&errormap);
   free (errormap);

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/service_internal.h

@@ -39 +39 @@
 #include <sys/types.h>
 //#include "cgic.h"
+#include <fcgiapp.h>
 #ifndef WIN32
 #include <sys/ipc.h>
@@ -119 +120 @@
   void zooXmlCleanupDocs ();
   void addPrefix (maps * conf, map * level, service * serv);
-  void printExceptionReportResponse (maps *, map *);
+  void printExceptionReportResponse (maps *, map *,FCGX_Stream * out);
   xmlNodePtr createExceptionReportNode (maps *, map *, int);
   void printProcessResponse (maps *, map *, int, service *, const char *, int,
-                             maps *, maps *);
+                             maps *, maps *,FCGX_Stream *);
   xmlNodePtr printGetCapabilitiesHeader (xmlDocPtr, const char *, maps *);
   void printGetCapabilitiesForProcess (maps *, xmlNodePtr, service *);
@@ -129 +130 @@
   void printFullDescription (int, elements *, const char *, xmlNsPtr,
                              xmlNodePtr);
-  void printDocument (maps *, xmlDocPtr, int);
+  void printDocument (maps *, xmlDocPtr, int, FCGX_Stream *);
   void printDescription (xmlNodePtr, xmlNsPtr, const char *, map *);
   void printIOType (xmlDocPtr, xmlNodePtr, xmlNsPtr, xmlNsPtr, xmlNsPtr,
@@ -139 +140 @@
                                 elements *, maps *, const char *);
 
-  void outputResponse (service *, maps *, maps *, map *, int, maps *, int);
+  void outputResponse (service *, maps *, maps *, map *, int, maps *, int,FCGX_Stream *,FCGX_Stream *);
 
   char *base64 (const char *, int);
@@ -147 +148 @@
   char *addDefaultValues (maps **, elements *, maps *, int);
 
-  int errorException (maps *, const char *, const char *, const char *);
+  int errorException (maps *, const char *, const char *, const char *,FCGX_Stream *);
 
   int checkForSoapEnvelope (xmlDocPtr);

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/service_internal_js.c

@@ -216 +216 @@
       map *err = createMap ("text", tmp1);
       addToMap (err, "code", "NoApplicableCode");
-      printExceptionReportResponse (mc, err);
+      //printExceptionReportResponse (mc, err);
       freeMap (&err);
       free (err);
@@ -268 +268 @@
       map *err = createMap ("text", tmp1);
       addToMap (err, "code", "NoApplicableCode");
-      printExceptionReportResponse (*main_conf, err);
+      //printExceptionReportResponse (*main_conf, err);
       freeMap (&err);
       free (err);

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/service_internal_python.c

@@ -127 +127 @@
 int
 zoo_python_support (maps ** main_conf, map * request, service * s,
-                    maps ** real_inputs, maps ** real_outputs)
+                    maps ** real_inputs, maps ** real_outputs,FCGX_Stream * err)
 {
   char *pythonpath;
@@ -222 +222 @@
                             "Unable to parse serviceProvider please check your zcfg file.");
       addToMap (err, "code", "NoApplicableCode");
-      printExceptionReportResponse (m, err);
+      //printExceptionReportResponse (m, err);
       exit (-1);
     }
@@ -299 +299 @@
               map *err = createMap ("text", pbt);
               addToMap (err, "code", "NoApplicableCode");
-              printExceptionReportResponse (m, err);
+              //printExceptionReportResponse (m, err);
               res = -1;
             }
@@ -309 +309 @@
                    s->name, tmp->value);
           map *tmps = createMap ("text", tmpS);
-          printExceptionReportResponse (m, tmps);
+          //printExceptionReportResponse (m, tmps);
           res = -1;
         }
@@ -318 +318 @@
       sprintf (tmpS, "Python module %s cannot be loaded.\n", tmp->value);
       map *tmps = createMap ("text", tmpS);
-      printExceptionReportResponse (m, tmps);
+      //printExceptionReportResponse (m, tmps);
       if (PyErr_Occurred ())
         PyErr_Print ();

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/service_internal_python.h

@@ -43 +43 @@
 map* mapFromPyDict(PyDictObject* t);
 
-int zoo_python_support(maps**,map*,service*,maps**,maps**);
+int zoo_python_support(maps**,map*,service*,maps**,maps**,FCGX_Stream *);
 
 PyObject* PythonTranslate(PyObject*, PyObject*);

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/service_loader.c

@@ -158 +158 @@
     else{
       map* tmps=createMap("text","ERROR you provided more inputs than requested.");
-      printExceptionReportResponse(m,tmps);
+      printExceptionReportResponse(m,tmps,out);
       //printf("ERROR you provided more inputs than requested.");
       return -1;

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/service_zcfg.c

@@ -6 +6 @@
 #include "service.h"
 #include "service_internal.h"
+extern "C" {
 #include <libxml/tree.h>
 #include <libxml/xmlmemory.h>
@@ -11 +12 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
-
+#include "service.h"
+#include "service_internal.h"
+}
 
 
@@ -18 +21 @@
 
 static GList *serviceCfgList;
+
+//static maps * main_conf = NULL;
+
+
+/*int
+load_main_conf(char * path){
+    if (main_conf != NULL)
+        freeMaps(&main_conf);
+    main_conf = (maps *) malloc (MAP_SIZE);
+    return conf_read (path, main_conf);
+}
+
+maps *  get_main_conf(){
+    return  dupMaps(&main_conf);
+}
+
+*/
 
 static int
@@ -118 +138 @@
       serviceCfgList = g_list_append (serviceCfgList, s1);
     }
-  freeMap(&m);
+  freeMaps(&m);
 }
 

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/service_zcfg.h

@@ -4 +4 @@
 
 #include "service.h"
+#include "service_internal.h"
 
-
+maps *  get_main_conf();
+int load_main_conf(char *path);
 void init_services_conf (char *rootDir);
 service *search_service (char *identifier);

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/ulinet.h

@@ -26 +26 @@
 #define _ULINET_H
 
-#include "fcgi_stdio.h"
+//#include "fcgi_stdio.h"
 #include "service.h"
 #include <stdlib.h>

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/zoo_loader.c

@@ -30 +30 @@
  */
 #ifndef WIN32
+/*
 #include "fcgio.h"
 #include "fcgi_config.h"
 #include "fcgi_stdio.h"
-#endif
+*/
+#include <unistd.h>
+#include <fcgiapp.h>
+#endif
+#include <sys/wait.h>
+#include <pthread.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -56 +62 @@
 #include <glib.h>
 #include <sys/stat.h>
+}
+
 #include "service_zcfg.h"
-}
-
-#include "service_internal.h"
+//#include "service_internal.h"
 
 xmlXPathObjectPtr extractFromDoc (xmlDocPtr, const char *);
-int runRequest (map **);
+int runRequest (map **,struct cgi_env **,FCGX_Request *);
 
 using namespace std;
@@ -74 +80 @@
 
 
-int
-main (int argc, char *argv[])
+static void PrintEnv(FCGX_Stream *out, char *label, char **envp)
 {
-  maps *m;
-  m = (maps *) malloc (MAP_SIZE);
-  conf_read ("main.cfg", m);
-  char ntmp[1024];
-#ifndef WIN32
-  getcwd (ntmp, 1024);
-#else
-  _getcwd (ntmp, 1024);
-#endif
-  char *rootDir = "/var/www/zoo-wps/cgi-bin";
-  init_services_conf (rootDir);
-
-
-  while (FCGI_Accept () >= 0)
-    {
-      cgiMain_init (argc, argv);
-/**
-   * We'll use cgiOut as the default output (stdout) to produce plain text 
-   * response.
-   */
-      dup2 (fileno (cgiOut), fileno (stdout));
-
-#ifdef DEBUG
-      fprintf (cgiOut,
-               "Content-Type: text/plain; charset=utf-8\r\nStatus: 200 OK\r\n\r\n");
-      fprintf (cgiOut, "Welcome on ZOO verbose debuging mode \r\n\r\n");
-      fflush (cgiOut);
-      fprintf (stderr, "Addr:%s\n", cgiRemoteAddr);
-      fprintf (stderr, "RequestMethod: (%s) %d %d\n", cgiRequestMethod,
-               strncasecmp (cgiRequestMethod, "post", 4),
-               strncmp (cgiContentType, "text/xml", 8) == 0
-               || strncasecmp (cgiRequestMethod, "post", 4) == 0);
-      fprintf (stderr, "Request: %s\n", cgiQueryString);
-      fprintf (stderr, "ContentType: %s\n", cgiContentType);
-      fprintf (stderr, "ContentLength: %d\n", cgiContentLength);
-      fflush (stderr);
-#endif
-
-
+    FCGX_FPrintF(out, "%s:<br>\n<pre>\n", label);
+    for( ; *envp != NULL; envp++) {
+        FCGX_FPrintF(out, "%s\n", *envp);
+    }
+    FCGX_FPrintF(out, "</pre><p>\n");
+}
+
+#define PATH_SOCKET "/tmp/zoo.sock"
+#define THREAD_COUNT 50
+static int counts[THREAD_COUNT];
+
+
+int process(FCGX_Request *request){
+
+      int pid = getpid();
+      struct cgi_env *cgi;
+      //PrintEnv(request.err, "Request environment", request.envp); 
+      cgi = (struct cgi_env*)malloc(sizeof(struct cgi_env));
+      cgiMain_init (NULL, NULL,&cgi,request);
       char *strQuery = NULL;
-      if (cgiQueryString != NULL)
-        strQuery = zStrdup (cgiQueryString);
+      if (cgi->cgiQueryString != NULL)
+        strQuery = zStrdup (cgi->cgiQueryString);
       map *tmpMap = NULL;
 
-      if (strncmp (cgiContentType, "text/xml", 8) == 0 ||
-          strncasecmp (cgiRequestMethod, "post", 4) == 0)
+      if (strncmp (cgi->cgiContentType, "text/xml", 8) == 0 ||
+          strncasecmp (cgi->cgiRequestMethod, "post", 4) == 0)
         {
-          if (cgiContentLength == 0)
-            {
-              char *buffer = new char[2];
-              char *res = NULL;
-              int r = 0;
-              while ((r = fread (buffer, sizeof (char), 1, cgiIn)))
-                {
-                  buffer[1] = 0;
-                  cgiContentLength += r;
-                  if (res == NULL)
-                    {
-                      res = (char *) malloc (2 * sizeof (char));
-                      sprintf (res, "%s", buffer);
+          if (cgi->cgiContentLength == 0)
+            {
+              char *post_data = NULL;
+              int i = 0;
+              int ch = FCGX_GetChar(request->in);
+              while (ch != -1){
+                {
+                  i++;
+                  if (post_data == NULL)
+                    {
+                    post_data=(char*)malloc(sizeof(char));
+                    post_data[i-1] = (char) ch;
                     }
                   else
                     {
-                      char *tmp = zStrdup (res);
-                      res =
-                        (char *) realloc (res,
-                                          (strlen (tmp) + 2) * sizeof (char));
-                      sprintf (res, "%s%s", tmp, buffer);
-                      free (tmp);
-                    }
-                }
-              delete[]buffer;
-              if (res == NULL && (strQuery == NULL || strlen (strQuery) == 0))
+                    post_data=(char*)realloc(post_data,i*sizeof(char));
+                    post_data[i-1] = (char) ch;
+                    }
+                  ch = FCGX_GetChar(request->in);
+                  if (ch == -1 ){
+                    post_data=(char*)realloc(post_data,(i + 1)*sizeof(char));
+                    post_data[i] = '\0';
+                    }
+                }
+                cgi->cgiContentLength = i;
+              if (post_data == NULL && (strQuery == NULL || strlen (strQuery) == 0))
                 {
                   return errorException (NULL,
                                          "ZOO-Kernel failed to process your request cause the request was emtpty.",
-                                         "InternalError", NULL);
+                                         "InternalError", NULL,request->out);
                 }
               else
                 {
                   if (strQuery == NULL || strlen (strQuery) == 0)
-                    tmpMap = createMap ("request", res);
-                }
-              if (res != NULL)
-                free (res);
+                    tmpMap = createMap ("request", post_data);
+                }
+              if (post_data != NULL)
+                free (post_data);
+                }
             }
           else
             {
-              char *buffer = new char[cgiContentLength + 1];
-              if (fread (buffer, sizeof (char), cgiContentLength, cgiIn) > 0)
-                {
-                  buffer[cgiContentLength] = 0;
-                  tmpMap = createMap ("request", buffer);
+              char *post_data = new char[cgi->cgiContentLength + 1];
+              int r = FCGX_GetStr(post_data,cgi->cgiContentLength,request->in);
+              if ( r > 0)
+                {
+                  post_data[r] = '\0';
+                  cgi->cgiContentLength = r;
+                  tmpMap = createMap ("request", post_data);
                 }
               else
                 {
-                  buffer[0] = 0;
+                  post_data[0] = '\0';
                   char **array, **arrayStep;
-                  if (cgiFormEntries (&array) != cgiFormSuccess)
+                  if (cgiFormEntries (&array,&cgi) != cgiFormSuccess)
                     {
                       return 1;
@@ -182 +170 @@
                   while (*arrayStep)
                     {
-                      char *ivalue = new char[cgiContentLength];
+                      char *ivalue = new char[cgi->cgiContentLength];
                       cgiFormStringNoNewlines (*arrayStep, ivalue,
-                                               cgiContentLength);
+                                               cgi->cgiContentLength,&cgi);
                       char *tmpValueFinal =
                         (char *)
@@ -190 +178 @@
                                  1) * sizeof (char));
                       sprintf (tmpValueFinal, "%s=%s", *arrayStep, ivalue);
-                      if (strlen (buffer) == 0)
+                      if (strlen (post_data) == 0)
                         {
-                          sprintf (buffer, "%s", tmpValueFinal);
+                          sprintf (post_data, "%s", tmpValueFinal);
                         }
                       else
                         {
-                          char *tmp = zStrdup (buffer);
-                          sprintf (buffer, "%s&%s", tmp, tmpValueFinal);
+                          char *tmp = zStrdup (post_data);
+                          sprintf (post_data, "%s&%s", tmp, tmpValueFinal);
                           free (tmp);
                         }
@@ -209 +197 @@
                     }
                   if (tmpMap != NULL)
-                    addToMap (tmpMap, "request", buffer);
+                    addToMap (tmpMap, "request", post_data);
                   else
-                    tmpMap = createMap ("request", buffer);
-                }
-              delete[]buffer;
+                    tmpMap = createMap ("request", post_data);
+                }
+              delete[]post_data;
             }
         }
@@ -221 +209 @@
           dumpMap (tmpMap);
 #endif
-          char **array, **arrayStep;
-          if (cgiFormEntries (&array) != cgiFormSuccess)
+       
+       char **array, **arrayStep;
+          if (cgiFormEntries (&array,&cgi) != cgiFormSuccess)
             {
               return 1;
@@ -229 +218 @@
           while (*arrayStep)
             {
-              char *value = new char[cgiContentLength];
-              cgiFormStringNoNewlines (*arrayStep, value, cgiContentLength);
+              char *value = new char[cgi->cgiContentLength];
+              cgiFormStringNoNewlines (*arrayStep, value, cgi->cgiContentLength,&cgi);
 #ifdef DEBUG
               fprintf (stderr, "(( \n %s \n %s \n ))", *arrayStep, value);
@@ -265 +254 @@
    * one.
    */
-      if (strncasecmp (cgiRequestMethod, "post", 4) == 0 ||
+      if (strncasecmp (cgi->cgiRequestMethod, "post", 4) == 0 ||
           (count (tmpMap) == 1 && strncmp (tmpMap->value, "<", 1) == 0)
 #ifdef WIN32
@@ -280 +269 @@
               addToMap (tmpMap, "xrequest", t1->value);
               xmlInitParser ();
-              xmlDocPtr doc = xmlParseMemory (t1->value, cgiContentLength);
+              xmlDocPtr doc = xmlParseMemory (t1->value, cgi->cgiContentLength);
               {
                 xmlXPathObjectPtr reqptr = extractFromDoc (doc,
@@ -384 +373 @@
                           char *identifiers = NULL;
                           identifiers =
-                            (char *) calloc (cgiContentLength, sizeof (char));
+                            (char *) calloc (cgi->cgiContentLength, sizeof (char));
                           identifiers[0] = 0;
                           for (int k = 0; k < id->nodeNr; k++)
@@ -427 +416 @@
 
           char *token, *saveptr;
-          token = strtok_r (cgiQueryString, "&", &saveptr);
+          token = strtok_r (cgi->cgiQueryString, "&", &saveptr);
           while (token != NULL)
             {
@@ -452 +441 @@
         }
 
-      if (strncasecmp (cgiContentType, "multipart/form-data", 19) == 0)
+      if (strncasecmp (cgi->cgiContentType, "multipart/form-data", 19) == 0)
         {
           map *tmp = getMap (tmpMap, "dataInputs");
@@ -465 +454 @@
         free (strQuery);
 
-      runRequest (&tmpMap);
+      runRequest (&tmpMap,&cgi,request);
 
   /** 
@@ -475 +464 @@
           free (tmpMap);
         }
-      cgiFreeResources ();
+        // a verifier fait planter
+      cgiFreeResources (&cgi);
+
+      FCGX_Finish_r(request);
+      return 0;
+}
+
+
+
+int
+main (int argc, char *argv[])
+{
+  maps *main_config;
+  int max_requests, start_servers;
+  start_servers = 10;
+  max_requests= 100;
+  main_config = (maps *) malloc (MAP_SIZE);
+  conf_read ("main.cfg", main_config);
+  char ntmp[1024];
+#ifndef WIN32
+  getcwd (ntmp, 1024);
+#else
+  _getcwd (ntmp, 1024);
+#endif
+  char *rootDir = "/var/www/zoo-wps/cgi-bin";
+  int fork_status = fork();
+  if (fork_status == 0){
+    //child
+    int forker_pid = getpid();
+    init_services_conf (rootDir);
+    int sock = FCGX_OpenSocket(PATH_SOCKET, 1000);
+    FCGX_Init();
+    FCGX_Request request;
+    FCGX_InitRequest(&request, sock, 0);
+    int i;
+    int count_request = 0;
+    for (i = 0; i< start_servers; i++){
+        fork_status = fork();
+        if (fork_status == 0){
+            fprintf(stderr,"child %d \n",i);
+            fflush(stderr);
+            break;
+        }
     }
-  FCGI_Finish ();
+    while(1){
+        if (forker_pid != getpid()){
+            while(FCGX_Accept_r(&request) == 0){
+                process(&request);
+                count_request ++;
+                if (count_request >= max_requests){
+                    fprintf(stderr,"Max request stop process\n");
+                    fflush(stderr);
+                    exit(0);
+                }
+            }
+        }
+        else {
+            wait(0);
+            fprintf(stderr,"new child\n");
+            fflush(stderr);
+            fork();
+        }
+    }
+  }
+  else {
+  
+  while(1);
+
+
+
+  }
+  
   return 0;
-
 }
+ 

branches/PublicaMundi_David-devel/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -37 +37 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
-#include "service_zcfg.h"
 #include <libgen.h>
 }
 #include "ulinet.h"
+#include "service_zcfg.h"
 #include <libintl.h>
 #include <locale.h>
 #include <string.h>
-#include "service.h"
-#include "service_internal.h"
+//#include "service.h"
+//#include "service_internal.h"
 #ifdef USE_PYTHON
 #include "service_internal_python.h"
@@ -172 +172 @@
                        ("You set maximum occurences for <%s> as %i but you tried to use it more than the limit you set. Please correct your ZCFG file or your request."),
                        mi->name, atoi (testMap->value));
-              errorException (m, emsg, "InternalError", NULL);
+              //errorException (m, emsg, "InternalError", NULL,stderr);
               return -1;
             }
@@ -193 +193 @@
                            ("ZOO-Kernel was unable to load your data for %s position %s."),
                            mi->name, tmpMap->value);
-                  errorException (m, emsg, "InternalError", NULL);
+                  //errorException (m, emsg, "InternalError", NULL,stderr);
                   return -1;
                 }
@@ -204 +204 @@
                        ("You set maximum occurences for <%s> to one but you tried to use it more than once. Please correct your ZCFG file or your request."),
                        mi->name);
-              errorException (m, emsg, "InternalError", NULL);
+              //errorException (m, emsg, "InternalError", NULL,request->out);
               return -1;
             }
@@ -390 +390 @@
            ("ZOO Kernel failed to process your request receiving signal %d = %s"),
            sig, ssig);
-  errorException (NULL, tmp, "InternalError", NULL);
+  //errorException (NULL, tmp, "InternalError", NULL,request->out);
 #ifdef DEBUG
   fprintf (stderr, "Not this time!\n");
@@ -399 +399 @@
 void
 loadServiceAndRun (maps ** myMap, service * s1, map * request_inputs,
-                   maps ** inputs, maps ** ioutputs, int *eres)
+                   maps ** inputs, maps ** ioutputs, int *eres,FCGX_Stream *out, FCGX_Stream *err)
 {
-  char tmps1[1024];
+ 
+
+ char tmps1[1024];
   char ntmp[1024];
   maps *m = *myMap;
@@ -523 +525 @@
                 (execute_t) GetProcAddress (so, s1->name);
 #else
+
               execute_t execute = (execute_t) dlsym (so, s1->name);
 #endif
@@ -539 +542 @@
                            ("Error occured while running the %s function: %s"),
                            s1->name, errstr);
-                  errorException (m, tmpMsg, "InternalError", NULL);
+                  errorException (m, tmpMsg, "InternalError", NULL,out);
                   free (tmpMsg);
 #ifdef DEBUG
                   fprintf (stderr, "Function %s error %s\n",
                            s1->name, errstr);
-#endif
+#endif              
+
                   *eres = -1;
                   return;
                 }
+
 #ifdef DEBUG
 #ifdef WIN32
@@ -568 +573 @@
               fflush (stderr);
 #endif
+
+
+
             }
 #ifdef WIN32
@@ -589 +597 @@
           sprintf (tmps, _("C Library can't be loaded %s"), errstr);
           map *tmps1 = createMap ("text", tmps);
-          printExceptionReportResponse (m, tmps1);
+          printExceptionReportResponse (m, tmps1,out);
           *eres = -1;
           freeMap (&tmps1);
@@ -602 +610 @@
         zoo_python_support (&m, request_inputs, s1,
                             &request_input_real_format,
-                            &request_output_real_format);
+                            &request_output_real_format,err);
+
     }
   else
@@ -670 +679 @@
                r_inputs->value);
       map *tmps = createMap ("text", tmpv);
-      printExceptionReportResponse (m, tmps);
+      printExceptionReportResponse (m, tmps,out);
       *eres = -1;
     }
@@ -794 +803 @@
 
 int
-runRequest (map ** inputs)
+runRequest (map ** inputs,struct cgi_env ** c,FCGX_Request *request)
 {
 
+
+struct cgi_env *cgi = *c;
 #ifndef USE_GDB
   (void) signal (SIGSEGV, sig_handler);
@@ -813 +824 @@
    * Parsing service specfic configuration file
    */
+  
   m = (maps *) malloc (MAPS_SIZE);
   if (m == NULL)
     {
       return errorException (m, _("Unable to allocate memory."),
-                             "InternalError", NULL);
-    }
+                             "InternalError", NULL,request->out);
+    }
+   
   char ntmp[1024];
 #ifndef WIN32
@@ -827 +840 @@
   r_inputs = getMapOrFill (&request_inputs, "metapath", "");
 
-
-  char conf_file[10240];
-  snprintf (conf_file, 10240, "%s/%s/main.cfg", ntmp, r_inputs->value);
+  //m = get_main_conf();
+
+ char conf_file[10240];
+ snprintf (conf_file, 10240, "%s/%s/main.cfg", ntmp, r_inputs->value);
+  
   if (conf_read (conf_file, m) == 2)
     {
       errorException (NULL, _("Unable to load the main.cfg file."),
-                      "InternalError", NULL);
+                      "InternalError", NULL,request->out);
       free (m);
       return 1;
     }
+
+
 #ifdef DEBUG
   fprintf (stderr, "***** BEGIN MAPS\n");
@@ -844 +861 @@
 
   map *getPath = getMapFromMaps (m, "main", "gettextPath");
+
+
+
+
   if (getPath != NULL)
     {
@@ -854 +875 @@
       bindtextdomain ("zoo-services", "/usr/share/locale/");
     }
-
 
   /**
@@ -878 +898 @@
                    ("The value %s is not supported for the <language> parameter"),
                    r_inputs->value);
-          errorException (m, tmp, "InvalidParameterValue", "language");
+          errorException (m, tmp, "InvalidParameterValue", "language",request->out);
           freeMaps (&m);
           free (m);
@@ -929 +949 @@
     setMapInMaps (m, "main", "isSoap", "false");
 
-  if (strlen (cgiServerName) > 0)
+  if (strlen (cgi->cgiServerName) > 0)
     {
       char tmpUrl[1024];
-      if (strncmp (cgiServerPort, "80", 2) == 0)
-        {
-          sprintf (tmpUrl, "http://%s%s", cgiServerName, cgiScriptName);
+      if (strncmp (cgi->cgiServerPort, "80", 2) == 0)
+        {
+          sprintf (tmpUrl, "http://%s%s", cgi->cgiServerName, cgi->cgiScriptName);
         }
       else
         {
-          sprintf (tmpUrl, "http://%s:%s%s", cgiServerName,
-                   cgiServerPort, cgiScriptName);
+          sprintf (tmpUrl, "http://%s:%s%s", cgi->cgiServerName,
+                   cgi->cgiServerPort, cgi->cgiScriptName);
         }
 #ifdef DEBUG
@@ -954 +974 @@
     {
       errorException (m, _("Parameter <request> was not specified"),
-                      "MissingParameterValue", "request");
+                      "MissingParameterValue", "request",request->out);
       if (count (request_inputs) == 1)
         {
@@ -974 +994 @@
                           _
                           ("Unenderstood <request> value. Please check that it was set to GetCapabilities, DescribeProcess or Execute."),
-                          "OperationNotSupported", r_inputs->value);
+                          "OperationNotSupported", r_inputs->value,request->out);
           freeMaps (&m);
           free (m);
@@ -986 +1006 @@
     {
       errorException (m, _("Parameter <service> was not specified"),
-                      "MissingParameterValue", "service");
+                      "MissingParameterValue", "service",request->out);
       freeMaps (&m);
       free (m);
@@ -999 +1019 @@
                           _
                           ("Unenderstood <service> value, WPS is the only acceptable value."),
-                          "InvalidParameterValue", "service");
+                          "InvalidParameterValue", "service",request->out);
           freeMaps (&m);
           free (m);
@@ -1012 +1032 @@
         {
           errorException (m, _("Parameter <version> was not specified"),
-                          "MissingParameterValue", "version");
+                          "MissingParameterValue", "version",request->out);
           freeMaps (&m);
           free (m);
@@ -1025 +1045 @@
                               _
                               ("Unenderstood <version> value, 1.0.0 is the only acceptable value."),
-                              "InvalidParameterValue", "service");
+                              "InvalidParameterValue", "service",request->out);
               freeMaps (&m);
               free (m);
@@ -1043 +1063 @@
                               _
                               ("Unenderstood <AcceptVersions> value, 1.0.0 is the only acceptable value."),
-                              "VersionNegotiationFailed", NULL);
+                              "VersionNegotiationFailed", NULL,request->out);
               freeMaps (&m);
               free (m);
@@ -1080 +1100 @@
   else
     snprintf (conf_dir, 1024, "%s", ntmp);
+
+
+
 
   if (strncasecmp (REQUEST, "GetCapabilities", 15) == 0)
@@ -1098 +1121 @@
      * has been found in the zcfg and then printed on stdout
      */
-      int saved_stdout = dup (fileno (stdout));
-      dup2 (fileno (stderr), fileno (stdout));
-
-        /**
-      if (int res =
-          recursReaddirF (m, n, conf_dir, NULL, saved_stdout, 0,
-                          printGetCapabilitiesForProcess) < 0)
-        {
-          freeMaps (&m);
-          free (m);
-          free (REQUEST);
-          free (SERVICE_URL);
-          fflush (stdout);
-          return res;
-        }
-      **/
       XML_CapabilitiesAllProcess (m, n);
-      dup2 (saved_stdout, fileno (stdout));
-      printDocument (m, doc, getpid ());
+      printDocument (m, doc, getpid (),request->out);
       freeMaps (&m);
       free (m);
       free (REQUEST);
       free (SERVICE_URL);
-      fflush (stdout);
       return 0;
     }
@@ -1132 +1137 @@
           errorException (m,
                           _("Mandatory <identifier> was not specified"),
-                          "MissingParameterValue", "identifier");
+                          "MissingParameterValue", "identifier",request->out);
           freeMaps (&m);
           free (m);
@@ -1146 +1151 @@
           errorException (m,
                           _("The specified path path doesn't exist."),
-                          "InvalidParameterValue", conf_dir);
+                          "InvalidParameterValue", conf_dir,request->out);
           freeMaps (&m);
           free (m);
@@ -1173 +1178 @@
 
 
-          int saved_stdout = dup (fileno (stdout));
-          dup2 (fileno (stderr), fileno (stdout));
+          //int saved_stdout = dup (fileno (stdout));
+          //dup2 (fileno (stderr), fileno (stdout));
           XML_Describe_Process (m, n, orig);
           closedir (dirp);
-          fflush (stdout);
-          dup2 (saved_stdout, fileno (stdout));
+          //fflush (stdout);
+          //dup2 (saved_stdout, fileno (stdout));
           free (orig);
-          printDocument (m, doc, getpid ());
+          printDocument (m, doc, getpid (),request->out);
           freeMaps (&m);
           free (m);
           free (REQUEST);
           free (SERVICE_URL);
-          fflush (stdout);
+          //fflush (stdout);
           return 0;
 
@@ -1191 +1196 @@
       else if (strncasecmp (REQUEST, "Execute", strlen (REQUEST)) != 0)
         {
+          
           errorException (m,
                           _
                           ("Unenderstood <request> value. Please check that it was set to GetCapabilities, DescribeProcess or Execute."),
-                          "InvalidParameterValue", "request");
+                          "InvalidParameterValue", "request",request->out);
 #ifdef DEBUG
           fprintf (stderr, "No request found %s", REQUEST);
@@ -1203 +1209 @@
           free (REQUEST);
           free (SERVICE_URL);
-          fflush (stdout);
+          //fflush (stdout);
           return 0;
         }
@@ -1250 +1256 @@
   fflush (stdout);
   **/
-  int saved_stdout = dup (fileno (stdout));
-  dup2 (saved_stdout, fileno (stdout));
+  //int saved_stdout = dup (fileno (stdout));
+  //dup2 (saved_stdout, fileno (stdout));
   s1 = search_service (r_inputs->value);
   if (s1 == NULL)
@@ -1260 +1266 @@
                ("The value for <identifier> seems to be wrong (%s). Please, ensure that the process exist using the GetCapabilities request."),
                r_inputs->value);
-      errorException (m, tmpMsg, "InvalidParameterValue", "identifier");
+      errorException (m, tmpMsg, "InvalidParameterValue", "identifier",request->out);
       free (tmpMsg);
       //free (s1);
@@ -1269 +1275 @@
       return 0;
     }
-  close (saved_stdout);
+  //close (saved_stdout);
 
 #ifdef DEBUG
@@ -1339 +1345 @@
               return errorException (m,
                                      _("Unable to allocate memory"),
-                                     "InternalError", NULL);
+                                     "InternalError", NULL,request->out);
             }
           i = 0;
@@ -1356 +1362 @@
                                          _
                                          ("Unable to allocate memory"),
-                                         "InternalError", NULL);
+                                         "InternalError", NULL,request->out);
                 }
               snprintf (outputs_as_text[i], strlen (pToken) + 1, "%s",
@@ -1382 +1388 @@
                                                      _
                                                      ("Unable to allocate memory."),
-                                                     "InternalError", NULL);
+                                                     "InternalError", NULL,request->out);
                             }
                           tmp_output->name = zStrdup (tmpc);
@@ -1447 +1453 @@
           errorException (m,
                           _("Parameter <DataInputs> was not specified"),
-                          "MissingParameterValue", "DataInputs");
+                          "MissingParameterValue", "DataInputs",request->out);
           freeMaps (&m);
           free (m);
@@ -1479 +1485 @@
         {
           return errorException (m, _("Unable to allocate memory."),
-                                 "InternalError", NULL);
+                                 "InternalError", NULL,request->out);
         }
       i = 0;
@@ -1498 +1504 @@
               return errorException (m,
                                      _("Unable to allocate memory."),
-                                     "InternalError", NULL);
+                                     "InternalError", NULL,request->out);
             }
           pToken = strtok (NULL, ";");
@@ -1540 +1546 @@
                                              _
                                              ("Unable to allocate memory."),
-                                             "InternalError", NULL);
+                                             "InternalError", NULL,request->out);
                     }
                   tmpmaps->name = zStrdup (tmpn);
@@ -1611 +1617 @@
                                    ("Unable to find a valid protocol to download the remote file %s"),
                                    tmpv1 + 1);
-                          errorException (m, emsg, "InternalError", NULL);
+                          errorException (m, emsg, "InternalError", NULL,request->out);
                           freeMaps (&m);
                           free (m);
@@ -1702 +1708 @@
       fflush (stderr);
 #endif
-      xmlDocPtr doc = xmlParseMemory (postRequest->value, cgiContentLength);
+      xmlDocPtr doc = xmlParseMemory (postRequest->value, cgi->cgiContentLength);
 #ifdef DEBUG
       fprintf (stderr, "AFTER\n");
@@ -1753 +1759 @@
                                                      _
                                                      ("Unable to allocate memory."),
-                                                     "InternalError", NULL);
+                                                     "InternalError", NULL,request->out);
                             }
                           tmpmaps->name = zStrdup ((char *) val);
@@ -1782 +1788 @@
                                                      _
                                                      ("Unable to allocate memory."),
-                                                     "InternalError", NULL);
+                                                     "InternalError", NULL,request->out);
                             }
                           tmpmaps->name = zStrdup ("missingIndentifier");
@@ -1926 +1932 @@
                                              _
                                              ("Unable to allocate memory."),
-                                             "InternalError", NULL);
+                                             "InternalError", NULL,request->out);
                                         }
                                       snprintf (has,
@@ -1965 +1971 @@
                                     (char *)
                                     malloc
-                                    (cgiContentLength + 1 * sizeof (char));
-                                  memset (tmp, 0, cgiContentLength);
+                                    (cgi->cgiContentLength + 1 * sizeof (char));
+                                  memset (tmp, 0, cgi->cgiContentLength);
                                   xmlNodePtr cur4 = cur3->children;
                                   while (cur4 != NULL)
@@ -2058 +2064 @@
                                          _
                                          ("Unable to allocate memory."),
-                                         "InternalError", NULL);
+                                         "InternalError", NULL,request->out);
                                     }
                                   size_t bRead;
@@ -2380 +2386 @@
                                          _
                                          ("Unable to allocate memory."),
-                                         "InternalError", NULL);
+                                         "InternalError", NULL,request->out);
                 }
               tmpmaps->name = zStrdup ("unknownIdentifier");
@@ -2464 +2470 @@
                                                _
                                                ("Unable to allocate memory."),
-                                               "InternalError", NULL);
+                                               "InternalError", NULL,request->out);
                       }
                     tmpmaps->name = zStrdup ("unknownIdentifier");
@@ -2520 +2526 @@
                                                        _
                                                        ("Unable to allocate memory."),
-                                                       "InternalError", NULL);
+                                                       "InternalError", NULL,request->out);
                               }
                             tmpmaps->name = zStrdup ((char *) val);
@@ -2580 +2586 @@
                                                        _
                                                        ("Unable to allocate memory."),
-                                                       "InternalError", NULL);
+                                                       "InternalError", NULL,request->out);
                               }
                             tmpmaps->name = zStrdup ("missingIndetifier");
@@ -2659 +2665 @@
                                            _
                                            ("Unable to allocate memory."),
-                                           "InternalError", NULL);
+                                           "InternalError", NULL,request->out);
                                       }
                                     tmpmaps->name = zStrdup ((char *) val);
@@ -2700 +2706 @@
                                            _
                                            ("Unable to allocate memory."),
-                                           "InternalError", NULL);
+                                           "InternalError", NULL,request->out);
                                       }
                                     tmpmaps->name =
@@ -2788 +2794 @@
               addToMap (tmpe, "locator", ptr->name);
               addToMap (tmpe, "text", tmps);
-              printExceptionReportResponse (m, tmpe);
+              printExceptionReportResponse (m, tmpe,request->out);
               //freeService (&s1);
               //free (s1);
@@ -2832 +2838 @@
         }
       addToMap (tmpe, "text", tmps);
-      printExceptionReportResponse (m, tmpe);
+      printExceptionReportResponse (m, tmpe,request->out);
       //freeService (&s1);
       free (s1);
@@ -2855 +2861 @@
       if (getMap (tmpReqI->content, "isFile") != NULL)
         {
-          if (cgiFormFileName (tmpReqI->name, name, sizeof (name)) ==
+          if (cgiFormFileName (tmpReqI->name, name, sizeof (name),&cgi) ==
               cgiFormSuccess)
             {
@@ -2869 +2875 @@
               int got, t;
               map *path = getMapFromMaps (m, "main", "tmpPath");
-              cgiFormFileSize (tmpReqI->name, &size);
+              cgiFormFileSize (tmpReqI->name, &size,&cgi);
               cgiFormFileContentType (tmpReqI->name, contentType,
-                                      sizeof (contentType));
-              if (cgiFormFileOpen (tmpReqI->name, &file) == cgiFormSuccess)
+                                      sizeof (contentType),&cgi);
+              if (cgiFormFileOpen (tmpReqI->name, &file,&cgi) == cgiFormSuccess)
                 {
                   t = -1;
@@ -3018 +3024 @@
                       _
                       ("Status cannot be set to true with storeExecuteResponse to false. Please, modify your request parameters."),
-                      "InvalidParameterValue", "storeExecuteResponse");
+                      "InvalidParameterValue", "storeExecuteResponse",request->out);
       //freeService (&s1);
       //free (s1);
@@ -3069 +3075 @@
   else
     addToMap (_tmpMaps->content, "soap", "false");
-  if (cgiCookie != NULL && strlen (cgiCookie) > 0)
+  if (cgi->cgiCookie != NULL && strlen (cgi->cgiCookie) > 0)
     {
       int hasValidCookie = -1;
-      char *tcook = zStrdup (cgiCookie);
+      char *tcook = zStrdup (cgi->cgiCookie);
       char *tmp = NULL;
       map *testing = getMapFromMaps (m, "main", "cookiePrefix");
@@ -3085 +3091 @@
           sprintf (tmp, "%s=", testing->value);
         }
-      if (strstr (cgiCookie, ";") != NULL)
+      if (strstr (cgi->cgiCookie, ";") != NULL)
         {
           char *token, *saveptr;
-          token = strtok_r (cgiCookie, ";", &saveptr);
+          token = strtok_r (cgi->cgiCookie, ";", &saveptr);
           while (token != NULL)
             {
@@ -3104 +3110 @@
         {
           if (strstr
-              (cgiCookie, "=") != NULL && strcasestr (cgiCookie, tmp) != NULL)
+              (cgi->cgiCookie, "=") != NULL && strcasestr (cgi->cgiCookie, tmp) != NULL)
             {
-              tcook = zStrdup (cgiCookie);
+              tcook = zStrdup (cgi->cgiCookie);
               hasValidCookie = 1;
             }
@@ -3131 +3137 @@
             sprintf
               (session_file_path,
-               "%s/sess_%s.cfg", tmpPath->value, strstr (cgiCookie, "=") + 1);
+               "%s/sess_%s.cfg", tmpPath->value, strstr (cgi->cgiCookie, "=") + 1);
           free (tcook);
           maps *tmpSess = (maps *) malloc (MAPS_SIZE);
@@ -3137 +3143 @@
           int istat = stat (session_file_path,
                             &file_status);
+          
           if (istat == 0 && file_status.st_size > 0)
             {
@@ -3144 +3151 @@
               free (tmpSess);
             }
+            
         }
     }
@@ -3166 +3174 @@
     }
 #endif
-  char *fbkp, *fbkp1;
+  
+
+char *fbkp, *fbkp1;
   FILE *f0, *f1;
   if (status != NULL)
@@ -3176 +3186 @@
         (&m, s1,
          request_inputs,
-         &request_input_real_format, &request_output_real_format, &eres);
+         &request_input_real_format, &request_output_real_format, &eres,request->out,request->err);
     }
   else
@@ -3261 +3271 @@
              r_inputs1->value,
              SERVICE_STARTED,
-             request_input_real_format, request_output_real_format);
+             request_input_real_format, request_output_real_format,request->out);
 #ifndef WIN32
           fflush (stdout);
@@ -3277 +3287 @@
             (&m, s1,
              request_inputs,
-             &request_input_real_format, &request_output_real_format, &eres);
+             &request_input_real_format, &request_output_real_format, &eres,request->out,request->err);
         }
       else
@@ -3289 +3299 @@
                           _
                           ("Unable to run the child process properly"),
-                          "InternalError", NULL);
+                          "InternalError", NULL,request->out);
         }
     }
@@ -3296 +3306 @@
   dumpMaps (request_output_real_format);
 #endif
+
   if (eres != -1)
     outputResponse (s1,
                     request_input_real_format,
                     request_output_real_format,
-                    request_inputs, cpid, m, eres);
-  fflush (stdout);
+                    request_inputs, cpid, m, eres,request->out,request->err);
+  //fflush (stdout);
   /**
    * Ensure that if error occurs when freeing memory, no signal will return
@@ -3315 +3326 @@
   (void) signal (SIGABRT, donothing);
 #endif
-  if (((int) getpid ()) != cpid || cgiSid != NULL)
+  if (((int) getpid ()) != cpid || cgi->cgiSid != NULL)
     {
       fclose (stdout);