Changeset 896 for branches/prototype-v0/zoo-project/zoo-kernel/zoo_loader.c

Timestamp:

Feb 25, 2019, 1:57:11 PM (5 years ago)

Author:

knut

Message:

Added some recent changes from trunk (r889), including some new utility functions and exception handling and new (conditional) definition of type bool. Added some new logic concerning Python and Mono environment and search paths. Fixed problem with Mono updateStatus function. Changed response_print.h to #include locale.h unconditionally and xlocale.h conditionally; xlocale.h is non-standard and can probably be dropped.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/zoo_loader.c (modified) (5 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/zoo_loader.c

@@ -123 +123 @@
        if(res!=NULL)
          free(res);
-    }else{
+    }else{              
       char *buffer=new char[cgiContentLength+1];
       if(fread(buffer,sizeof(char),cgiContentLength,cgiIn)>0){
@@ -163 +163 @@
     }   
   }
-  else{
+  else{   
 #ifdef DEBUG
     dumpMap(tmpMap);
@@ -187 +187 @@
     cgiStringArrayFree(array);
   }
-
+ 
 #ifdef WIN32
-  map *tmpReq=getMap(tmpMap,"rfile");
-  if(tmpReq!=NULL){
-    FILE *lf=fopen(tmpReq->value,"r");
+  map *tmpReq=getMap(tmpMap,"rfile");  
+  if(tmpReq!=NULL){               
+    FILE *lf=fopen(tmpReq->value,"r");  
     fseek(lf,0,SEEK_END);
     long flen=ftell(lf);
@@ -395 +395 @@
     }
   }
-
+  
   if(strncasecmp(cgiContentType,"multipart/form-data",19)==0){
     map* tmp=getMap(tmpMap,"dataInputs");
@@ -408 +408 @@
   if(strQuery!=NULL)
     free(strQuery);
-
+  
   runRequest(&tmpMap);