Index: ChangeLog
==================================================================
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,11 @@
+2007-02-28  Pat Thoyts  <patthoyts@users.sourceforge.net>
+
+	* win/makefile.vc: Rebase the DLL sensibly. Additional libs for 
+	static link of openssl.
+	* tls.tcl: bug #1579837 - TIP 278 bug (possibly) - fixed.
+
 2006-03-30  Pat Thoyts  <patthoyts@users.sourceforge.net>
 
 	* tclconfig/*:  Updated to TEA 3.5 in response to bug 1460491
 	* configure*:   Regenerated configure.
 

Index: tls.tcl
==================================================================
--- tls.tcl
+++ tls.tcl
@@ -1,9 +1,9 @@
 #
 # Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> 
 #
-# $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.tcl,v 1.7 2004/12/17 16:02:03 patthoyts Exp $
+# $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.tcl,v 1.8 2007/02/28 23:33:41 patthoyts Exp $
 #
 namespace eval tls {
     variable logcmd tclLog
     variable debug 0
  
@@ -32,10 +32,11 @@
 #
 # Helper function - behaves exactly as the native socket command.
 #
 proc tls::socket {args} {
     variable socketCmd
+    variable defaults
     set idx [lsearch $args -server]
     if {$idx != -1} {
 	set server 1
 	set callback [lindex $args [expr {$idx+1}]]
 	set args [lreplace $args $idx [expr {$idx+1}]]
@@ -48,11 +49,11 @@
 	set usage "wrong # args: should be \"tls::socket ?options? host port\""
 	set options "-async, -cadir, -cafile, -certfile, -cipher, -command, -keyfile, -myaddr, -myport, -password, -request, -require, -ssl2, -ssl3, or -tls1"
     }
     set argc [llength $args]
     set sopts {}
-    set iopts [concat [list -server $server] ${tls::defaults}]	;# Import options
+    set iopts [concat [list -server $server] $defaults]	;# Import options
 
     for {set idx 0} {$idx < $argc} {incr idx} {
 	set arg [lindex $args $idx]
 	switch -glob -- $server,$arg {
 	    0,-async	{lappend sopts $arg}

Index: win/makefile.vc
==================================================================
--- win/makefile.vc
+++ win/makefile.vc
@@ -16,11 +16,11 @@
 # Copyright (c) 2001 ActiveState Corporation.
 # Copyright (c) 2001-2002 David Gravereaux.
 # Copyright (c) 2003 Pat Thoyts
 #
 #-------------------------------------------------------------------------
-# RCS: @(#)$Id: makefile.vc,v 1.2 2005/01/14 16:07:11 patthoyts Exp $
+# RCS: @(#)$Id: makefile.vc,v 1.3 2007/02/28 23:33:41 patthoyts Exp $
 #-------------------------------------------------------------------------
 
 !if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCToolkitInstallDir)
 MSG = ^
 You will need to run vcvars32.bat from Developer Studio, first, to setup^
@@ -300,11 +300,11 @@
 !endif
 
 dlllflags = $(lflags) -dll
 conlflags = $(lflags) -subsystem:console
 guilflags = $(lflags) -subsystem:windows
-baselibs  = $(TCLSTUBLIB) $(SSL_LIBS) ws2_32.lib gdi32.lib
+baselibs  = $(TCLSTUBLIB) $(SSL_LIBS) ws2_32.lib user32.lib gdi32.lib advapi32.lib
 
 #---------------------------------------------------------------------
 # TclTest flags
 #---------------------------------------------------------------------
 
@@ -349,12 +349,13 @@
 
 setup:
 	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
 	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)
 
+# See <tcl>/win/coffbase.txt for extension base addresses.
 $(PRJLIB): $(DLLOBJS)
-	$(link32) $(dlllflags) -out:$@ $(baselibs) @<<
+	$(link32) $(dlllflags) -base:0x10780000 -out:$@ $(baselibs) @<<
 $**
 <<
 	-@del $*.exp
 
 $(PRJSTUBLIB): $(PRJSTUBOBJS)