Changeset 682 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Jun 26, 2015, 2:07:46 PM (9 years ago)

Author:

djay

Message:

Fix GetResult? and POST asynchronous requests on Windows. Prevent CONTENT_TYPE=text/xml before creating the process using CreateProcess?. Revert modifications made r587 for using url_decode directly inside zoo_loader.c, the url_decode call should be in kvpParseInputs (from request_parser.c), indeed, there should not be any decoding required in other cases than Execute requests. Fix issue in mapsFromPyDict, small changes in mapFromPyDict to fix parsing result value (only) for Python 3.

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (9 diffs)

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -734 +734 @@
     strncpy(kvp, key, strlen(key));
     addToCache(m, tmpReq->value, tmpReq->value, "text/xml", strlen(tmpReq->value), 
-               filepath, FILENAME_MAX);                            
+               filepath, FILENAME_MAX);
     if (filepath == NULL) {
       errorException( m, _("Unable to cache HTTP POST Execute request."), "InternalError", NULL);  
@@ -787 +787 @@
   SetEnvironmentVariable ("CGISID", TEXT (sid->value));
   SetEnvironmentVariable ("QUERY_STRING", TEXT (tmpq));
-  // knut: Prevent REQUEST_METHOD=POST in background process call to cgic:main (process hangs when reading cgiIn):
+  // knut: Prevent REQUEST_METHOD=POST in background process call to cgic:main 
+  // (process hangs when reading cgiIn):
   SetEnvironmentVariable("REQUEST_METHOD", "GET");
+  SetEnvironmentVariable("CONTENT_TYPE", "text/plain");
   
   char clen[1000];
@@ -794 +796 @@
   SetEnvironmentVariable ("CONTENT_LENGTH", TEXT (clen));
 
+  // ref. https://msdn.microsoft.com/en-us/library/windows/desktop/ms684863%28v=vs.85%29.aspx
   if (!CreateProcess (NULL,     // No module name (use command line)
                       TEXT (tmp),       // Command line
@@ -1798 +1801 @@
    * Initialize the specific [lenv] section which contains runtime variables:
    * 
-   *  - usid : it is an unique identification number 
+   *  - usid : it is an universally unique identifier  
+   *  - osid : it is an idenfitication number 
    *  - sid : it is the process idenfitication number (OS)
-   *  - uusid : it is an universally unique identification number 
+   *  - uusid : it is an universally unique identifier 
    *  - status : value between 0 and 100 to express the  completude of 
    * the operations of the running service 
@@ -1931 +1935 @@
   map *test1 = getMap (request_inputs, "cgiSid");
   if (test1 != NULL){
-      cgiSid = test1->value;
-      addToMap (request_inputs, "storeExecuteResponse", "true");
-      addToMap (request_inputs, "status", "true");
-      setMapInMaps (m, "lenv", "sid", test1->value);
-      status = getMap (request_inputs, "status");
-    }
+    cgiSid = zStrdup(test1->value);
+    addToMap (request_inputs, "storeExecuteResponse", "true");
+    addToMap (request_inputs, "status", "true");
+    setMapInMaps (m, "lenv", "osid", test1->value);
+    status = getMap (request_inputs, "status");
+  }
   test1 = getMap (request_inputs, "usid");
   if (test1 != NULL){
@@ -2129 +2133 @@
                              &request_input_real_format,
                              &request_output_real_format, &eres);
-
         }
       else
@@ -2182 +2185 @@
       lockShm (lid);
 #endif
-      fclose(f0);
       FILE *f3 = fopen (fbkp, "wb+");
       free (fbkp);
@@ -2206 +2208 @@
       }
 #ifndef RELY_ON_DB
-      dumpMapsToFile(bmap,fbkpres);
+      dumpMapsToFile(bmap,fbkpres,1);
       removeShmLock (m, 1);
 #else
@@ -2221 +2223 @@
       free (fbkp1);
       free (tmps1);
+      if(cgiSid!=NULL)
+        free(cgiSid);
     }