Index: trunk/zoo-project/zoo-kernel/service.h
===================================================================
--- trunk/zoo-project/zoo-kernel/service.h	(revision 470)
+++ trunk/zoo-project/zoo-kernel/service.h	(revision 471)
@@ -423,7 +423,8 @@
     if(hasKey(m,n)==false){
       map* _cursor=m;
-      while(_cursor->next!=NULL)
-	_cursor=_cursor->next;
-      _cursor->next=createMap(n,v);
+      if(_cursor->next!=NULL){
+	addToMap(_cursor->next,n,v);
+      }else
+	_cursor->next=createMap(n,v);
     }
     else{
@@ -455,7 +456,5 @@
 	}
 	else{
-	  if(tmp1->value!=NULL)
-	    free(tmp1->value);
-	  tmp1->value=zStrdup(tmp->value);
+	  addToMap(*mo,tmp->name,tmp->value);
 	}
       }
@@ -480,13 +479,13 @@
   }
 
-  static map* getMapOrFill(map* m,const char *key,char* value){
-    map* tmp=m;
+  static map* getMapOrFill(map** m,const char *key,char* value){
+    map* tmp=*m;
     map* tmpMap=getMap(tmp,key);
     if(tmpMap==NULL){
       if(tmp!=NULL)
-	addToMap(tmp,key,value);
+	addToMap(*m,key,value);
       else
-	tmp=createMap(key,value);
-      tmpMap=getMap(tmp,key);
+	(*m)=createMap(key,value);
+      tmpMap=getMap(*m,key);
     }
     return tmpMap;
@@ -611,5 +610,5 @@
       fprintf(stderr,"%s\n",tmpSize->value);
 #endif
-      map* ptr=getMapOrFill(m,tmp,(char *)"");
+      map* ptr=getMapOrFill(&m,tmp,(char *)"");
       free(ptr->value);
       ptr->value=(char*)malloc((atoi(tmpSize->value)+1)*sizeof(char));
Index: trunk/zoo-project/zoo-kernel/service_internal.c
===================================================================
--- trunk/zoo-project/zoo-kernel/service_internal.c	(revision 470)
+++ trunk/zoo-project/zoo-kernel/service_internal.c	(revision 471)
@@ -77,5 +77,5 @@
 static HANDLE hMapObjectG = NULL;  // handle to file mapping
 
-void updateStatus(maps *conf){
+int _updateStatus(maps *conf){
   LPWSTR lpszTmp;
   BOOL fInit;
@@ -94,5 +94,5 @@
   if (hMapObjectG == NULL){
     fprintf(stderr,"Unable to create share memory segment %s !! \n",tmpMap->value);
-    return ;
+    return -2;
   }
   fInit = (GetLastError() != ERROR_ALREADY_EXISTS); 
@@ -106,5 +106,5 @@
   if (lpvMemG == NULL){
     fprintf(stderr,"Unable to create or access the shared memory segment %s !! \n",tmpMap->value);
-    return ;
+    return -1;
   } 
   memset(lpvMemG, '\0', SHMEMSIZE);
@@ -120,4 +120,5 @@
   *lpszTmp++ = '\0';
   free(final_string);
+  return 0;
 }
 
@@ -200,5 +201,5 @@
 }
 
-void updateStatus(maps *conf){
+int _updateStatus(maps *conf){
   int shmid,i;
   key_t key;
@@ -212,4 +213,5 @@
       fprintf(stderr,"shmget failed to create new Shared memory segment\n");
 #endif
+      return -2;
     }else{
       if ((shm = (char*) shmat(shmid, NULL, 0)) == (char *) -1) {
@@ -217,4 +219,5 @@
 	fprintf(stderr,"shmat failed to update value\n");
 #endif
+	return -1;
       }
       else{
@@ -235,4 +238,5 @@
     }
   }
+  return 0;
 }
 
@@ -293,5 +297,5 @@
     else
       setMapInMaps(conf,"lenv","status","15");
-    updateStatus(conf);
+    _updateStatus(conf);
   }
   freeMaps(&conf);
@@ -904,11 +908,13 @@
   }
 
-  nc1 = xmlNewNode(NULL, BAD_CAST "DataInputs");
-  elements* e=serv->inputs;
-  printFullDescription(e,"Input",ns_ows,nc1);
-  xmlAddChild(nc,nc1);
+  if(serv->inputs!=NULL){
+    nc1 = xmlNewNode(NULL, BAD_CAST "DataInputs");
+    elements* e=serv->inputs;
+    printFullDescription(e,"Input",ns_ows,nc1);
+    xmlAddChild(nc,nc1);
+  }
 
   nc1 = xmlNewNode(NULL, BAD_CAST "ProcessOutputs");
-  e=serv->outputs;
+  elements* e=serv->outputs;
   printFullDescription(e,"Output",ns_ows,nc1);
   xmlAddChild(nc,nc1);
@@ -934,6 +940,7 @@
   orderedFields[12]="rangeSpace";
 
-  xmlNodePtr nc2,nc3,nc4,nc5,nc6,nc7,nc8;
+  xmlNodePtr nc2,nc3,nc4,nc5,nc6,nc7,nc8,nc9;
   elements* e=elem;
