Changeset 534 for trunk/zoo-project/zoo-kernel

Timestamp:

Nov 10, 2014, 12:44:55 PM (10 years ago)

Author:

djay

Message:

Small fix for storing mimetype properly.

Location:

trunk/zoo-project/zoo-kernel

Files:

• ZOOMakefile.opts.in (modified) (2 diffs)
• ulinet.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in

@@ -58 +58 @@
 JAVA_FILE=@JAVA_FILE@
 
-CFLAGS=@DEB_DEF@ -fpic ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
-LDFLAGS=-lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${YAML_LDFLAGS} 
-
 PHPCFLAGS=@PHP_CPPFLAGS@
 PHPLDFLAGS=@PHP_LDFLAGS@
@@ -71 +68 @@
 PERL_ENABLED=@PERL_ENABLED@
 PERL_FILE=@PERL_FILE@
+
+CFLAGS=@DEB_DEF@ -fpic ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
+LDFLAGS=-lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} 
+

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

@@ -180 +180 @@
       fclose(handle.file);
       unlink(handle.filename);
-      handle.mimeType = NULL;
     }
     else{
       handle.pabyData = NULL;
-      handle.mimeType = NULL;
       handle.nDataAlloc = handle.nDataLen = 0;
     }
@@ -192 +190 @@
     }
     free(handle.mimeType);
+    handle.mimeType = NULL;
   }
   if(handle0->handle)
@@ -298 +297 @@
   }while(still_running);  
   for(i=0;i<hInternet->nb;i++){
-    curl_easy_getinfo(hInternet->ihandle[i].handle,CURLINFO_CONTENT_TYPE,&hInternet->ihandle[i].mimeType);
+    char *tmp;
+    curl_easy_getinfo(hInternet->ihandle[i].handle,CURLINFO_CONTENT_TYPE,&tmp);
+    hInternet->ihandle[i].mimeType=strdup(tmp);
     curl_multi_remove_handle(hInternet->handle, hInternet->ihandle[i].handle);
     curl_easy_cleanup(hInternet->ihandle[i].handle);