Changeset 375 for trunk

Timestamp:

Oct 28, 2012, 2:09:47 PM (12 years ago)

Author:

djay

Message:

Print specific headers when a [headers] section was added to the main.cfg file (can add headers such as X-Powered-By for instance). Handle reading file in cache as binary (solving file size not corresponding for text files).

Location:

trunk/zoo-project/zoo-kernel

Files:

• nmake.opt (modified) (2 diffs)
• service.h (modified) (2 diffs)
• service_internal.c (modified) (3 diffs)
• service_internal.h (modified) (2 diffs)
• ulinet.c (modified) (1 diff)
• zoo_loader.c (modified) (2 diffs)
• zoo_service_loader.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/nmake.opt

@@ -10 +10 @@
 
 !IFDEF MS_DIR
-MS_CFLAGS=-DUSE_MS -I$(MS_DIR) /DNEED_STRCASESTR 
+MS_CFLAGS=-DUSE_MS -I$(MS_DIR)
 MS_LDFLAGS=$(MS_DIR)/mapserver_i.lib
 MS_FILE=service_internal_ms.obj
@@ -36 +36 @@
 PYTHON_CPATH=$(ZOOK_DIR)\..\..\..\Python-2.7.3
 
-CFLAGS=$(CFLAGS1) /nologo /MD /W3 /EHsc /O2 /D_CRT_SECURE_NO_WARNINGS /DWIN32 $(CJFLAGS) -I$(ZOOK_DIR) -I./ $(JAVA_CFLAGS) $(MS_CFLAGS) -I$(TROOT)\..\..\thirds\dirent-win32 -I$(INTL_DIR) -I$(CURL_DIR)\include -I$(XML2_DIR)\include -I$(GDAL_DIR)\port $(JS_CFLAGS) -I$(GDAL_DIR)\ogr -I$(GDAL_DIR)\gcore -I$(GD_DIR) -I$(ICONV_DIR) -I$(TROOT)\..\..\thirds\include -I$(TROOT)\..\..\thirds\cgic206 -I$(PYTHON_CPATH)\include -I$(SSL_DIR)/inc32 -I$(FCGI_DIR)\include $(PY_CFLAGS) -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
+CFLAGS=$(CFLAGS1) /nologo /MD /W3 /EHsc /Ox /D_CRT_SECURE_NO_WARNINGS /DWIN32 $(CJFLAGS) -I$(ZOOK_DIR) -I./ $(JAVA_CFLAGS) $(MS_CFLAGS) -I$(TROOT)\..\..\thirds\dirent-win32 -I$(INTL_DIR) -I$(CURL_DIR)\include -I$(XML2_DIR)\include -I$(GDAL_DIR)\port $(JS_CFLAGS) -I$(GDAL_DIR)\ogr -I$(GDAL_DIR)\gcore -I$(GD_DIR) -I$(ICONV_DIR) -I$(TROOT)\..\..\thirds\include -I$(TROOT)\..\..\thirds\cgic206 -I$(PYTHON_CPATH)\include -I$(SSL_DIR)/inc32 -I$(FCGI_DIR)\include $(PY_CFLAGS) -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
 
 LDFLAGS=$(FCGI_LIBRARY) $(CURL_LIBRARY) $(PY_LDFLAGS) $(XML2_LIBRARY) $(TROOT)/../../thirds/cgic206/libcgic.lib $(SSL_DIR)/out32dll/libeay32.lib $(JAVA_LDFLAGS) $(SSL_DIR)/out32dll/ssleay32.lib $(MS_LDFLAGS) $(INTL_DIR)/intl.lib $(XML2_DIR)/win32/bin.msvc/libxml2.lib $(GDAL_DIR)/gdal_i.lib $(CURL_DIR)/lib/libcurl.lib $(JS_LDFLAGS) /machine:i386

trunk/zoo-project/zoo-kernel/service.h

@@ -29 +29 @@
 
 #ifdef WIN32
-#define strncasecmp strnicmp
-#define strcasecmp stricmp
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+#ifndef snprintf
 #define snprintf sprintf_s
+#endif
 #endif 
 
@@ -63 +65 @@
 #define SHMSZ     27
 
