Changeset 527 for trunk/zoo-project

Timestamp:

Nov 4, 2014, 6:10:32 PM (10 years ago)

Author:

djay

Message:

Fix #106 and #108

Location:

trunk/zoo-project/zoo-kernel

Files:

• Makefile.in (modified) (1 diff)
• ZOOMakefile.opts.in (modified) (1 diff)
• service_internal_java.c (modified) (2 diffs)
• zoo_service_loader.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/Makefile.in

@@ -1 +1 @@
 include ZOOMakefile.opts
-
-OS:=$(shell uname -s)
-ifeq ($(OS),Darwin)
-        MACOS_LD_FLAGS=-lintl -framework SystemConfiguration -framework CoreFoundation
-        MACOS_CFLAGS=-arch $(shell uname -m)
-endif
-
-JAVACFLAGS=@JAVA_CPPFLAGS@
-JAVALDFLAGS=@JAVA_LDFLAGS@
-JAVA_ENABLED=@JAVA_ENABLED@
-JAVA_FILE=@JAVA_FILE@
-
-CFLAGS=@DEB_DEF@ -fpic ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
-LDFLAGS=-lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${YAML_LDFLAGS} 
-
-PHPCFLAGS=@PHP_CPPFLAGS@
-PHPLDFLAGS=@PHP_LDFLAGS@
-PHP_ENABLED=@PHP_ENABLED@
-PHP_FILE=@PHP_FILE@
-
-
-PERLCFLAGS=@PERL_CPPFLAGS@
-PERLLDFLAGS=@PERL_LDFLAGS@
-PERL_ENABLED=@PERL_ENABLED@
-PERL_FILE=@PERL_FILE@
-
 
 all: version.h zoo_loader.cgi ${YAML_FILE1}

trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in

@@ -52 +52 @@
 ZOO_CFLAGS=-I${ZRPATH}/../thirds/cgic206/ -I${ZRPATH}/zoo-kernel/
 ZOO_LDFLAGS=-lcrypto
+
+JAVACFLAGS=@JAVA_CPPFLAGS@
+JAVALDFLAGS=@JAVA_LDFLAGS@
+JAVA_ENABLED=@JAVA_ENABLED@
+JAVA_FILE=@JAVA_FILE@
+
+CFLAGS=@DEB_DEF@ -fpic ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
+LDFLAGS=-lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${YAML_LDFLAGS} 
+
+PHPCFLAGS=@PHP_CPPFLAGS@
+PHPLDFLAGS=@PHP_LDFLAGS@
+PHP_ENABLED=@PHP_ENABLED@
+PHP_FILE=@PHP_FILE@
+
+
+PERLCFLAGS=@PERL_CPPFLAGS@
+PERLLDFLAGS=@PERL_LDFLAGS@
+PERL_ENABLED=@PERL_ENABLED@
+PERL_FILE=@PERL_FILE@

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

@@ -232 +232 @@
   sprintf(tmps,"%s/%d.ztmp",tmpm->value,getpid());
   FILE* new_stdout=fopen(tmps,"wb+");
+  if(new_stdout==NULL){
+    map* err=createMap("text","Unable to run your service, no debug informations can be provided (please verify privileges on tmpPath)");
+    addToMap(err,"code","InternalError");
+    printExceptionReportResponse(main_conf,err);
+    freeMap(&err);
+    free(err);
+    return;
+  }
   fflush(stderr);
   dup2(fileno(new_stdout),fileno(stderr));
@@ -634 +642 @@
   return final_res;
 }
+

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

@@ -267 +267 @@
           dup2(saved_stdout,fileno(stdout));
           errorException(m, tmp01,"InternalError",NULL);
-          freeMaps(&m);
-          free(m);
           return -1;
         }