+
   map* tmp1=NULL;
   while(e!=NULL){
@@ -941,15 +948,25 @@
     int isAnyValue=1;
     nc2 = xmlNewNode(NULL, BAD_CAST type);
-    tmp1=getMap(e->content,"minOccurs");
-    if(tmp1){
-      xmlNewProp(nc2,BAD_CAST tmp1->name,BAD_CAST tmp1->value);
-    }
-    tmp1=getMap(e->content,"maxOccurs");
-    if(tmp1){
-      xmlNewProp(nc2,BAD_CAST tmp1->name,BAD_CAST tmp1->value);
+    if(strncmp(type,"Input",5)==0){
+      tmp1=getMap(e->content,"minOccurs");
+      if(tmp1!=NULL){
+	xmlNewProp(nc2,BAD_CAST tmp1->name,BAD_CAST tmp1->value);
+      }else
+	xmlNewProp(nc2,BAD_CAST "minOccurs",BAD_CAST "0");
+      tmp1=getMap(e->content,"maxOccurs");
+      if(tmp1!=NULL){
+	if(strcasecmp(tmp1->value,"unbounded")!=0)
+	  xmlNewProp(nc2,BAD_CAST tmp1->name,BAD_CAST tmp1->value);
+	else
+	  xmlNewProp(nc2,BAD_CAST "maxOccurs",BAD_CAST "1000");
+      }else
+	xmlNewProp(nc2,BAD_CAST "maxOccurs",BAD_CAST "1");
     }
 
     printDescription(nc2,ns_ows,e->name,e->content);
 
+    /**
+     * Build the (Literal/Complex/BoundingBox)Data node
+     */
     if(strncmp(type,"Output",6)==0){
       if(strncasecmp(e->format,"LITERALDATA",strlen(e->format))==0)
@@ -972,4 +989,5 @@
 	nc3 = xmlNewNode(NULL, BAD_CAST e->format);
     }
+
     iotype* _tmp0=NULL;
     iotype* _tmp=e->defaults;
@@ -977,4 +995,5 @@
     bool hasDefault=false;
     bool hasUOM=false;
+    bool hasUOM1=false;
     if(_tmp!=NULL){
       if(strcmp(e->format,"LiteralOutput")==0 ||
@@ -987,5 +1006,4 @@
 	      strcmp(e->format,"BoundingBoxData")==0){
 	datatype=2;
-	//nc4 = xmlNewNode(NULL, BAD_CAST "BoundingBoxOutput");
 	nc5 = xmlNewNode(NULL, BAD_CAST "Default");
       }
@@ -996,211 +1014,218 @@
       
       tmp1=_tmp->content;
-      int avcnt=0;
-      int dcnt=0;
-      int oI=0;
-      for(oI=0;oI<13;oI++)
-	if((tmp1=getMap(_tmp->content,orderedFields[oI]))!=NULL){
-	  //while(tmp1!=NULL){
-#ifdef DEBUG
-	  printf("DATATYPE DEFAULT ? %s\n",tmp1->name);
-#endif
-	  if(strncasecmp(tmp1->name,"DataType",8)==0){
-	    nc6 = xmlNewNode(ns_ows, BAD_CAST "DataType");
-	    xmlAddChild(nc6,xmlNewText(BAD_CAST tmp1->value));
-	    char tmp[1024];
-	    sprintf(tmp,"http://www.w3.org/TR/xmlschema-2/#%s",tmp1->value);
-	    xmlNewNsProp(nc6,ns_ows,BAD_CAST "reference",BAD_CAST tmp);
-	    xmlAddChild(nc3,nc6);
-	    tmp1=tmp1->next;
-	    datatype=1;
-	    continue;
+
+      if((tmp1=getMap(_tmp->content,"DataType"))!=NULL){
+	nc8 = xmlNewNode(ns_ows, BAD_CAST "DataType");
+	xmlAddChild(nc8,xmlNewText(BAD_CAST tmp1->value));
+	char tmp[1024];
+	sprintf(tmp,"http://www.w3.org/TR/xmlschema-2/#%s",tmp1->value);
+	xmlNewNsProp(nc8,ns_ows,BAD_CAST "reference",BAD_CAST tmp);
+	xmlAddChild(nc3,nc8);
+	datatype=1;
+      }
+      
+      if(strncmp(type,"Input",5)==0){
+
+	if((tmp1=getMap(_tmp->content,"AllowedValues"))!=NULL){
+	  nc6 = xmlNewNode(ns_ows, BAD_CAST "AllowedValues");
+	  char *token,*saveptr1;
+	  token=strtok_r(tmp1->value,",",&saveptr1);
+	  while(token!=NULL){
+	    nc7 = xmlNewNode(ns_ows, BAD_CAST "Value");
+	    char *tmps=strdup(token);
+	    tmps[strlen(tmps)]=0;
+	    xmlAddChild(nc7,xmlNewText(BAD_CAST tmps));
+	    free(tmps);
+	    xmlAddChild(nc6,nc7);
+	    token=strtok_r(NULL,",",&saveptr1);
 	  }
-	  if(strcmp(tmp1->name,"asReference")!=0 &&
-	     strncasecmp(tmp1->name,"DataType",8)!=0 &&
-	     strcasecmp(tmp1->name,"extension")!=0 &&
-	     strcasecmp(tmp1->name,"value")!=0 &&
-	     strncasecmp(tmp1->name,"AllowedValues",13)!=0&&
-	     strncasecmp(tmp1->name,"range",5)!=0){
-	    if(datatype!=1){
-	      char *tmp2=zCapitalize1(tmp1->name);
-	      nc6 = xmlNewNode(NULL, BAD_CAST tmp2);
-	      free(tmp2);
-	    }
-	    else{
-	      char *tmp2=zCapitalize(tmp1->name);
-	      nc6 = xmlNewNode(ns_ows, BAD_CAST tmp2);
-	      free(tmp2);
-	    }
-	    xmlAddChild(nc6,xmlNewText(BAD_CAST tmp1->value));
-	    xmlAddChild(nc5,nc6);
-	    hasUOM=true;
-	  }else 
-	    if(strncmp(type,"Input",5)==0){
-
-	      if(strcmp(tmp1->name,"value")==0){
-		nc7 = xmlNewNode(NULL, BAD_CAST "DefaultValue");
-		xmlAddChild(nc7,xmlNewText(BAD_CAST tmp1->value));
-		default1=1;
-		hasDefault=true;
-	      }
-	      if(strncasecmp(tmp1->name,"AllowedValues",13)==0){
-		nc6 = xmlNewNode(ns_ows, BAD_CAST "AllowedValues");
-		char *token,*saveptr1;
-		token=strtok_r(tmp1->value,",",&saveptr1);
-		while(token!=NULL){
-		  nc7 = xmlNewNode(ns_ows, BAD_CAST "Value");
-		  char *tmps=strdup(token);
-		  tmps[strlen(tmps)]=0;
-		  xmlAddChild(nc7,xmlNewText(BAD_CAST tmps));
-		  xmlAddChild(nc6,nc7);
-		  token=strtok_r(NULL,",",&saveptr1);
+	  if(getMap(_tmp->content,"range")!=NULL ||
+	     getMap(_tmp->content,"rangeMin")!=NULL ||
+	     getMap(_tmp->content,"rangeMax")!=NULL ||
+	     getMap(_tmp->content,"rangeClosure")!=NULL )
+	    goto doRange;
+	  xmlAddChild(nc3,nc6);
+	  isAnyValue=-1;
+	}
+
+        tmp1=getMap(_tmp->content,"range");
+	if(tmp1==NULL)
+	  tmp1=getMap(_tmp->content,"rangeMin");
+	if(tmp1==NULL)
+	  tmp1=getMap(_tmp->content,"rangeMax");
+	
+	if(tmp1!=NULL && isAnyValue==1){
+	  nc6 = xmlNewNode(ns_ows, BAD_CAST "AllowedValues");
+	doRange:
+	  
+	  /**
+	   * Range: Table 46 OGC Web Services Common Standard
+	   */
+	  nc8 = xmlNewNode(ns_ows, BAD_CAST "Range");
+	  
+	  map* tmp0=getMap(tmp1,"range");
+	  if(tmp0!=NULL){
+	    char* pToken;
+	    char* orig=zStrdup(tmp0->value);
+	    /**
+	     * RangeClosure: Table 47 OGC Web Services Common Standard
+	     */
+	    char *tmp="closed";
+	    if(orig[0]=='[' && orig[strlen(orig)-1]=='[')
+	      tmp="closed-open";
+	    else
+	      if(orig[0]==']' && orig[strlen(orig)-1]==']')
+		tmp="open-closed";
+	      else
+		if(orig[0]==']' && orig[strlen(orig)-1]=='[')
+		  tmp="open";
+	    xmlNewNsProp(nc8,ns_ows,BAD_CAST "rangeClosure",BAD_CAST tmp);
+	    pToken=strtok(orig,",");
+	    int nci0=0;
+	    while(pToken!=NULL){
+	      char *tmpStr=(char*) malloc((strlen(pToken))*sizeof(char));
+	      if(nci0==0){
+		nc7 = xmlNewNode(ns_ows, BAD_CAST "MinimumValue");
+		int nci=1;
+		for(nci=1;nci<strlen(pToken);nci++){
+		  tmpStr[nci-1]=pToken[nci];
 		}
-		if(getMap(_tmp->content,"range")!=NULL ||
-		   getMap(_tmp->content,"rangeMin")!=NULL ||
-		   getMap(_tmp->content,"rangeMax")!=NULL ||
-		   getMap(_tmp->content,"rangeClosure")!=NULL )
-		  goto doRange;
-		xmlAddChild(nc3,nc6);
-		isAnyValue=-1;
-	      }
-	      if(strncasecmp(tmp1->name,"range",5)==0){
-		if(isAnyValue==1){
-		  nc6 = xmlNewNode(ns_ows, BAD_CAST "AllowedValues");
-		doRange:
-		  
-		  /**
-		   * Range: Table 46 OGC Web Services Common Standard
-		   */
-		  nc8 = xmlNewNode(ns_ows, BAD_CAST "Range");
-
-		  map* tmp0=getMap(tmp1,"range");
-		  if(tmp0!=NULL){
-		    char* pToken;
-		    char* orig=zStrdup(tmp0->value);
-		    /**
-		     * RangeClosure: Table 47 OGC Web Services Common Standard
-		     */
-		    char *tmp="closed";
-		    if(orig[0]=='[' && orig[strlen(orig)-1]=='[')
-		      tmp="closed-open";
-		    else
-		      if(orig[0]==']' && orig[strlen(orig)-1]==']')
-			tmp="open-closed";
-		      else
-			if(orig[0]==']' && orig[strlen(orig)-1]=='[')
-			  tmp="open";
-		    xmlNewNsProp(nc8,ns_ows,BAD_CAST "rangeClosure",BAD_CAST tmp);
-		    pToken=strtok(orig,",");
-		    int nci0=0;
-		    while(pToken!=NULL){
-		      char *tmpStr=(char*) malloc((strlen(pToken))*sizeof(char));
-		      if(nci0==0){
-			nc7 = xmlNewNode(ns_ows, BAD_CAST "MinimumValue");
-			int nci=1;
-			for(nci=1;nci<strlen(pToken);nci++){
-			  tmpStr[nci-1]=pToken[nci];
-			}
-		      }else{
-			nc7 = xmlNewNode(ns_ows, BAD_CAST "MaximumValue");
-			int nci=0;
-			for(nci=0;nci<strlen(pToken)-1;nci++){
-			  tmpStr[nci]=pToken[nci];
-			}
-		      }
-		      xmlAddChild(nc7,xmlNewText(BAD_CAST tmpStr));
-		      xmlAddChild(nc8,nc7);
-		      nci0++;
-		      pToken = strtok(NULL,",");
-		    }		    
-		    if(getMap(tmp1,"rangeSpacing")==NULL){
-		      nc7 = xmlNewNode(ns_ows, BAD_CAST "Spacing");
-		      xmlAddChild(nc7,xmlNewText(BAD_CAST "1"));
-		      xmlAddChild(nc8,nc7);
-		    }
-		  }else{
-
-		  tmp0=getMap(tmp1,"rangeMin");
-		  if(tmp0!=NULL){
-		    nc7 = xmlNewNode(ns_ows, BAD_CAST "MinimumValue");
-		    xmlAddChild(nc7,xmlNewText(BAD_CAST tmp0->value));
-		    xmlAddChild(nc8,nc7);
-		  }else{
-		    nc7 = xmlNewNode(ns_ows, BAD_CAST "MinimumValue");
-		    xmlAddChild(nc8,nc7);
-		  }
-		  tmp0=getMap(tmp1,"rangeMax");
-		  if(tmp0!=NULL){
-		    nc7 = xmlNewNode(ns_ows, BAD_CAST "MaximumValue");
-		    xmlAddChild(nc7,xmlNewText(BAD_CAST tmp0->value));
-		    xmlAddChild(nc8,nc7);
-		  }else{
-		    nc7 = xmlNewNode(ns_ows, BAD_CAST "MaximumValue");
-		    xmlAddChild(nc8,nc7);
-		  }
-		  tmp0=getMap(tmp1,"rangeSpacing");
-		  if(tmp0!=NULL){
-		    nc7 = xmlNewNode(ns_ows, BAD_CAST "Spacing");
-		    xmlAddChild(nc7,xmlNewText(BAD_CAST tmp0->value));
-		    xmlAddChild(nc8,nc7);
-		  }
-		  tmp0=getMap(tmp1,"rangeClosure");
-		  if(tmp0!=NULL){
-		    char *tmp="closed";
-		    if(strcasecmp(tmp0->value,"co")==0)
-		      tmp="closed-open";
-		    else
-		      if(strcasecmp(tmp0->value,"oc")==0)
-			tmp="open-closed";
-		      else
-			if(strcasecmp(tmp0->value,"o")==0)
-			  tmp="open";
-		    xmlNewNsProp(nc8,ns_ows,BAD_CAST "rangeClosure",BAD_CAST tmp);
-		  }else
-		    xmlNewNsProp(nc8,ns_ows,BAD_CAST "rangeClosure",BAD_CAST "closed");
-		  }
-		  if(_tmp0==NULL){
-		    xmlAddChild(nc6,nc8);
-		    _tmp0=e->supported;
-		    tmp1=_tmp0->content;
-		    goto doRange;
-		  }else{
-		    _tmp0=_tmp0->next;
-		    if(_tmp0!=NULL){
-		      xmlAddChild(nc6,nc8);
-		      tmp1=_tmp0->content;
-		      goto doRange;
-		    }
-		  
-		  }
-		  xmlAddChild(nc6,nc8);
-		  xmlAddChild(nc3,nc6);
-		  isAnyValue=-1;
+		}else{
+		nc7 = xmlNewNode(ns_ows, BAD_CAST "MaximumValue");
+		int nci=0;
+		for(nci=0;nci<strlen(pToken)-1;nci++){
+		  tmpStr[nci]=pToken[nci];
 		}
 	      }
+	      xmlAddChild(nc7,xmlNewText(BAD_CAST tmpStr));
+	      free(tmpStr);
+	      xmlAddChild(nc8,nc7);
+	      nci0++;
+	      pToken = strtok(NULL,",");
+	    }		    
+	    if(getMap(tmp1,"rangeSpacing")==NULL){
+	      nc7 = xmlNewNode(ns_ows, BAD_CAST "Spacing");
+	      xmlAddChild(nc7,xmlNewText(BAD_CAST "1"));
+	      xmlAddChild(nc8,nc7);
 	    }
-	  tmp1=tmp1->next;
-	  if(datatype!=2){
-	    if(hasUOM==true){
-	      xmlAddChild(nc4,nc5);
-	      xmlAddChild(nc3,nc4);
+	    free(orig);
+	  }else{
+	    
+	    tmp0=getMap(tmp1,"rangeMin");
+	    if(tmp0!=NULL){
+	      nc7 = xmlNewNode(ns_ows, BAD_CAST "MinimumValue");
+	      xmlAddChild(nc7,xmlNewText(BAD_CAST tmp0->value));
+	      xmlAddChild(nc8,nc7);
+	    }else{
+	      nc7 = xmlNewNode(ns_ows, BAD_CAST "MinimumValue");
+	      xmlAddChild(nc8,nc7);
 	    }
+	    tmp0=getMap(tmp1,"rangeMax");
+	    if(tmp0!=NULL){
+	      nc7 = xmlNewNode(ns_ows, BAD_CAST "MaximumValue");
+	      xmlAddChild(nc7,xmlNewText(BAD_CAST tmp0->value));
+	      xmlAddChild(nc8,nc7);
+	    }else{
+	      nc7 = xmlNewNode(ns_ows, BAD_CAST "MaximumValue");
+	      xmlAddChild(nc8,nc7);
+	    }
+	    tmp0=getMap(tmp1,"rangeSpacing");
+	    if(tmp0!=NULL){
+	      nc7 = xmlNewNode(ns_ows, BAD_CAST "Spacing");
+	      xmlAddChild(nc7,xmlNewText(BAD_CAST tmp0->value));
+	      xmlAddChild(nc8,nc7);
+	    }
+	    tmp0=getMap(tmp1,"rangeClosure");
+	    if(tmp0!=NULL){
+	      char *tmp="closed";
+	      if(strcasecmp(tmp0->value,"co")==0)
+		tmp="closed-open";
+	      else
+		if(strcasecmp(tmp0->value,"oc")==0)
+		  tmp="open-closed";
+		else
+		  if(strcasecmp(tmp0->value,"o")==0)
+		    tmp="open";
+	      xmlNewNsProp(nc8,ns_ows,BAD_CAST "rangeClosure",BAD_CAST tmp);
+	    }else
+	      xmlNewNsProp(nc8,ns_ows,BAD_CAST "rangeClosure",BAD_CAST "closed");
+	  }
+	  if(_tmp0==NULL){
+	    xmlAddChild(nc6,nc8);
+	    _tmp0=e->supported;
+	    tmp1=_tmp0->content;
+	    goto doRange;
 	  }else{
-	    xmlAddChild(nc3,nc5);
-	  }
-	  if(strncmp(type,"Input",5)==0){
-	    if(datatype==1 && isAnyValue==1 && default1>0){
-	      xmlAddChild(nc3,nc7);
+	    _tmp0=_tmp0->next;
+	    if(_tmp0!=NULL){
+	      xmlAddChild(nc6,nc8);
+	      tmp1=_tmp0->content;
+	      goto doRange;
 	    }
 	  }
-	 
-	}
-      if(strncmp(type,"Input",5)==0){
-	if(datatype==1 && isAnyValue==1 && avcnt==0){
-	  xmlAddChild(nc3,xmlNewNode(ns_ows, BAD_CAST "AnyValue"));
-	  hasDefault=true;
-	  avcnt++;
-	}
-      }
+	  xmlAddChild(nc6,nc8);
+	  xmlAddChild(nc3,nc6);
+	  isAnyValue=-1;
+	}
+	
+      }
+    
       
+    int avcnt=0;
+    int dcnt=0;
+    int oI=0;
+    for(oI=0;oI<13;oI++)
+      if((tmp1=getMap(_tmp->content,orderedFields[oI]))!=NULL){
+#ifdef DEBUG
+	printf("DATATYPE DEFAULT ? %s\n",tmp1->name);
+#endif
+	if(strcmp(tmp1->name,"asReference")!=0 &&
+	   strncasecmp(tmp1->name,"DataType",8)!=0 &&
+	   strcasecmp(tmp1->name,"extension")!=0 &&
+	   strcasecmp(tmp1->name,"value")!=0 &&
+	   strcasecmp(tmp1->name,"AllowedValues")!=0 &&
+	   strncasecmp(tmp1->name,"range",5)!=0){
+	  if(datatype!=1){
+	    char *tmp2=zCapitalize1(tmp1->name);
+	    nc9 = xmlNewNode(NULL, BAD_CAST tmp2);
+	    free(tmp2);
+	  }
+	  else{
+	    char *tmp2=zCapitalize(tmp1->name);
+	    nc9 = xmlNewNode(ns_ows, BAD_CAST tmp2);
+	    free(tmp2);
+	  }
+	  xmlAddChild(nc9,xmlNewText(BAD_CAST tmp1->value));
+	  xmlAddChild(nc5,nc9);
+	  if(strcasecmp(tmp1->name,"uom")==0)
+	    hasUOM1=true;
+	  hasUOM=true;
+	}else 
+	  
+	  tmp1=tmp1->next;
+      }
+    
+    
+      if(datatype!=2){
+	if(hasUOM==true){
+	  xmlAddChild(nc4,nc5);
+	  xmlAddChild(nc3,nc4);
+	}else{
+	  if(hasUOM1==false){
+	    xmlFreeNode(nc5);
+	    if(datatype==1)
+	      xmlFreeNode(nc4);
+	  }
+	}
+      }else{
+	xmlAddChild(nc3,nc5);
+      }
+      
+      if(datatype!=1 && default1<0){
+	xmlFreeNode(nc5);
+	if(datatype!=2)
+	  xmlFreeNode(nc4);
+      }
+
       map* metadata=e->metadata;
       xmlNodePtr n;
@@ -1209,16 +1234,18 @@
 
       while(metadata!=NULL){
-	nc6=xmlNewNode(ns_ows, BAD_CAST "MetaData");
+	nc6=xmlNewNode(ns_ows, BAD_CAST "Metadata");
 	xmlNewNsProp(nc6,ns_xlink,BAD_CAST metadata->name,BAD_CAST metadata->value);
 	xmlAddChild(nc2,nc6);
 	metadata=metadata->next;
       }
+
     }
 
     _tmp=e->supported;
-    if(_tmp==NULL && (getMap(e->defaults->content,"uom")!=NULL || datatype!=1))
+    if(_tmp==NULL && datatype!=1)
       _tmp=e->defaults;
 
     int hasSupported=-1;
+
     while(_tmp!=NULL){
       if(hasSupported<0){
@@ -1241,4 +1268,5 @@
 #endif
 	  if(strcmp(tmp1->name,"asReference")!=0 && 
+	     strcmp(tmp1->name,"value")!=0 && 
 	     strcmp(tmp1->name,"DataType")!=0 &&
 	     strcasecmp(tmp1->name,"extension")!=0){
@@ -1258,5 +1286,4 @@
 	      while(tmps){
 		xmlAddChild(nc6,xmlNewText(BAD_CAST tmps));
-		xmlAddChild(nc5,nc6);
 		tmps=strtok_r(NULL,",",&tmpv);
 		if(tmps){
@@ -1269,34 +1296,71 @@
 	    else{
 	      xmlAddChild(nc6,xmlNewText(BAD_CAST tmp1->value));
-	      xmlAddChild(nc5,nc6);
 	    }
+	    xmlAddChild(nc5,nc6);
 	  }
 	  tmp1=tmp1->next;
 	}
       if(hasSupported<=0){
-	if(datatype!=2){
+	if(datatype==0){
 	  xmlAddChild(nc4,nc5);
 	  xmlAddChild(nc3,nc4);
-	}else
-	  xmlAddChild(nc3,nc5);
+	}else{
+	  if(datatype!=1)
+	    xmlAddChild(nc3,nc5);
+	}
 	hasSupported=1;
       }
       else
-	if(datatype!=2){
+	if(datatype==0){
 	  xmlAddChild(nc4,nc5);
+	  xmlAddChild(nc3,nc4);
 	}
 	else
-	  xmlAddChild(nc3,nc5);
+	  if(datatype!=1)
+	    xmlAddChild(nc3,nc5);
+
       _tmp=_tmp->next;
     }
+
+    if(hasSupported==0){
+      if(datatype==0)
+	xmlFreeNode(nc4);
+      xmlFreeNode(nc5);
+    }
+
+    _tmp=e->defaults;
+    if(datatype==1 && hasUOM1==true){
+      xmlAddChild(nc4,nc5);
+      xmlAddChild(nc3,nc4);
+    }
+
+    if(datatype==1 &&
+       getMap(_tmp->content,"AllowedValues")==NULL &&
+       getMap(_tmp->content,"range")==NULL &&
+       getMap(_tmp->content,"rangeMin")==NULL &&
+       getMap(_tmp->content,"rangeMax")==NULL &&
+       getMap(_tmp->content,"rangeClosure")==NULL ){
+      tmp1=getMap(_tmp->content,"dataType");
+      if(tmp1!=NULL)
+	if(strcasecmp(tmp1->value,"boolean")==0){
+	  nc6 = xmlNewNode(ns_ows, BAD_CAST "AllowedValues");
+	  nc7 = xmlNewNode(ns_ows, BAD_CAST "Value");
+	  xmlAddChild(nc7,xmlNewText(BAD_CAST "true"));
+	  xmlAddChild(nc6,nc7);
+	  nc7 = xmlNewNode(ns_ows, BAD_CAST "Value");
+	  xmlAddChild(nc7,xmlNewText(BAD_CAST "false"));
+	  xmlAddChild(nc6,nc7);
+	  xmlAddChild(nc3,nc6);
+	}
+      xmlAddChild(nc3,xmlNewNode(ns_ows, BAD_CAST "AnyValue"));
+    }
+    
+    if((tmp1=getMap(_tmp->content,"value"))!=NULL){
+      nc7 = xmlNewNode(NULL, BAD_CAST "DefaultValue");
+      xmlAddChild(nc7,xmlNewText(BAD_CAST tmp1->value));
+      xmlAddChild(nc3,nc7);
+    }
+    
     xmlAddChild(nc2,nc3);
-    
-    if(datatype!=2 && hasUOM==true){
-      xmlAddChild(nc3,nc4);
-      xmlAddChild(nc2,nc3);
-    }/*else if(datatype!=2){
-      if(hasDefault!=true && strncmp(type,"Input",5)==0 && isAnyValue==1)
-	xmlAddChild(nc3,xmlNewNode(ns_ows, BAD_CAST "AnyValue"));
-	}*/
     
     xmlAddChild(nc1,nc2);
@@ -1568,4 +1632,5 @@
       freeMap(&errormap);
       free(errormap);
+      xmlFreeDoc(doc);
       xmlCleanupParser();
       zooXmlCleanupNs();
@@ -1800,5 +1865,5 @@
 			       NULL,NULL, 0);
 	testMap=getMap(m->content,"Reference");
-	loadRemoteFile(m,m->content,hInternet,testMap->value);
+	loadRemoteFile(&m,&m->content,hInternet,testMap->value);
 	InternetCloseHandle(hInternet);
       }
@@ -1997,5 +2062,6 @@
   xmlCleanupParser();
   zooXmlCleanupNs();
-  setMapInMaps(m,"lenv","hasPrinted","true");
+  if(m!=NULL)
+    setMapInMaps(m,"lenv","hasPrinted","true");
 }
 
@@ -2766,4 +2832,8 @@
 #endif
     FILE* fo=fopen(fname,"w+");
+    if(fo==NULL){
+      fprintf (stderr, "Failed to open %s for writting: %s\n",fname, strerror(errno));
+      return;
+    }
     fwrite(content,sizeof(char),length,fo);
     fclose(fo);
@@ -2807,8 +2877,8 @@
  * Try to load file from cache or download a remote file if not in cache
  */
-int loadRemoteFile(maps* m,map* content,HINTERNET hInternet,char *url){
+int loadRemoteFile(maps** m,map** content,HINTERNET hInternet,char *url){
   HINTERNET res;
   char* fcontent;
-  char* cached=isInCache(m,url);
+  char* cached=isInCache(*m,url);
   char *mimeType=NULL;
   int fsize;
@@ -2838,5 +2908,5 @@
     fcontent=(char*)malloc((res.nDataLen+1)*sizeof(char));
     if(fcontent == NULL){
-      return errorException(m, _("Unable to allocate memory."), "InternalError",NULL);
+      return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL);
     }
     size_t dwRead;
@@ -2847,9 +2917,9 @@
   }
   if(fsize==0){
-    return errorException(m, _("Unable to download the file."), "InternalError",NULL);
+    return errorException(*m, _("Unable to download the file."), "InternalError",NULL);
   }
 
   if(mimeType!=NULL){
-    addToMap(content,"fmimeType",mimeType);
+    addToMap(*content,"fmimeType",mimeType);
   }
 
@@ -2865,7 +2935,7 @@
   char ltmp1[256];
   sprintf(ltmp1,"%d",fsize);
-  addToMap(content,"size",ltmp1);
+  addToMap(*content,"size",ltmp1);
   if(cached==NULL)
-    addToCache(m,url,fcontent,mimeType,fsize);
+    addToCache(*m,url,fcontent,mimeType,fsize);
   else{
     free(fcontent);
@@ -2965,2 +3035,40 @@
 }
 
+
+int updateStatus( maps* conf, const int percentCompleted, const char* message ){
+  char tmp[4];
+  snprintf(tmp,4,"%d",percentCompleted);
+  setMapInMaps( conf, "lenv", "status", tmp );
+  setMapInMaps( conf, "lenv", "message", message);
+  return _updateStatus( conf );
+}
+
+char* getInputValue( maps* inputs, const char* parameterName, size_t* numberOfBytes){
+  map* res=getMapFromMaps(inputs,parameterName,"value");
+  if(res!=NULL){
+    map* size=getMapFromMaps(inputs,parameterName,"size");
+    if(size!=NULL){
+      *numberOfBytes=(size_t)atoi(size->value);
+      return res->value;
+    }else{
+      *numberOfBytes=strlen(res->value);
+      return res->value;
+    }
+  }
+  return NULL;
+}
+
+int  setOutputValue( maps* outputs, const char* parameterName, char* data, size_t numberOfBytes ){
+  if(numberOfBytes==-1){
+    setMapInMaps(outputs,parameterName,"value",data);
+  }else{
+    char size[1024];
+    map* tmp=getMapFromMaps(outputs,parameterName,"value");
+    free(tmp->value);
+    tmp->value=(char*) malloc((numberOfBytes+1)*sizeof(char));
+    memcpy(tmp->value,data,numberOfBytes);
+    sprintf(size,"%d",numberOfBytes);
+    setMapInMaps(outputs,parameterName,"size",size);
+  }
+  return 0;
+}
Index: trunk/zoo-project/zoo-kernel/service_internal.h
===================================================================
--- trunk/zoo-project/zoo-kernel/service_internal.h	(revision 470)
+++ trunk/zoo-project/zoo-kernel/service_internal.h	(revision 471)
@@ -31,4 +31,5 @@
 #define TIME_SIZE 40
 
+#include "fcgi_stdio.h"
 #include <libintl.h>
 #include <locale.h>
@@ -96,5 +97,5 @@
   void printHeaders(maps*);
   void unhandleStatus(maps*);
-  void updateStatus(maps*);
+  int _updateStatus(maps*);
   char* getStatus(int);
 
@@ -143,5 +144,5 @@
   void addToCache(maps*,char*,char*,char*,int);
   char* isInCache(maps*,char*);
-  int loadRemoteFile(maps*,map*,HINTERNET,char*);
+  int loadRemoteFile(maps**,map**,HINTERNET,char*);
 
 #ifdef USE_MS
@@ -149,4 +150,7 @@
 #endif
   void parseIdentifier(maps*,char*,char*,char*);
+  int updateStatus( maps*,const int,const char*);
+  char* getInputValue( maps*,const char*,size_t*);
+  int  setOutputValue( maps*, const char*, char*, size_t);
 
 #ifdef __cplusplus
Index: trunk/zoo-project/zoo-kernel/service_internal_js.c
===================================================================
--- trunk/zoo-project/zoo-kernel/service_internal_js.c	(revision 470)
+++ trunk/zoo-project/zoo-kernel/service_internal_js.c	(revision 471)
@@ -39,5 +39,7 @@
   for(i=0;i<argc;i++){
     JSString* jsmsg = JS_ValueToString(cx,argv[i]);
-    fprintf(stderr,"[ZOO-API:JS] %s\n",JS_EncodeString(cx,jsmsg));
+    char *tmp=JS_EncodeString(cx,jsmsg);
+    fprintf(stderr,"[ZOO-API:JS] %s\n",tmp);
+    free(tmp);
   }
   JS_MaybeGC(cx);
@@ -69,4 +71,5 @@
 #endif
     JSObject *api_script1=loadZooApiFile(cx,JS_GetGlobalObject(cx),api0);
+    free(api0);
   }
   JS_MaybeGC(cx);
@@ -158,4 +161,5 @@
 #endif
   JSObject *api_script1=loadZooApiFile(cx,global,api0);
+  free(api0);
   fflush(stderr);
 
@@ -166,4 +170,5 @@
 #endif
   JSObject *api_script2=loadZooApiFile(cx,global,api1);
+  free(api1);
   fflush(stderr);
 
@@ -183,5 +188,5 @@
   struct stat file_status;
   stat(filename, &file_status);
-  char *source=(char*)malloc(file_status.st_size);
+  //char *source=(char*)malloc(file_status.st_size);
   uint16 lineno;
   jsval rval;
@@ -194,12 +199,17 @@
     char tmp1[1024];
     sprintf(tmp1,"Unable to load JavaScript file %s",filename);
+    free(filename);
     map* err=createMap("text",tmp1);
-    addMapToMap(&err,createMap("code","NoApplicableCode"));
+    addToMap(err,"code","NoApplicableCode");
     printExceptionReportResponse(mc,err);
+    freeMap(&err);
+    free(err);
+    JS_MaybeGC(cx);
     JS_DestroyContext(cx);
     JS_DestroyRuntime(rt);
     JS_ShutDown();
-    exit(-1);
-  }
+    return -1;
+  }
+  
 
   /* Call a function in obj's scope. */
@@ -243,9 +253,11 @@
     freeMap(&err);
     free(err);
+    free(filename);
+    JS_MaybeGC(cx);
     JS_DestroyContext(cx);
     JS_DestroyRuntime(rt);
     JS_ShutDown();
     // Should return -1 here but the unallocation won't work from zoo_service_loader.c line 1847
-    exit(-1);
+    return -1;
   }
 
@@ -344,4 +356,5 @@
   JS_DestroyRuntime(rt);
   JS_ShutDown();
+  free(filename);
 #ifdef JS_DEBUG
   fprintf(stderr,"Returned value %d\n",res);
@@ -481,17 +494,18 @@
 	jsmsg = JS_ValueToString(cx,vp);
 	len1 = JS_GetStringLength(jsmsg);
-
+	
+	tmp=JS_EncodeString(cx,jsmsg);
 	tres=(maps*)malloc(MAPS_SIZE);
-	tres->name=zStrdup(JS_EncodeString(cx,jsmsg));
+	tres->name=zStrdup(tmp);
 	tres->content=NULL;
 	tres->next=NULL;
 
 	jsval nvp=JSVAL_NULL;
-	if((JS_GetProperty(cx, tt, JS_EncodeString(cx,jsmsg), &nvp)==JS_FALSE)){
-#ifdef JS_DEBUG
-	  fprintf(stderr,"Enumerate id : %d => %s => No more value\n",oi,JS_EncodeString(cx,jsmsg));
+	if((JS_GetProperty(cx, tt, tmp, &nvp)==JS_FALSE)){
+#ifdef JS_DEBUG
+	  fprintf(stderr,"Enumerate id : %d => %s => No more value\n",oi,tmp);
 #endif
 	}
-	
+	free(tmp);
 	JSObject *nvp1=JSVAL_TO_OBJECT(JSVAL_NULL);
 	JS_ValueToObject(cx,nvp,&nvp1);
@@ -510,4 +524,5 @@
 		
       }
+      JS_DestroyIdArray(cx,idp);
     }
   }
@@ -550,14 +565,15 @@
 	jsmsg = JS_ValueToString(cx,vp);
 	len1 = JS_GetStringLength(jsmsg);
-#ifdef JS_DEBUG
-	fprintf(stderr,"Enumerate id : %d => %s\n",oi,JS_EncodeString(cx,jsmsg));
+	tmp=JS_EncodeString(cx,jsmsg);
+#ifdef JS_DEBUG
+	fprintf(stderr,"Enumerate id : %d => %s\n",oi,tmp);
 #endif
 	jsval nvp=JSVAL_NULL;
-	if((JS_GetProperty(cx, JSVAL_TO_OBJECT(tmp1), JS_EncodeString(cx,jsmsg), &nvp)==JS_FALSE)){
-#ifdef JS_DEBUG
-	  fprintf(stderr,"Enumerate id : %d => %s => No more value\n",oi,JS_EncodeString(cx,jsmsg));
+	if((JS_GetProperty(cx, JSVAL_TO_OBJECT(tmp1), tmp, &nvp)==JS_FALSE)){
+#ifdef JS_DEBUG
+	  fprintf(stderr,"Enumerate id : %d => %s => No more value\n",oi,tmp);
 #endif
 	}
-	
+	free(tmp);
 	if(JSVAL_IS_OBJECT(nvp)){
 #ifdef JS_DEBUG
@@ -571,24 +587,29 @@
 	if(JSVAL_IS_OBJECT(nvp1j)){
 	  JSString *jsmsg1;
+	  char *tmp1, *tmp2;
 	  JSObject *nvp2=JSVAL_TO_OBJECT(JSVAL_NULL);
 	  jsmsg1 = JS_ValueToString(cx,nvp1j);
 	  len1 = JS_GetStringLength(jsmsg1);
-#ifdef JS_DEBUG
-	  fprintf(stderr,"JSVAL NVP1J IS OBJECT %s = %s\n",JS_EncodeString(cx,jsmsg),JS_EncodeString(cx,jsmsg1));
-#endif
-	  if(strcasecmp(JS_EncodeString(cx,jsmsg1),"[object Object]")==0){
-	    tres->name=zStrdup(JS_EncodeString(cx,jsmsg));
+	  tmp1=JS_EncodeString(cx,jsmsg1);
+	  tmp2=JS_EncodeString(cx,jsmsg);
+#ifdef JS_DEBUG
+	  fprintf(stderr,"JSVAL NVP1J IS OBJECT %s = %s\n",JS_EncodeString(cx,jsmsg),tmp1);
+#endif
+	  if(strcasecmp(tmp1,"[object Object]")==0){
+	    tres->name=zStrdup(tmp2);
 	    tres->content=mapFromJSObject(cx,nvp1j);
 	  }
 	  else
-	    if(strcasecmp(JS_EncodeString(cx,jsmsg),"name")==0){
-	      tres->name=zStrdup(JS_EncodeString(cx,jsmsg1));
+	    if(strcasecmp(tmp2,"name")==0){
+	      tres->name=zStrdup(tmp1);
 	    }
 	    else{
 	      if(tres->content==NULL)
-		tres->content=createMap(JS_EncodeString(cx,jsmsg),JS_EncodeString(cx,jsmsg1));
+		tres->content=createMap(tmp2,tmp1);
 	      else
-		addToMap(tres->content,JS_EncodeString(cx,jsmsg),JS_EncodeString(cx,jsmsg1));
+		addToMap(tres->content,tmp2,tmp1);
 	    }
+	  free(tmp1);
+	  free(tmp2);
 	}
 #ifdef JS_DEBUG
@@ -607,5 +628,5 @@
       free(tres);
       tres=NULL;
-
+      JS_DestroyIdArray(cx,idp);
     }
   }
@@ -633,5 +654,5 @@
       JSString* str; 
       JS_IdToValue(cx,id,&vp);
-      char *c, *tmp;
+      char *c, *tmp, *tmp1;
       JSString *jsmsg,*jsmsg1;
       size_t len,len1;
@@ -639,24 +660,29 @@
       len = JS_GetStringLength(jsmsg);
       jsval nvp;
-      JS_GetProperty(cx, JSVAL_TO_OBJECT(t), JS_EncodeString(cx,jsmsg), &nvp);
+      tmp=JS_EncodeString(cx,jsmsg);
+      JS_GetProperty(cx, JSVAL_TO_OBJECT(t), tmp, &nvp);
       jsmsg1 = JS_ValueToString(cx,nvp);
       len1 = JS_GetStringLength(jsmsg1);
-#ifdef JS_DEBUG
-      fprintf(stderr,"Enumerate id : %d [ %s => %s ]\n",index,JS_EncodeString(cx,jsmsg),JS_EncodeString(cx,jsmsg1));
+      tmp1=JS_EncodeString(cx,jsmsg1);
+#ifdef JS_DEBUG
+      fprintf(stderr,"Enumerate id : %d [ %s => %s ]\n",index,tmp,tmp1);
 #endif
       if(res!=NULL){
 #ifdef JS_DEBUG
-	fprintf(stderr,"%s - %s\n",JS_EncodeString(cx,jsmsg),JS_EncodeString(cx,jsmsg1));
-#endif
-	addToMap(res,JS_EncodeString(cx,jsmsg),JS_EncodeString(cx,jsmsg1));
+	fprintf(stderr,"%s - %s\n",tmp,tmp1);
+#endif
+	addToMap(res,tmp,tmp1);
       }
       else{
-	res=createMap(JS_EncodeString(cx,jsmsg),JS_EncodeString(cx,jsmsg1));
+	res=createMap(tmp,tmp1);
 	res->next=NULL;
       }
+      free(tmp);
+      free(tmp1);
 #ifdef JS_DEBUG
       dumpMap(res);
 #endif
     }
+    JS_DestroyIdArray(cx,idp);
   }
 #ifdef JS_DEBUG
Index: trunk/zoo-project/zoo-kernel/service_internal_python.c
===================================================================
--- trunk/zoo-project/zoo-kernel/service_internal_python.c	(revision 470)
+++ trunk/zoo-project/zoo-kernel/service_internal_python.c	(revision 471)
@@ -389,14 +389,18 @@
 	PyObject* value=PyString_FromStringAndSize(tmp->value,atoi(size->value));
 	if(PyDict_SetItem(res,name,value)<0){
+	  Py_DECREF(value);
 	  fprintf(stderr,"Unable to set key value pair...");
 	  return NULL;
 	}
+	Py_DECREF(value);
       }
       else{
 	PyObject* value=PyString_FromString(tmp->value);
 	if(PyDict_SetItem(res,name,value)<0){
+	  Py_DECREF(value);
 	  fprintf(stderr,"Unable to set key value pair...");
 	  return NULL;
 	}
+	Py_DECREF(value);
       }
     }
@@ -405,7 +409,9 @@
 	PyObject* value=PyString_FromString(tmp->value);
 	if(PyDict_SetItem(res,name,value)<0){
+	  Py_DECREF(value);
 	  fprintf(stderr,"Unable to set key value pair...");
 	  return NULL;
 	}
+	Py_DECREF(value);
       }
     }