+
+#ifdef DEBUG_STACK
+  void debugStack(const char* file,const int line){
+    int stack;
+    fprintf(stderr,"stack %p (%s: %d) \n",&stack,file,line);
+  }
+#endif
 
   /**

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

@@ -34 +34 @@
 #define FALSE -1
 #endif
+
+void printHeaders(maps* m){
+  maps *_tmp=getMaps(m,"headers");
+  if(_tmp!=NULL){
+    map* _tmp1=_tmp->content;
+    while(_tmp1!=NULL){
+      printf("%s: %s\r\n",_tmp1->name,_tmp1->value);
+      _tmp1=_tmp1->next;
+    }
+  }
+}
 
 void addLangAttr(xmlNodePtr n,maps *m){
@@ -1817 +1828 @@
   }
 
+  printHeaders(m);
+
   if(asRaw==0){
 #ifdef DEBUG
@@ -2478 +2491 @@
     int s=stat(cached, &f_status);
     if(s==0){
+      fprintf(stderr,"FILE SIZE (%d)\n",f_status.st_size/1024);
       fcontent=(char*)malloc(sizeof(char)*(f_status.st_size+1));
-      FILE* f=fopen(cached,"r");
+      FILE* f=fopen(cached,"rb");
       fread(fcontent,sizeof(char),f_status.st_size,f);
       fsize=f_status.st_size;

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

@@ -59 +59 @@
 #include <openssl/buffer.h>
 
-#include "cgic.h"
+//#include "cgic.h"
 #include "ulinet.h"
 
@@ -85 +85 @@
   static int nbNs=0;
 
+  void printHeaders(maps*);
   void unhandleStatus(maps*);
   void updateStatus(maps*);

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

@@ -293 +293 @@
   else{
     memset(lpBuffer,0,hInternet.nDataLen+1);
-    memcpy( lpBuffer, hInternet.pabyData, hInternet.nDataLen );
+    memcpy(lpBuffer, hInternet.pabyData, hInternet.nDataLen );
     dwDataSize=hInternet.nDataLen;
     free( hInternet.pabyData );

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

@@ -85 +85 @@
   if(strncmp(cgiContentType,"text/xml",8)==0 || 
      strncasecmp(cgiRequestMethod,"post",4)==0){
+    //fprintf(stderr,"length %d\n",cgiContentLength);
     if(cgiContentLength==NULL){
        cgiContentLength=0;
@@ -112 +113 @@
         buffer[cgiContentLength]=0;
         tmpMap=createMap("request",buffer);
-        fprintf(stderr,"%s\n",tmpMap->value);
+        //fprintf(stderr,"%s\n",tmpMap->value);
       }else{
         buffer[0]=0;

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

@@ -1838 +1838 @@
 
 #ifdef DEBUG
-  fprintf(stderr,"\n%i\n",i);
+  fprintf(stderr,"\n%d\n",__LINE__);
+  fflush(stderr);
   dumpMaps(request_input_real_format);
   dumpMaps(request_output_real_format);
   dumpMap(request_inputs);
-  fprintf(stderr,"\n%i\n",i);
+  fprintf(stderr,"\n%d\n",__LINE__);
+  fflush(stderr);
 #endif
 
@@ -1911 +1913 @@
           
           sprintf(storageNameOnServer,"%s/%s",path->value,fileNameOnServer);
+          printf("\n\nName on server %s\n",storageNameOnServer);
+#ifdef DEBUG
           fprintf(stderr,"Name on server %s\n",storageNameOnServer);
           fprintf(stderr,"fileNameOnServer: %s\n",fileNameOnServer);
+#endif
           mode=S_IRWXU|S_IRGRP|S_IROTH;
           targetFile = open (storageNameOnServer,O_RDWR|O_CREAT|O_TRUNC,S_IRWXU|S_IRGRP|S_IROTH);
           if(targetFile<0){
+#ifdef DEBUG
             fprintf(stderr,"could not create the new file,%s\n",fileNameOnServer);          
+#endif
           }else{
             while (cgiFormFileRead(file, buffer, BufferLen, &got) ==cgiFormSuccess){
@@ -1926 +1933 @@
           cgiFormFileClose(file);
           close(targetFile);
+#ifdef DEBUG
           fprintf(stderr,"File \"%s\" has been uploaded",fileNameOnServer);
+#endif
         }
       }