Changeset 392 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Feb 11, 2013, 1:52:15 PM (11 years ago)

Author:

djay

Message:

Add support for Python-3.3.0. Fix issue with cache handling. Fix issue with Cookie identifier detection.

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (7 diffs)

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

@@ -2 +2 @@
  * Author : Gérald FENOY
  *
- *  Copyright 2008-2012 GeoLabs SARL. All rights reserved.
+ *  Copyright 2008-2013 GeoLabs SARL. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -272 +272 @@
 #endif
 #endif
-
     if( so != NULL ) {
 #ifdef DEBUG
@@ -378 +377 @@
       char* errstr = dlerror();
 #endif
-      sprintf(tmps,_("C Library can't be loaded %s \n"),errstr);
+      sprintf(tmps,_("C Library can't be loaded %s"),errstr);
       map* tmps1=createMap("text",tmps);
       printExceptionReportResponse(m,tmps1);
@@ -1896 +1895 @@
   }
   
-  //if(CHECK_INET_HANDLE(hInternet))
+
+  //  if(CHECK_INET_HANDLE(hInternet))
   InternetCloseHandle(hInternet);
 
@@ -2039 +2039 @@
       ;
 #endif
-          char* toto=(char*)malloc((strlen(mapcs->name)+strlen(mapcs->value)+2)*sizeof(char));
+      char* toto=(char*)malloc((strlen(mapcs->name)+strlen(mapcs->value)+2)*sizeof(char));
       sprintf(toto,"%s=%s",mapcs->name,mapcs->value);
-          putenv(toto);
+      putenv(toto);
 #ifdef DEBUG
       fflush(stderr);
@@ -2111 +2111 @@
       token=strtok_r(cgiCookie,";",&saveptr);
       while(token!=NULL){
-        if(strcasestr(token,"ID")!=NULL){
+        if(strcasestr(token,"ID=")!=NULL){
           if(tcook!=NULL)
             free(tcook);
@@ -2120 +2120 @@
       }
     }else{
-      if(strstr(cgiCookie,"=")!=NULL && strcasestr(cgiCookie,"ID")!=NULL){
+      if(strstr(cgiCookie,"=")!=NULL && strcasestr(cgiCookie,"ID=")!=NULL){
         tcook=strdup(cgiCookie);
         hasValidCookie=1;