Changeset 587 for trunk/zoo-project/zoo-kernel/service_internal.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/service_internal.c (modified) (5 diffs)

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

@@ -3511 +3511 @@
  * @param mimeType the content mimeType 
  * @param length the content size
- */
-void addToCache(maps* conf,char* request,char* content,char* mimeType,int length){
+ * @param filepath a buffer for storing the path of the cached file; may be NULL
+ * @param max_path the size of the allocated filepath buffer  
+ */
+void addToCache(maps* conf,char* request,char* content,char* mimeType,int length, 
+                char* filepath, size_t max_path){
   map* tmp=getMapFromMaps(conf,"main","cacheDir");
   if(tmp!=NULL){
@@ -3524 +3527 @@
     FILE* fo=fopen(fname,"w+");
     if(fo==NULL){
-      fprintf (stderr, "Failed to open %s for writting: %s\n",fname, strerror(errno));
+#ifdef DEBUG            
+      fprintf (stderr, "Failed to open %s for writing: %s\n",fname, strerror(errno));
+#endif
+      filepath = NULL;  
       return;
     }
     fwrite(content,sizeof(char),length,fo);
     fclose(fo);
+        
+        if (filepath != NULL) {
+                strncpy(filepath, fname, max_path);
+        }       
 
     sprintf(fname,"%s/%s.zcm",tmp->value,md5str);
@@ -3541 +3551 @@
     free(fname);
   }
+  else {
+          filepath = NULL;
+  }       
 }
 
@@ -3665 +3678 @@
             }
             addToMap(content->content,sname,ltmp1);
-            addToCache(*m,tmp1->value,fcontent,mimeType,fsize);
+            addToCache(*m,tmp1->value,fcontent,mimeType,fsize, NULL, 0);
             free(fcontent);
             free(mimeType);
@@ -3767 +3780 @@
   addToMap(*content,"size",ltmp1);
   if(cached==NULL){
-    addToCache(*m,url,fcontent,mimeType,fsize);
+    addToCache(*m,url,fcontent,mimeType,fsize, NULL, 0);
   }
   else{