Changeset 682 for trunk/zoo-project/zoo-kernel/zoo_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_loader.c (modified) (6 diffs)

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

@@ -29 +29 @@
  * Specific includes
  */
-#ifndef WIN32
 #include "fcgio.h"
 #include "fcgi_config.h" 
 #include "fcgi_stdio.h"
-#endif
 #include <sys/types.h>
 #include <unistd.h>
 #include "service_internal.h"
 #include "response_print.h"
-
-
-#ifdef WIN32
-#include "windows.h"
-#define strtok_r strtok_s
-#endif
 
 extern "C" {
@@ -54 +46 @@
 }
 
+#ifdef WIN32
+#include "windows.h"
+#define strtok_r strtok_s
+#endif
+
 #include "service_internal.h"
 #include "request_parser.h"
-
-#ifdef WIN32
-#include "server_internal.h"
-#endif
 
 int runRequest(map**);
@@ -178 +171 @@
       fprintf(stderr,"(( \n %s \n %s \n ))",*arrayStep,value);
 #endif
-#ifdef WIN32
-      char* tmp = url_decode(value); 
-      if(tmpMap!=NULL)          
-        addToMap(tmpMap,*arrayStep,tmp);
-      else              
-        tmpMap=createMap(*arrayStep,tmp);
-      free(tmp);
-#else
       if(tmpMap!=NULL)
         addToMap(tmpMap,*arrayStep,value);
       else
         tmpMap=createMap(*arrayStep,value);
-#endif  
       arrayStep++;
       delete[]value;
@@ -206 +190 @@
     char *buffer=(char*)malloc((flen+1)*sizeof(char));
     fread(buffer,flen,1,lf);
+    char *pchr=strrchr(buffer,'>');
+    cgiContentLength=strlen(buffer)-strlen(pchr)+1;
+    buffer[cgiContentLength]=0;
     fclose(lf);
     addToMap(tmpMap,"request",buffer);
     free(buffer);
-    cgiContentLength=flen+9;
   }
 #endif
@@ -387 +373 @@
       }   
       //addToMap(tmpMap,name,value);
-          /* knut: strtok(_r) ignores delimiter bytes at start and end of string; 
-           * it will return non-empty string or NULL, e.g. "metapath=" yields value=NULL.
-           * This modification sets value="" instead of NULL.
-           */
-          addToMap(tmpMap,name, value != NULL ? value : "");
-
+      /* knut: strtok(_r) ignores delimiter bytes at start and end of string; 
+       * it will return non-empty string or NULL, e.g. "metapath=" yields value=NULL.
+       * This modification sets value="" instead of NULL.
+       */
+      addToMap(tmpMap,name, value != NULL ? value : "");
       free(name);
       free(value);
@@ -412 +397 @@
     free(strQuery);
 
-  
   runRequest(&tmpMap);