Changeset 872

Timestamp:

2000-01-26T11:45:59+13:00 (24 years ago)

Author:

sjboddie

Message:

few changes to get fastcgi to work properly

File:

• trunk/gsdl/src/recpt/cgiwrapper.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/cgiwrapper.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.21  2000/01/25 22:45:59  sjboddie
+   few changes to get fastcgi to work properly
+
    Revision 1.20  1999/09/07 04:56:53  sjboddie
    added GPL notice
@@ -118 +121 @@
 #include "recptconfig.h"
 #include <stdlib.h>
+#include <assert.h>
 
 
@@ -483 +487 @@
 #endif
 
+    // if using fastcgi we'll load environment into a map,
+    // otherwise simply pass empty map (can't get environment
+    // variables using getenv() while using FCGX versions
+    // of fastcgi - at least I can't ;-) - Stefan)
+    text_tmap fastcgienv;
+#ifdef USE_FASTCGI
+    if (isfastcgi) {
+      for(; *fcgienvp != NULL; fcgienvp++) {
+    text_t fvalue = *fcgienvp;
+    text_t::const_iterator begin = fvalue.begin();
+    text_t::const_iterator end = fvalue.end();
+    text_t::const_iterator equals_sign = findchar (begin, end, '=');
+    if (equals_sign != end)
+      fastcgienv[substr(begin, equals_sign)] = substr(equals_sign+1, end);
+      }
+    }
+#endif
+
+    // temporarily need to configure gwcgi here when using fastcgi as I can't
+    // get it to pass the SCRIPT_NAME environment variable to the initial 
+    // environment (if anyone can work out how to do this using the apache 
+    // server, let me know). Note that this overrides the gwcgi field in 
+    // site.cfg (which it shouldn't do) but I can't at present set gwcgi 
+    // from site.cfg as I have old receptionists laying around that wouldn't
+    // appreciate it. The following 5 lines of code should be deleted once
+    // I either a: get the server to pass SCRIPT_NAME at initialization
+    // time or b: convert all the collections using old receptionists over
+    // to this version and uncomment gwcgi in the site.cfg file -- Stefan.
+#ifdef USE_FASTCGI
+    if (isfastcgi) {
+      recpt.configure("gwcgi", fastcgienv["SCRIPT_NAME"]);
+    }
+#endif
+
+
     if (errorpage.empty()) {
       ofstream errout (GSDL_GSDLHOME "/etc/errout.txt");
@@ -489 +528 @@
       // parse the cgi arguments and produce the resulting page if there
       // has been no errors so far
-      if (!recpt.parse_cgi_args (argstr, args, errout)) {
+      if (!recpt.parse_cgi_args (argstr, args, errout, fastcgienv)) {
     errout.close ();
     page_errorparseargs(GSDL_GSDLHOME, errorpage);
       } else {
-    if (!recpt.produce_cgi_page (args, pageout, errout)) {
+    if (!recpt.produce_cgi_page (args, pageout, errout, fastcgienv)) {
       errout.close ();
       page_errorcgipage(GSDL_GSDLHOME, errorpage);
@@ -499 +538 @@
       errout.close ();
     }
-    recpt.log_cgi_args (args, errout);
+    recpt.log_cgi_args (args, errout, fastcgienv);
       }
     }