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

Timestamp:

Oct 12, 2011, 1:13:15 PM (13 years ago)

Author:

djay

Message:

Fix tickets #63, #64 and #68

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (1 diff)

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

@@ -1886 +1886 @@
     addToMap(_tmpMaps->content,"soap","false");
   if(cgiCookie!=NULL && strlen(cgiCookie)>0){
-    addToMap(_tmpMaps->content,"sessid",strstr(cgiCookie,"=")+1);
+    char *tcook=strdup(cgiCookie);
+    if(strstr(cgiCookie,";")>0){
+      char *token,*saveptr;
+      token=strtok_r(cgiCookie,";",&saveptr);
+      while(token!=NULL){
+        if(strcasestr(token,"ID")!=NULL){
+          if(tcook!=NULL)
+            free(tcook);
+          tcook=strdup(token);
+        }
+        token=strtok_r(NULL,";",&saveptr);
+      }
+    }
+    addToMap(_tmpMaps->content,"sessid",strstr(tcook,"=")+1);
     char session_file_path[1024];
     map *tmpPath=getMapFromMaps(m,"main","sessPath");
     if(tmpPath==NULL)
       tmpPath=getMapFromMaps(m,"main","tmpPath");
-    char *tmp1=strtok(cgiCookie,";");
+    char *tmp1=strtok(tcook,";");
     if(tmp1!=NULL)
       sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(tmp1,"=")+1);
     else
       sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(cgiCookie,"=")+1);
-
+    free(tcook);
     maps *tmpSess=(maps*)calloc(1,MAPS_SIZE);
     struct stat file_status;