[naviserver-commits] naviserver/nsd conn.c,1.5,1.6

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

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

Modified Files:
	conn.c 
Log Message:
NsTclWriteContentObjCmd checks reqPtr->avail instead of conn->contentLength


Index: conn.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/conn.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** conn.c	17 Mar 2005 20:21:14 -0000	1.5
--- conn.c	18 Mar 2005 08:12:56 -0000	1.6
***************
*** 1197,1200 ****
--- 1197,1201 ----
      int toCopy = 0;
      char *chanName;
+     Request *reqPtr;
      Tcl_Channel chan;
  
***************
*** 1224,1236 ****
      }
      Tcl_Flush(chan);
!     if (toCopy > itPtr->conn->contentLength || toCopy <= 0) {
!         toCopy = itPtr->conn->contentLength;
      }
!     if (Ns_ConnCopyToChannel(itPtr->conn, (unsigned)toCopy, chan) != NS_OK) {
          Tcl_SetResult(interp, "could not copy content", TCL_STATIC);
          return TCL_ERROR;
      }
-     
-     itPtr->conn->contentLength -= toCopy;
  
      return TCL_OK;
--- 1225,1236 ----
      }
      Tcl_Flush(chan);
!     reqPtr = ((Conn *)itPtr->conn)->reqPtr;
!     if (toCopy > reqPtr->avail || toCopy <= 0) {
!         toCopy = reqPtr->avail;
      }
!     if (Ns_ConnCopyToChannel(itPtr->conn, (size_t)toCopy, chan) != NS_OK) {
          Tcl_SetResult(interp, "could not copy content", TCL_STATIC);
          return TCL_ERROR;
      }
  
      return TCL_OK;