@@ -446,4 +452,5 @@
     free(cursor->content);
     free(cursor);
+    Py_DECREF(key);
 #ifdef DEBUG
     dumpMaps(res);
@@ -489,13 +496,17 @@
       addToMap(res,"size",sin);
     }else{
+      char* lkey=PyString_AsString(key);
+      char* lvalue=PyString_AsString(value);
       if(res!=NULL){
 	if(PyString_Size(value)>0)
-	  addToMap(res,PyString_AsString(key),PyString_AsString(value));
+	  addToMap(res,lkey,lvalue);
       }
       else{
 	if(PyString_Size(value)>0)
-	  res=createMap(PyString_AsString(key),PyString_AsString(value));
-      }
-    }
+	  res=createMap(lkey,lvalue);
+      }
+    }
+    Py_DECREF(value);
+    Py_DECREF(key);
   }
   return res;
@@ -554,5 +565,5 @@
     else
       setMapInMaps(conf,"lenv","status","15");
-    updateStatus(conf);
+    _updateStatus(conf);
   }
   freeMaps(&conf);
Index: trunk/zoo-project/zoo-kernel/ulinet.c
===================================================================
--- trunk/zoo-project/zoo-kernel/ulinet.c	(revision 470)
+++ trunk/zoo-project/zoo-kernel/ulinet.c	(revision 471)
@@ -170,23 +170,24 @@
   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,5 +207,5 @@
   }
   if(handle.handle)
