Changeset 90

Timestamp:

1998-12-23T16:58:42+13:00 (25 years ago)

Author:

rjmcnab

Message:

Added support for the FastCGI protocol.

Location:

trunk/gsdl

Files:

• etc/site.cfg.example (modified) (1 diff)
• src/library/Makefile (modified) (1 diff)
• src/library/cgiwrap.cpp (modified) (3 diffs)

trunk/gsdl/etc/site.cfg.example

@@ +1 @@
+# You should save this file as site.cfg and edit it
+# to suit your site's configuration. This file may
+# be placed in the GSDLHOME directory, the 
+# GSDLHOME/etc directory or in a particular collection's
+# directory.
+
 gsdlhome    /home/rjmcnab/gsdl/collect/gberg
 httpprefix  http://162.105.138.14/gberg
 gwcgi   http://162.105.138.14/cgi-bin/gbergmain
+
+# maxrequests is the most requests a fastcgi process
+# will serve before it exits. This can be set to a
+# low figure (like 1) while debugging and then set
+# to a high figure (like 10000) when everything is
+# working ok.
+maxrequests 1

trunk/gsdl/src/library/Makefile

@@ -26 +26 @@
 CC = gcc
 CCFLAGS = -O2
-DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM
+DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI
 RANLIB = ranlib
 INCLUDES = -I../../lib -I../../packages/mg-1.3d -I../../packages/mg-1.3d/lib \
-           -I../../packages/mg-1.3d/src/text
+           -I../../packages/mg-1.3d/src/text -I../../packages/fcgi/include
 LDFLAGS = -lg++ -lgdbm
 LIBS = ../../lib/gsdllib.a

trunk/gsdl/src/library/cgiwrap.cpp

@@ -18 +18 @@
 #include "fileutil.h"
 
+#ifdef USE_FASTCGI
+#include "fcgiapp.h"
+#endif
+
 // Note: site.h would not be needed if we could
 // dynamically find out gsdlhome.
@@ -23 +27 @@
 
 
-static void site_cfg_read (libinterface *lib, const text_t &filename) {
+#ifdef USE_FASTCGI
+// used to output the text from libinterface
+class fcgistreambuf : public streambuf {
+public:
+  fcgistreambuf ();
+  int sync ();
+  int overflow (int ch);
+  int underflow () {return EOF;}
+  
+  void fcgisbreset() {fcgx_stream = NULL; other_ostream = NULL;};
+  void set_fcgx_stream(FCGX_Stream *newone) {fcgx_stream=newone;};
+  void set_other_ostream(ostream *newone) {other_ostream=newone;};
+  
+private:
+  FCGX_Stream *fcgx_stream;
+  ostream *other_ostream;
+};
+
+fcgistreambuf::fcgistreambuf() {
+  fcgisbreset();
+  if (base() == ebuf()) allocate();
+  setp (base(), ebuf());
+};
+
+int fcgistreambuf::sync () {
+  if ((fcgx_stream != NULL) &&
+      (FCGX_PutStr (pbase(), out_waiting(), fcgx_stream) < 0)) {
+    fcgx_stream = NULL;
+  }
+
+  if (other_ostream != NULL) {
+    char *thepbase=pbase();
+    for (int i=0;i<out_waiting();i++) (*other_ostream).put(thepbase[i]);
+  }
+  
+  setp (pbase(), epptr());
+  
+  return 0;
+}
+
+int fcgistreambuf::overflow (int ch) {
+  if (sync () == EOF) return EOF;
+  if (ch != EOF) sputc (ch);
+  return 0;
+}
+
+#endif
+
+
+
+static int site_cfg_read (libinterface *lib, const text_t &filename,
+              int &maxrequests) {
   text_tarray cfgline;
   char *cstr = filename.getcstr();
   ifstream confin (cstr);
   delete cstr;
+
+  maxrequests = 10000;
 
   if (confin) {
@@ -38 +95 @@
     else if (cfgline[0] == "httpprefix") lib->sethttpprefix(cfgline[1]);
     else if (cfgline[0] == "gwcgi") lib->setgwcgi(cfgline[1]);
+    else if (cfgline[0] == "maxrequests") {
+      maxrequests = cfgline[1].getint();
+      if (maxrequests < 1) maxrequests = 1;
+    }
       }
     }
     confin.close ();
-  }
+    return 1;
+  }
+  return 0;
 }
 
 // cgiwrap does everything necessary to output a page
