Changeset 788 for trunk/zoo-project/zoo-kernel/service_internal.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/service_internal.c (modified) (4 diffs)

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

@@ -147 +147 @@
     }
 
-    FILE* f0 = fopen (fileName, "r");
+    //FILE* f0 = fopen (fileName, "r");
+        // knut: open file in binary mode to avoid conversion of line endings (yielding extra bytes) on Windows platforms
+        FILE* f0 = fopen(fileName, "rb"); 
     if(f0!=NULL){
       fseek (f0, 0, SEEK_END);
@@ -260 +262 @@
  */
 int _updateStatus(maps *conf){
+        
   map* r_inputs = getMapFromMaps (conf, "main", "tmpPath");
   map* sid = getMapFromMaps (conf, "lenv", "usid");
+  
   char* fbkpid =
     (char *)
@@ -272 +276 @@
      strlen(status->value)>0 && strlen(msg->value)>1){    
     semid lockid = NULL;
+        
     char* stat=getStatusId(conf,sid->value);
     if(stat!=NULL){
@@ -291 +296 @@
     }
   }
+
   return 0;
 }