Changeset 253 for trunk

Timestamp:

Jun 29, 2011, 1:21:51 PM (13 years ago)

Author:

djay

Message:

Fix FastCGI support. Small fix to store mapon disk and manage session. Fix typo in main.cfg.

Location:

trunk/zoo-kernel

Files:

• main.cfg (modified) (2 diffs)
• service.h (modified) (1 diff)
• service_internal.h (modified) (1 diff)
• zoo_service_loader.c (modified) (1 diff)

trunk/zoo-kernel/main.cfg

@@ -6 +6 @@
 tmpPath=/YourFullTmpPathHere/
 tmpUrl = ../TmpPathRelativeToServerAdress/
+dataPath = /YouFullDataPathHere/
 
 [identification]
@@ -20 +21 @@
 positionName=Developer
 role=Dev
-adressDeliveryPoint=1280, avenue des Platanes
+addressDeliveryPoint=1280, avenue des Platanes
 addressCity=Lattes
 addressAdministrativeArea=False

trunk/zoo-kernel/service.h

@@ -124 +124 @@
     map* tmp=t;
     while(tmp!=NULL){
-      fprintf(file,"%s = %s\n",t->name,t->value);
+      fprintf(file,"%s = %s\n",tmp->name,tmp->value);
       tmp=tmp->next;
     }

trunk/zoo-kernel/service_internal.h

@@ -57 +57 @@
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
+
+#include "cgic.h"
 
 extern   int getServiceFromFile(const char*,service**);

trunk/zoo-kernel/zoo_service_loader.c

@@ -1812 +1812 @@
     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;