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

Timestamp:

Feb 16, 2015, 11:06:51 AM (10 years ago)

Author:

knut

Message:

Added MIME type text/html to list of default file extensions. Fixed memory allocation problem in (deprecated?) function _getStatus.

File:

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

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

@@ -137 +137 @@
 #endif
      ){
-    char tmp[3];
+        char* tmp = (char*) malloc(3*sizeof(char));
     sprintf(tmp,"%d",ZOO_LOCK_CREATE_FAILED);
     return tmp;
@@ -143 +143 @@
   if(lockShm(lockid)<0){
     fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
-    fflush(stderr);
-    char tmp[3];
+    fflush(stderr);    
+        char* tmp = (char*) malloc(3*sizeof(char));
     sprintf(tmp,"%d",ZOO_LOCK_ACQUIRE_FAILED);
     return tmp;
@@ -2826 +2826 @@
                 else if(strncmp(mtype->value,"image/",6)==0)
                   ext=createMap("extension",strstr(mtype->value,"/")+1);
+            else if(strcasecmp(mtype->value,"text/html")==0)
+              ext=createMap("extension","html");          
                 else
                   ext=createMap("extension","txt");