naviserver-commits

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/nscgi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10314/nscgi

Modified Files:
	nscgi.c 
Log Message:
        * nslog/nslog.c:
        * nscp/nscp.c:
        * nscgi/nscgi.c:
        * nsdb/dbinit.c: Use new config routines.


Index: nscgi.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nscgi/nscgi.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** nscgi.c	30 Jul 2005 04:06:01 -0000	1.4
--- nscgi.c	17 Oct 2005 11:25:17 -0000	1.5
***************
*** 37,41 ****
  #define BUFSIZE	    4096
  #define NDSTRINGS   5
- #define DEFAULT_MAXINPUT    1024000
  #define CGI_NPH	    	1
  #define CGI_GETHOST	2
--- 37,40 ----
***************
*** 194,211 ****
      Ns_MutexInit(&modPtr->lock);
      Ns_MutexSetName2(&modPtr->lock, "nscgi", server);
!     if (!Ns_ConfigGetInt(path, "maxinput", &modPtr->maxInput)) {
!         modPtr->maxInput = DEFAULT_MAXINPUT;
!     }
!     if (!Ns_ConfigGetInt(path, "limit", &modPtr->maxCgi)) {
!         modPtr->maxCgi = 0;
!     }
!     if (!Ns_ConfigGetInt(path, "maxwait", &modPtr->maxWait)) {
!         modPtr->maxWait = 30;
!     }
!     if (!Ns_ConfigGetBool(path, "gethostbyaddr", &i)) {
!         i = 0;
!     }
!     if (i) {
! 	modPtr->flags |= CGI_GETHOST;
      }
  
--- 193,201 ----
      Ns_MutexInit(&modPtr->lock);
      Ns_MutexSetName2(&modPtr->lock, "nscgi", server);
!     modPtr->maxInput = Ns_ConfigInt(path, "maxinput", 1024000);
!     modPtr->maxCgi = Ns_ConfigInt(path, "limit", 0);
!     modPtr->maxWait = Ns_ConfigInt(path, "maxwait", 30);
!     if (Ns_ConfigBool(path, "gethostbyaddr", NS_FALSE)) {
!         modPtr->flags |= CGI_GETHOST;
      }
  
***************
*** 221,225 ****
          if (modPtr->interps == NULL) {
              Ns_Log(Warning, "nscgi: no such interps section: %s",
! 		   ds.string);
          }
      	Ns_DStringTrunc(&ds, 0);
--- 211,215 ----
          if (modPtr->interps == NULL) {
              Ns_Log(Warning, "nscgi: no such interps section: %s",
!                    ds.string);
          }
      	Ns_DStringTrunc(&ds, 0);
***************
*** 231,243 ****
          if (modPtr->mergeEnv == NULL) {
              Ns_Log(Warning, "nscgi: no such environment section: %s",
! 		   ds.string);
          }
      	Ns_DStringTrunc(&ds, 0);
      }
!     if (!Ns_ConfigGetBool(path, "systemenvironment", &i)) {
!         i = 0;
!     }
!     if (i) {
! 	modPtr->flags |= CGI_SYSENV;
      }
  
--- 221,230 ----
          if (modPtr->mergeEnv == NULL) {
              Ns_Log(Warning, "nscgi: no such environment section: %s",
!                    ds.string);
          }
      	Ns_DStringTrunc(&ds, 0);
      }
!     if (Ns_ConfigBool(path, "systemenvironment", NS_FALSE)) {
!         modPtr->flags |= CGI_SYSENV;
      }