[naviserver-commits] naviserver/nsd conn.c,1.17,1.18

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

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

Modified Files:
	conn.c 
Log Message:
Fixed Bug #1230179 which caused the server crash
when calling ns_startcontent outside of the connection scope.


Index: conn.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/conn.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** conn.c	13 Jun 2005 01:55:13 -0000	1.17
--- conn.c	30 Jun 2005 07:57:41 -0000	1.18
***************
*** 1379,1382 ****
--- 1379,1387 ----
      int i, status = TCL_OK;
  
+     if (itPtr->conn == NULL) {
+         Tcl_SetResult(interp, "no current connection", TCL_STATIC);
+         return TCL_ERROR;
+     }
+ 
      for (i = 1; i < objc && status == TCL_OK; i++) {
          opt = Tcl_GetString(objv[i]);
***************
*** 1424,1428 ****
      
      if (status == TCL_OK) {    
!         Ns_ConnSetWriteEncodedFlag( itPtr->conn, NS_TRUE);
          Ns_ConnSetEncoding(itPtr->conn, encoding);
      }
--- 1429,1433 ----
      
      if (status == TCL_OK) {    
!         Ns_ConnSetWriteEncodedFlag(itPtr->conn, NS_TRUE);
          Ns_ConnSetEncoding(itPtr->conn, encoding);
      }