-// using the cgi protocol.
+// using the cgi (or fastcgi) protocol.
 int cgiwrap (libinterface *lib) {
+#ifdef USE_FASTCGI
+  fcgistreambuf outbuf;
+#endif
+
+  // init stuff
+
   // set defaults
+  int maxrequests = 10000;
   lib->setgsdlhome (GSDLHOME);
   lib->sethttpprefix("http://127.0.0.1");
   lib->setgwcgi("http://127.0.0.1/cgi-bin/gw");
 
-  // read in the main configuration file
-  text_t filename = filename_cat (GSDLHOME, "etc/site.cfg");
-  site_cfg_read (lib, filename);
-
-  // read in the collection configuration file (overriding the
-  // main configuration file)
-  filename = filename_cat (GSDLHOME, "collect");
+  // read in the site configuration file
+  // try in the collection directory, then GSDLHOME/etc,
+  // then in GSDLHOME.
+  text_t filename = filename_cat (GSDLHOME, "collect");
   filename = filename_cat (filename, lib->get_collection_name());
   filename = filename_cat (filename, "site.cfg");
-  site_cfg_read (lib, filename);
+  if (!site_cfg_read (lib, filename, maxrequests)) {
+    filename = filename_cat (GSDLHOME, "etc/site.cfg");
+    if (!site_cfg_read (lib, filename, maxrequests)) {
+      filename = filename_cat (GSDLHOME, "site.cfg");
+      site_cfg_read (lib, filename, maxrequests);
+    }
+  }
 
   // initialise the library software
   lib->init();
   
-  // get the query arguments from the environment
-  // or from standard input
+  // find out whether this is being run as a cgi-script
+  // or a fastcgi script
+  int numrequests = 0;
+#ifdef USE_FASTCGI
+  int isfastcgi = !FCGX_IsCGI();
+  FCGX_Stream *fcgiin, *fcgiout, *fcgierr;
+  FCGX_ParamArray fcgienvp;
+#else
+  int isfastcgi = 0;
+#endif
+
+  // get the query string if it is not being run as a fastcgi
+  // script
   text_t argstr = "";
-  char *aURIStr = getenv("QUERY_STRING");
-  if (aURIStr != NULL) { 
-    // the arguments were available in the environment
-    argstr = aURIStr;
-  } else {
-    // get the arguments from standard input
-    char cinURIStr[1024];
-    cin >> cinURIStr;
-    argstr = cinURIStr;
-  }
-  
-  // output the cgi header
-  cout << "content-type: text/html\n\n";
-
-  // redirect stderr to a file
-  ofstream errout (GSDLHOME "/etc/errout.txt");
-  cerr = errout;
-
-  // get the query page
-  lib->getpage (argstr, cout, errout);
-
-  // close the file containing the redirected standard output
-  errout.close();
-
-  // make sure we finish with a return on an empty line
-  cout << "\n";
+  char *aURIStr;
+  if (!isfastcgi) {
+    aURIStr = getenv("QUERY_STRING");
+    if (aURIStr != NULL) argstr = aURIStr;
+    else {
+      char cinURIStr[1024];
+      cin >> cinURIStr;
+      argstr = cinURIStr;
+    }
+    maxrequests = 1;
+  }
+
+  // Page-request loop. If this is not being run as a fastcgi
+  // process then only one request will be processed and then
+  // the process will exit.
+  while (numrequests < maxrequests) {
+#ifdef USE_FASTCGI
+    if (isfastcgi) {
+      if (FCGX_Accept(&fcgiin, &fcgiout, &fcgierr, &fcgienvp) < 0) break;
+      aURIStr = FCGX_GetParam("QUERY_STRING", fcgienvp);
+      if (aURIStr != NULL) argstr = aURIStr;
+      else argstr = "";
+    }
+#endif
+
+    // get output streams ready
+#ifdef USE_FASTCGI
+    outbuf.fcgisbreset ();
+    if (isfastcgi) outbuf.set_fcgx_stream (fcgiout);
+    else outbuf.set_other_ostream (&cout);
+    ostream pageout (&outbuf);
+#else
+#define pageout cout
+#endif
+    pageout << "content-type: text/html\n\n";
+    ofstream errout (GSDLHOME "/etc/errout.txt");
+    cerr = errout;
+    
+    // get the query page
+    lib->getpage (argstr, pageout, errout);
+    
+    // finish with the output streams
+    pageout << "\n";
+    pageout << flush;
+    errout.close();
+#ifdef USE_FASTCGI
+    if (isfastcgi) FCGX_Finish();
+#endif
+
+    numrequests++;
+  }
 
   return 1;