-    curl_share_cleanup(handle.handle);
+    curl_easy_cleanup(handle.handle);
   curl_global_cleanup();
 }
@@ -222,6 +223,6 @@
     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,6 +237,6 @@
     
       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,16 +251,16 @@
 #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,5 +274,5 @@
   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;
Index: trunk/zoo-project/zoo-kernel/ulinet.h
===================================================================
--- trunk/zoo-project/zoo-kernel/ulinet.h	(revision 470)
+++ trunk/zoo-project/zoo-kernel/ulinet.h	(revision 471)
@@ -26,5 +26,5 @@
 #define _ULINET_H
 
-#include "stdio.h"
+#include "fcgi_stdio.h"
 #include <stdlib.h>
 #include <fcntl.h>
Index: trunk/zoo-project/zoo-kernel/zoo_service_loader.c
===================================================================
--- trunk/zoo-project/zoo-kernel/zoo_service_loader.c	(revision 470)
+++ trunk/zoo-project/zoo-kernel/zoo_service_loader.c	(revision 471)
@@ -504,4 +504,6 @@
       printExceptionReportResponse(m,tmps1);
       *eres=-1;
+      freeMap(&tmps1);
+      free(tmps1);
     }
   }
@@ -683,5 +685,5 @@
   _getcwd(ntmp,1024);
 #endif
