Changeset 509 for trunk/zoo-project/zoo-kernel/service_internal_php.c

Timestamp:

Oct 9, 2014, 7:25:52 PM (10 years ago)

Author:

djay

Message:

Apply updates of the PHP support and fixes in ulinet provided by Knut Landmark. Fix building issue on GNU/Linux by defining semun.

File:

• trunk/zoo-project/zoo-kernel/service_internal_php.c (modified) (4 diffs)

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

@@ -25 +25 @@
 #include "service_internal_php.h"
 
+#include <sapi/embed/php_embed.h>
+#include <zend_stream.h>
+
 #ifdef ZTS
 void ***tsrm_ls;
 #endif
 
+zval *php_Array_from_maps(maps* t);
+zval*  php_Array_from_map(map*);
+maps* php_maps_from_Array(HashTable* t);
+map* php_map_from_HasTable(HashTable* t);
+
 int zoo_php_support(maps** main_conf,map* request,service* s,maps **real_inputs,maps **real_outputs){
-  fprintf(stderr,"STARING PHP SCRIPT\n");
   maps* m=*main_conf;
   maps* inputs=*real_inputs;
@@ -111 +118 @@
   tres=array_init(mapArray);
   while(tmp!=NULL){
-    map* sMap=getMapArray(tmp,"size",i);
+    map* sMap=getMapArray(tmp,"size",0);
     if(strncmp(tmp->name,"value",5)==0 && sMap!=NULL){
       tres=add_assoc_stringl(mapArray,tmp->name,tmp->value,atoi(sMap->value),1);
@@ -216 +223 @@
     INIT_PZVAL(&tmpcopy); 
     convert_to_string(&tmpcopy);
-    if(strncmp(key,"value")==0){
-      len=Z_STRLEN_P(varcopy);
-      addToMapWithSize(final_res,key,Z_STRVAL_P(tmpcopy),len);
+    if(strncmp(key,"value",5)==0){
+      len=Z_STRLEN_P(&tmpcopy);
+      addToMapWithSize(final_res,key,Z_STRVAL_P(&tmpcopy),len);
     }
     else{
@@ -231 +238 @@
         fprintf(stderr,"%s => %s\n",key,Z_STRVAL(tmpcopy));
 #endif
-        addToMap(&final_res,key,Z_STRVAL(tmpcopy));
+        addToMap(final_res,key,Z_STRVAL(tmpcopy));
       }
     }