Changeset 458 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

Mar 31, 2014, 10:50:26 PM (10 years ago)

Author:

djay

Message:

Fix some issue in background execution on windows platform (basic array and xlink). Fix issue #89.

File:

• trunk/zoo-project/zoo-kernel/service_internal.c (modified) (3 diffs)

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

@@ -287 +287 @@
   }
   if(getMapFromMaps(conf,"lenv","status")!=NULL){
-    fprintf(stderr,"STATUS RETURNED : %s\n",status);
     if(status!=NULL){
       setMapInMaps(conf,"lenv","status",status);
@@ -1641 +1640 @@
                             (strncmp(tmp2->value,"application/",12)==0) &&
                             strncmp(tmp2->value,"application/json",16)!=0&&
+                            strncmp(tmp2->value,"application/x-javascript",24)!=0&&
                             strncmp(tmp2->value,"application/vnd.google-earth.kml",32)!=0)
              )) {
@@ -2004 +2004 @@
         map *tmp3=getMapFromMaps(m,"main","serverAddress");
         char *file_url;
-        if(strncasecmp(tmp2->value,"http://",7)==0){
-          file_url=(char*)malloc((strlen(tmp2->value)+strlen(file_name))*sizeof(char));
+        if(strncasecmp(tmp2->value,"http://",7)==0 ||
+           strncasecmp(tmp2->value,"https://",8)==0){
+          file_url=(char*)malloc((strlen(tmp2->value)+strlen(file_name)+2)*sizeof(char));
           sprintf(file_url,"%s/%s",tmp2->value,file_name);
         }else{
-          file_url=(char*)malloc((strlen(tmp3->value)+strlen(tmp2->value)+strlen(file_name))*sizeof(char));
+          file_url=(char*)malloc((strlen(tmp3->value)+strlen(tmp2->value)+strlen(file_name)+3)*sizeof(char));
           sprintf(file_url,"%s/%s/%s",tmp3->value,tmp2->value,file_name);
         }