[naviserver-commits] naviserver/nsd connio.c,1.4,1.5 fastpath.c,1.16,1.17

[Vlad S. <ser...@us...>]

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

Modified Files:
	connio.c fastpath.c 
Log Message:
See ChangeLog


Index: fastpath.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/fastpath.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** fastpath.c	8 Jul 2005 18:18:03 -0000	1.16
--- fastpath.c	9 Jul 2005 02:16:30 -0000	1.17
***************
*** 41,48 ****
  /*
   * The following structure defines the offsets parsed
!  * from Range: request heqder
   */
  
! #define MAX_RANGES      5
  
  typedef struct {
--- 41,48 ----
  /*
   * The following structure defines the offsets parsed
!  * from Range: request header
   */
  
! #define MAX_RANGES      (NS_CONN_MAXBUFS/3)
  
  typedef struct {
***************
*** 846,851 ****
   * Side effects:
   *	May set numerous headers, will close connection.
!  *      MAX_RANGES*3 should be less than 16, because Ns_ConnSend
!  *      currently supports 16 iov buffers only.
   *
   *----------------------------------------------------------------------
--- 846,850 ----
   * Side effects:
   *	May set numerous headers, will close connection.
!  *      MAX_RANGES depends on NS_CONN_MAXBUFS which is used by Ns_ConnSend
   *
   *----------------------------------------------------------------------

Index: connio.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/connio.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** connio.c	6 Jul 2005 07:12:17 -0000	1.4
--- connio.c	9 Jul 2005 02:16:30 -0000	1.5
***************
*** 132,136 ****
      Conn	   *connPtr = (Conn *) conn;
      int         nwrote, towrite, i, n;
!     struct iovec    sbufs[16];
  
      if (connPtr->sockPtr == NULL) {
--- 132,136 ----
      Conn	   *connPtr = (Conn *) conn;
      int         nwrote, towrite, i, n;
!     struct iovec    sbufs[NS_CONN_MAXBUFS];
  
      if (connPtr->sockPtr == NULL) {
***************
*** 139,143 ****
  
      /*
!      * Send up to 16 buffers, including the queued output
       * buffer if necessary.
       */
--- 139,143 ----
  
      /*
!      * Send up to NS_CONN_MAXBUFS(16) buffers, including the queued output
       * buffer if necessary.
       */
***************
*** 151,155 ****
  	++n;
      }
!     for (i = 0; i < nbufs && n < 16; ++i) {
  	if (bufs[i].iov_len > 0 && bufs[i].iov_base != NULL) {
  	    sbufs[n].iov_base = bufs[i].iov_base;
--- 151,155 ----
  	++n;
      }
!     for (i = 0; i < nbufs && n < NS_CONN_MAXBUFS; ++i) {
  	if (bufs[i].iov_len > 0 && bufs[i].iov_base != NULL) {
  	    sbufs[n].iov_base = bufs[i].iov_base;