Changeset 527


Ignore:
Timestamp:
Nov 4, 2014, 6:10:32 PM (6 years ago)
Author:
djay
Message:

Fix #106 and #108

Location:
trunk/zoo-project/zoo-kernel
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/Makefile.in

    r518 r527  
    11include ZOOMakefile.opts
    2 
    3 OS:=$(shell uname -s)
    4 ifeq ($(OS),Darwin)
    5         MACOS_LD_FLAGS=-lintl -framework SystemConfiguration -framework CoreFoundation
    6         MACOS_CFLAGS=-arch $(shell uname -m)
    7 endif
    8 
    9 JAVACFLAGS=@JAVA_CPPFLAGS@
    10 JAVALDFLAGS=@JAVA_LDFLAGS@
    11 JAVA_ENABLED=@JAVA_ENABLED@
    12 JAVA_FILE=@JAVA_FILE@
    13 
    14 CFLAGS=@DEB_DEF@ -fpic ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
    15 LDFLAGS=-lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${YAML_LDFLAGS}
    16 
    17 PHPCFLAGS=@PHP_CPPFLAGS@
    18 PHPLDFLAGS=@PHP_LDFLAGS@
    19 PHP_ENABLED=@PHP_ENABLED@
    20 PHP_FILE=@PHP_FILE@
    21 
    22 
    23 PERLCFLAGS=@PERL_CPPFLAGS@
    24 PERLLDFLAGS=@PERL_LDFLAGS@
    25 PERL_ENABLED=@PERL_ENABLED@
    26 PERL_FILE=@PERL_FILE@
    27 
    282
    293all: version.h zoo_loader.cgi ${YAML_FILE1}
  • trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in

    r521 r527  
    5252ZOO_CFLAGS=-I${ZRPATH}/../thirds/cgic206/ -I${ZRPATH}/zoo-kernel/
    5353ZOO_LDFLAGS=-lcrypto
     54
     55JAVACFLAGS=@JAVA_CPPFLAGS@
     56JAVALDFLAGS=@JAVA_LDFLAGS@
     57JAVA_ENABLED=@JAVA_ENABLED@
     58JAVA_FILE=@JAVA_FILE@
     59
     60CFLAGS=@DEB_DEF@ -fpic ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
     61LDFLAGS=-lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${YAML_LDFLAGS}
     62
     63PHPCFLAGS=@PHP_CPPFLAGS@
     64PHPLDFLAGS=@PHP_LDFLAGS@
     65PHP_ENABLED=@PHP_ENABLED@
     66PHP_FILE=@PHP_FILE@
     67
     68
     69PERLCFLAGS=@PERL_CPPFLAGS@
     70PERLLDFLAGS=@PERL_LDFLAGS@
     71PERL_ENABLED=@PERL_ENABLED@
     72PERL_FILE=@PERL_FILE@
  • trunk/zoo-project/zoo-kernel/service_internal_java.c

    r388 r527  
    232232  sprintf(tmps,"%s/%d.ztmp",tmpm->value,getpid());
    233233  FILE* new_stdout=fopen(tmps,"wb+");
     234  if(new_stdout==NULL){
     235    map* err=createMap("text","Unable to run your service, no debug informations can be provided (please verify privileges on tmpPath)");
     236    addToMap(err,"code","InternalError");
     237    printExceptionReportResponse(main_conf,err);
     238    freeMap(&err);
     239    free(err);
     240    return;
     241  }
    234242  fflush(stderr);
    235243  dup2(fileno(new_stdout),fileno(stderr));
     
    634642  return final_res;
    635643}
     644
  • trunk/zoo-project/zoo-kernel/zoo_service_loader.c

    r516 r527  
    267267          dup2(saved_stdout,fileno(stdout));
    268268          errorException(m, tmp01,"InternalError",NULL);
    269           freeMaps(&m);
    270           free(m);
    271269          return -1;
    272270        }
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png