[naviserver-commits] naviserver/nsd driver.c,1.12,1.13 server.c,1.7,1.8

[Zoran V. <vas...@us...>]

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

Modified Files:
	driver.c server.c 
Log Message:
Reformatted, untabified and adjusted to match style code


Index: driver.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/driver.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** driver.c	16 Jun 2005 18:31:10 -0000	1.12
--- driver.c	16 Jun 2005 19:42:48 -0000	1.13
***************
*** 31,36 ****
   * driver.c --
   *
!  *	Connection I/O for loadable socket drivers.
!  *
   */
  
--- 31,35 ----
   * driver.c --
   *
!  *      Connection I/O for loadable socket drivers.
[...1947 lines suppressed...]
       * Check if all content has arrived.
***************
*** 1535,1542 ****
           * This happens from some browsers on POST requests.
           */
          if (reqPtr->length > 0) {
              reqPtr->content[reqPtr->length] = '\0';
          }
-         
          return (reqPtr->request ? SOCK_READY : SOCK_ERROR);
      }
--- 1547,1554 ----
           * This happens from some browsers on POST requests.
           */
+         
          if (reqPtr->length > 0) {
              reqPtr->content[reqPtr->length] = '\0';
          }
          return (reqPtr->request ? SOCK_READY : SOCK_ERROR);
      }

Index: server.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/server.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** server.c	16 Jun 2005 18:31:11 -0000	1.7
--- server.c	16 Jun 2005 19:42:48 -0000	1.8
***************
*** 31,35 ****
   * server.c --
   *
!  *	Routines for managing NsServer structures.
   */
  
--- 31,35 ----
   * server.c --
   *
!  *      Routines for managing NsServer structures.
   */
[...1014 lines suppressed...]
! 	poolPtr->threads.min = poolPtr->threads.max;
      }
  }
--- 693,708 ----
       * current number of threads is above the minimum.
       */
!     
      if (poolPtr->threads.max > maxconns) {
!         Ns_Log(Warning, "serv: cannot have more maxthreads than maxconns: "
!                "%d max threads adjusted down to %d max connections",
!                poolPtr->threads.max, maxconns);
!         poolPtr->threads.max = maxconns;
      }
      if (poolPtr->threads.min > poolPtr->threads.max) {
!         Ns_Log(Warning, "serv: cannot have more minthreads than maxthreads: "
!                "%d min threads adjusted down to %d max threads",
!                poolPtr->threads.min, poolPtr->threads.max);
!         poolPtr->threads.min = poolPtr->threads.max;
      }
  }