Changeset 890 for branches/prototype-v0/zoo-project/zoo-kernel/ulinet.c

Timestamp:

Jan 9, 2019, 4:11:59 PM (5 years ago)

Author:

djay

Message:

Make this ZOO-Kernel working properly on windows platform again.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/ulinet.c (modified) (7 diffs)

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

@@ -238 +238 @@
   HINTERNET ret;
   ret.handle=curl_multi_init();
-  ret.agent=strdup(lpszAgent);
+  ret.agent=zStrdup(lpszAgent);
   ret.nb=0;
   ret.waitingRequests[ret.nb] = NULL;
@@ -269 +269 @@
 char* getProvenance(maps* conf,const char* url){
   map* sharedCache=getMapFromMaps(conf,"security","shared");
+  char *res="OTHER";
+  char *paths[2]={
+    "mapserverAddress",
+    "tmpUrl"
+  };
   if(sharedCache!=NULL){
-    char *res=NULL;
     char *hosts=sharedCache->value;
     char *curs=strtok(hosts,",");
     while(curs!=NULL){
-      if(strstr(url,curs)==NULL)
-        res="OTHER";
-      else{
-        res="SHARED";
-        return res;
+      if(strstr(url,curs)==NULL){
+        return "SHARED";
       }
       curs=strtok(NULL,",");
     }
-    return res;
-  }
-  return "OTHER";
+  }
+  for(int i=0;i<2;i++){
+    sharedCache=getMapFromMaps(conf,"main",paths[i]);
+    if(sharedCache!=NULL){
+      if(strstr(url,sharedCache->value)!=NULL){
+        return "LOCAL";
+      }
+    }
+  }
+  return res;
 }
 
@@ -482 +490 @@
 #endif
 
-  if(memUse!=NULL && strcasecmp(memUse->value,"load")==0)
+  if(memUse==NULL || strcasecmp(memuse->value,"load")==0)
     ldwFlags=INTERNET_FLAG_NO_CACHE_WRITE;
   
@@ -502 +510 @@
         sprintf(filename,"/tmp/ZOO_Cache%s", tmpUuid);
       else
-        sprintf(filename,"/%s/ZOO_Cache%s", tmpPath->value,tmpUuid);
+        sprintf(filename,"%s/ZOO_Cache%s", tmpPath->value,tmpUuid);
       free(tmpUuid);
-      hInternet->ihandle[hInternet->nb].filename=strdup(filename);
+      hInternet->ihandle[hInternet->nb].filename=zStrdup(filename);
       hInternet->ihandle[hInternet->nb].file=fopen(hInternet->ihandle[hInternet->nb].filename,"w+");
       hInternet->ihandle[hInternet->nb].hasCacheFile=1;
@@ -524 +532 @@
     curl_easy_setopt(hInternet->ihandle[hInternet->nb].handle,CURLOPT_VERBOSE,1);
 #endif
-    hInternet->ihandle[hInternet->nb].post=strdup(lpszHeaders);
+    hInternet->ihandle[hInternet->nb].post=zStrdup(lpszHeaders);
     curl_easy_setopt(hInternet->ihandle[hInternet->nb].handle,CURLOPT_POSTFIELDS,hInternet->ihandle[hInternet->nb].post);
     curl_easy_setopt(hInternet->ihandle[hInternet->nb].handle,CURLOPT_POSTFIELDSIZE,(long)dwHeadersLength);
@@ -602 +610 @@
     curl_easy_getinfo(hInternet->ihandle[i].handle,CURLINFO_CONTENT_TYPE,&tmp);
     if(tmp!=NULL)
-      hInternet->ihandle[i].mimeType=strdup(tmp);
+      hInternet->ihandle[i].mimeType=zStrdup(tmp);
     curl_easy_getinfo(hInternet->ihandle[i].handle,CURLINFO_RESPONSE_CODE,&hInternet->ihandle[i].code);
     curl_multi_remove_handle(hInternet->handle, hInternet->ihandle[i].handle);
@@ -618 +626 @@
  */
 int freeCookieList(HINTERNET hInternet){
-  hInternet.ihandle[hInternet.nb].cookie=strdup("");
+  hInternet.ihandle[hInternet.nb].cookie=zStrdup("");
 #ifndef TIGER
   curl_easy_setopt(hInternet.ihandle[hInternet.nb].handle, CURLOPT_COOKIELIST, "ALL");