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

Timestamp:

Oct 12, 2016, 3:47:26 PM (8 years ago)

Author:

knut

Message:

Implemented support for PHP 7: The Zend API for PHP 7/PHPNG is substantially different from older versions. Therefore, an alternative implementation of zoo_php_support is provided in the new source file service_internal_php7.c. Presently the Zoo kernel can be built with support for either PHP 7 or older versions, see the makefiles (for Windows) nmake.opt and makefile.vc. Other makefiles have not been updated.

Fixed problem with ambiguous symbol in service_conf.y. Fixed problem with conversion of line endings yielding extra bytes in _getStatusFile on Windows platforms. Removed call to free() stack memory in zoo_service_loader.c. Fixed issue with size of structs in service.h.

File:

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

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

@@ -22 +22 @@
  * THE SOFTWARE.
  */
-
+ 
 extern "C" int yylex ();
 extern "C" int crlex ();
@@ -104 +104 @@
 extern char **environ;
 #endif
+
 
 #ifdef WIN32
@@ -668 +669 @@
       *eres =
         zoo_php_support (&m, request_inputs, s1, &request_input_real_format,
-                         &request_output_real_format);
+                         &request_output_real_format);          
     }
   else
@@ -890 +891 @@
 runRequest (map ** inputs)
 {
-
+ 
 #ifndef USE_GDB
 #ifndef WIN32
@@ -940 +941 @@
 #endif
 #endif
+
   if (conf_read (conf_file, m) == 2)
     {
@@ -1621 +1623 @@
     return 0;
   }
-  
   s1 = NULL;
   s1 = (service *) malloc (SERVICE_SIZE);
@@ -1995 +1996 @@
   dumpMap (request_inputs);
 #endif
-
   int ei = 1;
   char *s = 
@@ -2046 +2046 @@
   }
 #endif
+
   char *fbkp, *fbkpid, *fbkpres, *fbkp1, *flog;
   FILE *f0, *f1;
@@ -2068 +2069 @@
         return -1;
       }
-
       loadServiceAndRun (&m, s1, request_inputs, &request_input_real_format,
                          &request_output_real_format, &eres);
@@ -2124 +2124 @@
             (char *)
             malloc ((strlen (r_inputs->value) +
-                     strlen (usid->value) + 7) * sizeof (char));
+                     strlen (usid->value) + 7) * sizeof (char));                    
           sprintf (fbkpres, "%s/%s.res", r_inputs->value, usid->value);
           bmap = (maps *) malloc (MAPS_SIZE);
@@ -2258 +2258 @@
   dumpMaps (request_output_real_format);
 #endif
+
   if (eres != -1)
     outputResponse (s1, request_input_real_format,
@@ -2263 +2264 @@
                     cpid, m, eres);
   fflush (stdout);
-  
+
   /**
    * Ensure that if error occurs when freeing memory, no signal will return
@@ -2277 +2278 @@
   signal (SIGABRT, donothing);
 #endif
-  
+
   if (((int) getpid ()) != cpid || cgiSid != NULL)
     {
@@ -2288 +2289 @@
       if(dumpBackFinalFile(m,fbkp,fbkp1)<0)
         return -1;
-
       unlink (fbkpid);
       switch(eres){
@@ -2300 +2300 @@
         setMapInMaps(m,"lenv","fstate",wpsStatus[0]);
         break;
-      }
+      }      
 #ifndef RELY_ON_DB
       dumpMapsToFile(bmap,fbkpres,1);
@@ -2313 +2313 @@
       unhandleStatus (m);
       free(fbkpid);
-      free(fbkpres);
-      free (flog);
+      free(fbkpres); 
+      free (flog);           
       free (fbkp1);
-      free (tmps1);
+      // free (tmps1); // tmps1 is stack memory and should not be freed
       if(cgiSid!=NULL)
         free(cgiSid);