[AOLSERVER-COMMITS] aolserver/nsd adprequest.c,1.20,1.21 driver.c,1.41,1.42

[<jgd...@us...>]

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

Modified Files:
	adprequest.c driver.c 
Log Message:
Minor cleanup.

Index: adprequest.c
===================================================================
RCS file: /cvsroot/aolserver/aolserver/nsd/adprequest.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** adprequest.c	16 Jan 2005 03:25:06 -0000	1.20
--- adprequest.c	17 Jan 2005 14:01:10 -0000	1.21
***************
*** 102,106 ****
      Conn	     *connPtr = (Conn *) conn;
      Tcl_Interp       *interp;
!     Tcl_DString	      rds, tds;
      NsInterp         *itPtr;
      int               result;
--- 102,106 ----
      Conn	     *connPtr = (Conn *) conn;
      Tcl_Interp       *interp;
!     Tcl_DString	      rds;
      NsInterp         *itPtr;
      int               result;
***************
*** 127,137 ****
  
      /*
!      * Set the response type and output buffers.
       */
  
      Tcl_DStringInit(&rds);
-     Tcl_DStringInit(&tds);
      itPtr->adp.responsePtr = &rds;
      itPtr->adp.outputPtr = itPtr->adp.responsePtr;
  
      /*
--- 127,137 ----
  
      /*
!      * Set the response buffer and default size.
       */
  
      Tcl_DStringInit(&rds);
      itPtr->adp.responsePtr = &rds;
      itPtr->adp.outputPtr = itPtr->adp.responsePtr;
+     itPtr->adp.bufsize = itPtr->servPtr->adp.bufsize;
  
      /*
***************
*** 168,172 ****
  
      itPtr->adp.flags = (itPtr->servPtr->adp.flags & (ADP_GZIP|ADP_TRACE));
-     itPtr->adp.bufsize = itPtr->servPtr->adp.bufsize;
  
      /*
--- 168,171 ----
***************
*** 215,219 ****
      itPtr->adp.debugFile = NULL;
      Tcl_DStringFree(&rds);
-     Tcl_DStringFree(&tds);
  
      if (result != TCL_OK) {
--- 214,217 ----

Index: driver.c
===================================================================
RCS file: /cvsroot/aolserver/aolserver/nsd/driver.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** driver.c	15 Jan 2005 23:55:17 -0000	1.41
--- driver.c	17 Jan 2005 14:01:10 -0000	1.42
***************
*** 1836,1839 ****
--- 1836,1840 ----
       */
      
+     connPtr->responseStatus = 200;
      connPtr->servPtr = connPtr->drvPtr->servPtr;
      connPtr->location = connPtr->drvPtr->location;
***************
*** 1866,1871 ****
       */
  
!     connPtr->encoding = connPtr->servPtr->encoding.outputEncoding;
!     connPtr->urlEncoding = connPtr->servPtr->encoding.urlEncoding;
      connPtr->queryEncoding = NULL;
  
--- 1867,1871 ----
       */
  
!     Ns_ConnSetType((Ns_Conn *) connPtr, "*/*");
      connPtr->queryEncoding = NULL;
  
***************
*** 2081,2086 ****
       */
  
-     connPtr->responseStatus = 0;
-     connPtr->nContentSent = 0;
      if (connPtr->query != NULL) {
  	Ns_SetFree(connPtr->query);
--- 2081,2084 ----