Changeset 601 for trunk/zoo-project/zoo-kernel/zoo_loader.c

Timestamp:

Feb 26, 2015, 11:53:34 AM (9 years ago)

Author:

knut

Message:

Implemented default result file extensions for many MIME types, based on Apache's mime.types list. Added file mimetypes.h. Made function printIOType more general with respect to media content. Rewrote the XML parsing of the <ResponseDocument?> block in Execute requests to fix problem caused by one output variable inheriting properties from another. Minor memory allocation modification in zoo_loader.c.

File:

• trunk/zoo-project/zoo-kernel/zoo_loader.c (modified) (5 diffs)

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

@@ -84 +84 @@
   fflush(stderr);
 #endif
-
   
   char *strQuery=NULL;
@@ -134 +133 @@
           char *ivalue=new char[cgiContentLength];
           cgiFormStringNoNewlines(*arrayStep, ivalue, cgiContentLength);
-          char* tmpValueFinal=(char*) malloc((strlen(*arrayStep)+strlen(ivalue)+1)*sizeof(char));
+          char* tmpValueFinal=(char*) malloc((strlen(*arrayStep)+strlen(ivalue)+2)*sizeof(char));       
           sprintf(tmpValueFinal,"%s=%s",*arrayStep,ivalue);
-          if(strlen(buffer)==0){
+
+          if(strlen(buffer)==0){                
             sprintf(buffer,"%s",tmpValueFinal);
-          }else{
+          }else{                
             char *tmp=zStrdup(buffer);
             sprintf(buffer,"%s&%s",tmp,tmpValueFinal);
             free(tmp);
-          }
+          }       
           free(tmpValueFinal);
 #ifdef DEBUG
@@ -149 +149 @@
           delete[]ivalue;
           arrayStep++;
-        }
+        }       
         if(tmpMap!=NULL)
           addToMap(tmpMap,"request",buffer);
@@ -156 +156 @@
       }
       delete[]buffer;
-    }
+    }   
   }
   else{
@@ -344 +344 @@
           value=zStrdup(token1);
         token1=strtok_r(NULL,"=",&saveptr1);
-      }
+      }   
       //addToMap(tmpMap,name,value);
           /* knut: strtok(_r) ignores delimiter bytes at start and end of string;