Merged changes from Tcl 8.0.5b1

5 files changed, 22 insertions, 9 deletions

diff --git a/library/http/http.tcl b/library/http/http.tcl
index e61c16a..622801f 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: http.tcl,v 1.1.2.2 1998/09/24 23:59:07 stanton Exp $
+# RCS: @(#) $Id: http.tcl,v 1.1.2.3 1999/01/29 00:20:46 stanton Exp $
 
 package provide http 2.0	;# This uses Tcl namespaces
 
@@ -99,7 +99,10 @@ proc http::config {args} {
 		set state(status) error
 	    }
 	}
-	unset state(-command)
+	if {[info exist state(-command)]} {
+	    # Command callback may already have unset our state
+	    unset state(-command)
+	}
     }
 }
 
diff --git a/library/http2.0/http.tcl b/library/http2.0/http.tcl
index e61c16a..622801f 100644
--- a/library/http2.0/http.tcl
+++ b/library/http2.0/http.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: http.tcl,v 1.1.2.2 1998/09/24 23:59:07 stanton Exp $
+# RCS: @(#) $Id: http.tcl,v 1.1.2.3 1999/01/29 00:20:46 stanton Exp $
 
 package provide http 2.0	;# This uses Tcl namespaces
 
@@ -99,7 +99,10 @@ proc http::config {args} {
 		set state(status) error
 	    }
 	}
-	unset state(-command)
+	if {[info exist state(-command)]} {
+	    # Command callback may already have unset our state
+	    unset state(-command)
+	}
     }
 }
 
diff --git a/library/http2.1/http.tcl b/library/http2.1/http.tcl
index e61c16a..622801f 100644
--- a/library/http2.1/http.tcl
+++ b/library/http2.1/http.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: http.tcl,v 1.1.2.2 1998/09/24 23:59:07 stanton Exp $
+# RCS: @(#) $Id: http.tcl,v 1.1.2.3 1999/01/29 00:20:46 stanton Exp $
 
 package provide http 2.0	;# This uses Tcl namespaces
 
@@ -99,7 +99,10 @@ proc http::config {args} {
 		set state(status) error
 	    }
 	}
-	unset state(-command)
+	if {[info exist state(-command)]} {
+	    # Command callback may already have unset our state
+	    unset state(-command)
+	}
     }
 }
 
diff --git a/library/http2.3/http.tcl b/library/http2.3/http.tcl
index e61c16a..622801f 100644
--- a/library/http2.3/http.tcl
+++ b/library/http2.3/http.tcl
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and
 # redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: http.tcl,v 1.1.2.2 1998/09/24 23:59:07 stanton Exp $
+# RCS: @(#) $Id: http.tcl,v 1.1.2.3 1999/01/29 00:20:46 stanton Exp $
 
 package provide http 2.0	;# This uses Tcl namespaces
 
@@ -99,7 +99,10 @@ proc http::config {args} {
 		set state(status) error
 	    }
 	}
-	unset state(-command)
+	if {[info exist state(-command)]} {
+	    # Command callback may already have unset our state
+	    unset state(-command)
+	}
     }
 }
 
diff --git a/library/init.tcl b/library/init.tcl
index c069037..6d77e30 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -3,10 +3,11 @@
 # Default system startup file for Tcl-based applications.  Defines
 # "unknown" procedure and auto-load facilities.
 #
-# RCS: @(#) $Id: init.tcl,v 1.1.2.4 1998/12/02 20:08:05 welch Exp $
+# RCS: @(#) $Id: init.tcl,v 1.1.2.5 1999/01/29 00:20:45 stanton Exp $
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
+# Copyright (c) 1998-1999 Scriptics Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.