Changeset 471 for trunk/zoo-project/zoo-kernel/ulinet.c

Timestamp:

May 10, 2014, 4:23:03 PM (10 years ago)

Author:

djay

Message:

Remove leaks from DescribeProcess? and JavaScript? support. Fix wrong ulinet update on previous commit. Use the new updateStatus/setOutputValue functions as described in #88 from longProcess. Add default value for QREncode service in ZCFG. Fix name of profile service in the ZCFG file.

File:

• trunk/zoo-project/zoo-kernel/ulinet.c (modified) (6 diffs)

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

@@ -170 +170 @@
   ret.mimeType = NULL;
 
-  ret.handle=curl_share_init();
-
-  curl_share_setopt(ret.handle, CURLOPT_COOKIEFILE, "ALL");
+  curl_global_init(CURL_GLOBAL_ALL|CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32);
+  ret.handle=curl_easy_init();
+
+  curl_easy_setopt(ret.handle, CURLOPT_COOKIEFILE, "ALL");
 #ifndef TIGER
-  curl_share_setopt(ret.handle, CURLOPT_COOKIELIST, "ALL");
-#endif
-  curl_share_setopt(ret.handle, CURLOPT_USERAGENT, lpszAgent);
-  
-  curl_share_setopt(ret.handle,CURLOPT_FOLLOWLOCATION,1);
-  curl_share_setopt(ret.handle,CURLOPT_MAXREDIRS,3);
+  curl_easy_setopt(ret.handle, CURLOPT_COOKIELIST, "ALL");
+#endif
+  curl_easy_setopt(ret.handle, CURLOPT_USERAGENT, lpszAgent);
+  
+  curl_easy_setopt(ret.handle,CURLOPT_FOLLOWLOCATION,1);
+  curl_easy_setopt(ret.handle,CURLOPT_MAXREDIRS,3);
   
   header.memory=NULL;
   header.size = 0;
 
-  curl_share_setopt(ret.handle, CURLOPT_HEADERFUNCTION, header_write_data);
-  curl_share_setopt(ret.handle, CURLOPT_WRITEHEADER, (void *)&header);
-
-#ifdef MSG_LAF_VERBOSE
-  curl_share_setopt(ret.handle, CURLOPT_VERBOSE, 1);
+  curl_easy_setopt(ret.handle, CURLOPT_HEADERFUNCTION, header_write_data);
+  curl_easy_setopt(ret.handle, CURLOPT_WRITEHEADER, (void *)&header);
+
+#ifdef MSG_LAF_VERBOSE
+  curl_easy_setopt(ret.handle, CURLOPT_VERBOSE, 1);
 #endif
 
@@ -206 +207 @@
   }
   if(handle.handle)
-    curl_share_cleanup(handle.handle);
+    curl_easy_cleanup(handle.handle);
   curl_global_cleanup();
 }
@@ -222 +223 @@
     case INTERNET_FLAG_NO_CACHE_WRITE:    
       hInternet.hasCacheFile=-1;
-      curl_share_setopt(hInternet.handle, CURLOPT_WRITEFUNCTION, write_data_into);
-      curl_share_setopt(hInternet.handle, CURLOPT_WRITEDATA, &hInternet);
+      curl_easy_setopt(hInternet.handle, CURLOPT_WRITEFUNCTION, write_data_into);
+      curl_easy_setopt(hInternet.handle, CURLOPT_WRITEDATA, &hInternet);
       break;
     default:
@@ -236 +237 @@
     
       hInternet.hasCacheFile=1;
-      curl_share_setopt(hInternet.handle, CURLOPT_WRITEFUNCTION, NULL);
-      curl_share_setopt(hInternet.handle, CURLOPT_WRITEDATA, hInternet.file);
+      curl_easy_setopt(hInternet.handle, CURLOPT_WRITEFUNCTION, NULL);
+      curl_easy_setopt(hInternet.handle, CURLOPT_WRITEDATA, hInternet.file);
       hInternet.nDataLen=0;
       break;
@@ -250 +251 @@
 #endif
     //curl_easy_setopt(hInternet.handle,CURLOPT_COOKIE,lpszHeaders);
-    curl_share_setopt(hInternet.handle,CURLOPT_POST,1);
+    curl_easy_setopt(hInternet.handle,CURLOPT_POST,1);
 #ifdef ULINET_DEBUG
     fprintf(stderr,"** (%s) %d **\n",lpszHeaders,dwHeadersLength);
-    curl_share_setopt(hInternet.handle,CURLOPT_VERBOSE,1);
-#endif
-    curl_share_setopt(hInternet.handle,CURLOPT_POSTFIELDS,lpszHeaders);
+    curl_easy_setopt(hInternet.handle,CURLOPT_VERBOSE,1);
+#endif
+    curl_easy_setopt(hInternet.handle,CURLOPT_POSTFIELDS,lpszHeaders);
     //curl_easy_setopt(hInternet.handle,CURLOPT_POSTFIELDSIZE,dwHeadersLength+1);
     if(hInternet.header!=NULL)
-      curl_share_setopt(hInternet.handle,CURLOPT_HTTPHEADER,hInternet.header);
-  }
-
-  curl_share_setopt(hInternet.handle,CURLOPT_URL,lpszUrl);
+      curl_easy_setopt(hInternet.handle,CURLOPT_HTTPHEADER,hInternet.header);
+  }
+
+  curl_easy_setopt(hInternet.handle,CURLOPT_URL,lpszUrl);
   curl_easy_perform(hInternet.handle);
   curl_easy_getinfo(hInternet.handle,CURLINFO_CONTENT_TYPE,&hInternet.mimeType);
@@ -273 +274 @@
   memset(&CCookie[0],0,1024);
 #ifndef TIGER
-  curl_share_setopt(hInternet.handle, CURLOPT_COOKIELIST, "ALL");
+  curl_easy_setopt(hInternet.handle, CURLOPT_COOKIELIST, "ALL");
 #endif
   return 1;