-  r_inputs=getMapOrFill(request_inputs,"metapath","");
+  r_inputs=getMapOrFill(&request_inputs,"metapath","");
 
 
@@ -783,4 +785,8 @@
     freeMaps(&m);
     free(m);
+    if(request_inputs!=NULL){
+      freeMap(&request_inputs);
+      free(request_inputs);
+    }
     return 1;
   }
@@ -972,4 +978,5 @@
 	    setMapInMaps(m,"lenv","level","0");
 	  }
+	  free(corig);
 	  
 	  memset(buff,0,256);
@@ -1395,5 +1402,5 @@
 #endif
 		{
-		  if(loadRemoteFile(m,tmpmaps->content,hInternet,tmpx2)<0){
+		  if(loadRemoteFile(&m,&tmpmaps->content,hInternet,tmpx2)<0){
 		    freeMaps(&m);
 		    free(m);
@@ -1557,5 +1564,5 @@
 		  if(!(ltmp!=NULL && strncmp(ltmp->value,"POST",4)==0)
 		     && CHECK_INET_HANDLE(hInternet)){
-		    if(loadRemoteFile(m,tmpmaps->content,hInternet,(char*)val)!=0){
+		    if(loadRemoteFile(&m,&tmpmaps->content,hInternet,(char*)val)!=0){
 		      freeMaps(&m);
 		      free(m);