Changeset 511

Timestamp:

Oct 22, 2014, 7:34:22 PM (10 years ago)

Author:

david

Message:

• Move main function form cgic.c to zoo_loader.c to prepare zoo threading version
• Add cgiMain_init function to load cgi environment

Location:

branches/PublicaMundi_David-devel/thirds/cgic206

Files:

• cgic.c (modified) (4 diffs)
• cgic.h (modified) (2 diffs)

branches/PublicaMundi_David-devel/thirds/cgic206/cgic.c

@@ -123 +123 @@
 static cgiParseResultType cgiParseFormInput(char *data, int length);
 static void cgiSetupConstants();
-static void cgiFreeResources();
+void cgiFreeResources();
 static int cgiStrEqNc(char *s1, char *s2);
 static int cgiStrBeginsNc(char *s1, char *s2);
@@ -130 +130 @@
 
 
-int main(int argc, char *argv[]) {
+int cgiMain_init(int argc, char *argv[]) {
         int result;
         char *cgiContentLengthString;
         char *e;
-        while (FCGI_Accept() >= 0) {
         cgiSetupConstants();
         cgiGetenv(&cgiServerSoftware, "SERVER_SOFTWARE");
@@ -310 +309 @@
                 }
         }
-        result = cgiMain();
-        cgiFreeResources();
-        }
-        FCGI_Finish();
         return result;
 }
@@ -1177 +1172 @@
 }
 
-static void cgiFreeResources() {
+void cgiFreeResources() {
         cgiFormEntry *c = cgiFormEntryFirst;
         cgiFormEntry *n;

branches/PublicaMundi_David-devel/thirds/cgic206/cgic.h

@@ -415 +415 @@
 int cgiMain();
 extern 
-#ifdef __cplusplus
-"C" 
-#endif
-int cgiMain_init();
-
-
-extern 
+
+
 #ifdef __cplusplus
 "C" 
@@ -454 +449 @@
 cgiFormResultType cgiValueEscapeData(char *data, int len);
 
+int cgiMain_init(int argc, char *argv[]);
+
+void cgiFreeResources();
+
 #endif /* CGI_C */