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

Timestamp:

Feb 18, 2015, 1:31:59 PM (9 years ago)

Author:

knut

Message:

Implemented asynchronous HTTP POST Execute requests on Windows platform (via caching). Fixed bug that caused only the last output variable in a HTTP POST Execute request to be returned. Modified the addToCache function so that the path of the cached file can be retrieved. Changed the parsing of KVPs in zoo_loader.c so that keys with missing values (e.g. "metapath=") are assigned the empty string instead of NULL (avoids segmentation fault in some situations). Added conditional definition of ZEND_DEBUG in service_internal_php.c. Deallocation of memory in function createProcess. In zoo_loader.c, applied url_decode to CGI form string (WIN32 only, but should check if this should apply to other platforms as well).

File:

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

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

@@ -173 +173 @@
       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);
+        addToMap(tmpMap,*arrayStep,value);
       else
-        tmpMap=createMap(*arrayStep,value);
+        tmpMap=createMap(*arrayStep,value);
+#endif  
       arrayStep++;
       delete[]value;
@@ -330 +339 @@
       token1=strtok_r(token,"=",&saveptr1);
       while(token1!=NULL){
-        if(name==NULL)
-          name=zStrdup(token1);
-        else
-          value=zStrdup(token1);
-        token1=strtok_r(NULL,"=",&saveptr1);
-      }
-      addToMap(tmpMap,name,value);
+        if(name==NULL)
+          name=zStrdup(token1);
+        else
+          value=zStrdup(token1);
+        token1=strtok_r(NULL,"=",&saveptr1);
+      }
+      //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 : "");
+
       free(name);
       free(value);