Changeset 268 for branches/branch-1.2/zoo-kernel/zoo_service_loader.c

Timestamp:

Jul 16, 2011, 12:58:47 PM (13 years ago)

Author:

djay

Message:

Merge branch-1.2 to current rev. 267. Tag release-1.2.0-rc2.

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-kernel/zoo_service_loader.c (modified) (3 diffs)

branches/branch-1.2/zoo-kernel/zoo_service_loader.c

@@ -675 +675 @@
 #endif
         while ((dp = readdir(dirp)) != NULL)
-          if(strcmp(dp->d_name,buff)==0){
+          if((strcasecmp("all.zcfg",buff)==0 && strstr(dp->d_name,".zcfg")>0)
+             || strcasecmp(dp->d_name,buff)==0){
             memset(buff1,0,1024);
             snprintf(buff1,1024,"%s/%s",conf_dir,dp->d_name);
@@ -764 +765 @@
     return 0;
   }
-  //close(saved_stdout);
+  close(saved_stdout);
 
 #ifdef DEBUG
@@ -1812 +1813 @@
     if(tmpPath==NULL)
       tmpPath=getMapFromMaps(m,"main","tmpPath");
-    sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(cgiCookie,"=")+1);
+    char *tmp1=strtok(cgiCookie,";");
+    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);
+
     maps *tmpSess=(maps*)calloc(1,MAPS_SIZE);
     struct stat file_status;
     int istat = stat(session_file_path, &file_status);
-    if(istat==0){
+    if(istat==0 && file_status.st_size>0){
       conf_read(session_file_path,tmpSess);
       dumpMaps(tmpSess);