Check-in [6613ecd570]
Bounty program for improvements to Tcl and certain Tcl packages.
Overview
Comment:* win/makefile.vc: Rebase the DLL sensibly. Additional libs for static link of openssl. * tls.tcl: bug #1579837 - TIP 278 bug (possibly) - fixed.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6613ecd5704212b304e44a7dd765a2063f3c4523
User & Date: patthoyts on 2007-02-28 23:33:41
Other Links: manifest | tags
Context
2007-06-22
21:19
* Makefile.in, tclconfig/tcl.m4: update to TEA 3.6 * configure, configure.in: using autoconf-2.59 check-in: 4331d13185 user: hobbs2 tags: trunk
2007-02-28
23:33
* win/makefile.vc: Rebase the DLL sensibly. Additional libs for static link of openssl. * tls.tcl: bug #1579837 - TIP 278 bug (possibly) - fixed. check-in: 6613ecd570 user: patthoyts tags: trunk
2006-06-22
14:03
Updated to TEA 3.5 in response to bug 1460491 check-in: 0fa0ca923c user: patthoyts tags: trunk
Changes

Modified ChangeLog from [d289d7ff0b] to [0ff3f450f9].

            1  +2007-02-28  Pat Thoyts  <[email protected]>
            2  +
            3  +	* win/makefile.vc: Rebase the DLL sensibly. Additional libs for 
            4  +	static link of openssl.
            5  +	* tls.tcl: bug #1579837 - TIP 278 bug (possibly) - fixed.
            6  +
     1      7   2006-03-30  Pat Thoyts  <[email protected]>
     2      8   
     3      9   	* tclconfig/*:  Updated to TEA 3.5 in response to bug 1460491
     4     10   	* configure*:   Regenerated configure.
     5     11   
     6     12   2005-02-08  Jeff Hobbs  <[email protected]>
     7     13   

Modified tls.tcl from [e85b1d9a97] to [f5223501be].

     1      1   #
     2      2   # Copyright (C) 1997-2000 Matt Newman <[email protected]> 
     3      3   #
     4         -# $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.tcl,v 1.7 2004/12/17 16:02:03 patthoyts Exp $
            4  +# $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.tcl,v 1.8 2007/02/28 23:33:41 patthoyts Exp $
     5      5   #
     6      6   namespace eval tls {
     7      7       variable logcmd tclLog
     8      8       variable debug 0
     9      9    
    10     10       # Default flags passed to tls::import
    11     11       variable defaults {}
................................................................................
    30     30       set defaults $args
    31     31   }
    32     32   #
    33     33   # Helper function - behaves exactly as the native socket command.
    34     34   #
    35     35   proc tls::socket {args} {
    36     36       variable socketCmd
           37  +    variable defaults
    37     38       set idx [lsearch $args -server]
    38     39       if {$idx != -1} {
    39     40   	set server 1
    40     41   	set callback [lindex $args [expr {$idx+1}]]
    41     42   	set args [lreplace $args $idx [expr {$idx+1}]]
    42     43   
    43     44   	set usage "wrong # args: should be \"tls::socket -server command ?options? port\""
................................................................................
    46     47   	set server 0
    47     48   
    48     49   	set usage "wrong # args: should be \"tls::socket ?options? host port\""
    49     50   	set options "-async, -cadir, -cafile, -certfile, -cipher, -command, -keyfile, -myaddr, -myport, -password, -request, -require, -ssl2, -ssl3, or -tls1"
    50     51       }
    51     52       set argc [llength $args]
    52     53       set sopts {}
    53         -    set iopts [concat [list -server $server] ${tls::defaults}]	;# Import options
           54  +    set iopts [concat [list -server $server] $defaults]	;# Import options
    54     55   
    55     56       for {set idx 0} {$idx < $argc} {incr idx} {
    56     57   	set arg [lindex $args $idx]
    57     58   	switch -glob -- $server,$arg {
    58     59   	    0,-async	{lappend sopts $arg}
    59     60   	    0,-myport	-
    60     61   	    *,-myaddr	{lappend sopts $arg [lindex $args [incr idx]]}

Modified win/makefile.vc from [125927e6af] to [dc425d4798].

    14     14   # Copyright (c) 1995-1996 Sun Microsystems, Inc.
    15     15   # Copyright (c) 1998-2000 Ajuba Solutions.
    16     16   # Copyright (c) 2001 ActiveState Corporation.
    17     17   # Copyright (c) 2001-2002 David Gravereaux.
    18     18   # Copyright (c) 2003 Pat Thoyts
    19     19   #
    20     20   #-------------------------------------------------------------------------
    21         -# RCS: @(#)$Id: makefile.vc,v 1.2 2005/01/14 16:07:11 patthoyts Exp $
           21  +# RCS: @(#)$Id: makefile.vc,v 1.3 2007/02/28 23:33:41 patthoyts Exp $
    22     22   #-------------------------------------------------------------------------
    23     23   
    24     24   !if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCToolkitInstallDir)
    25     25   MSG = ^
    26     26   You will need to run vcvars32.bat from Developer Studio, first, to setup^
    27     27   the environment.  Jump to this line to read the new instructions.
    28     28   !error $(MSG)
................................................................................
   298    298   !if $(LOIMPACT)
   299    299   lflags	= $(lflags) -ws:aggressive
   300    300   !endif
   301    301   
   302    302   dlllflags = $(lflags) -dll
   303    303   conlflags = $(lflags) -subsystem:console
   304    304   guilflags = $(lflags) -subsystem:windows
   305         -baselibs  = $(TCLSTUBLIB) $(SSL_LIBS) ws2_32.lib gdi32.lib
          305  +baselibs  = $(TCLSTUBLIB) $(SSL_LIBS) ws2_32.lib user32.lib gdi32.lib advapi32.lib
   306    306   
   307    307   #---------------------------------------------------------------------
   308    308   # TclTest flags
   309    309   #---------------------------------------------------------------------
   310    310   
   311    311   !IF "$(TESTPAT)" != ""
   312    312   TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)
................................................................................
   347    347           type tests.log | more
   348    348   !endif
   349    349   
   350    350   setup:
   351    351   	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
   352    352   	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)
   353    353   
          354  +# See <tcl>/win/coffbase.txt for extension base addresses.
   354    355   $(PRJLIB): $(DLLOBJS)
   355         -	$(link32) $(dlllflags) -out:[email protected] $(baselibs) @<<
          356  +	$(link32) $(dlllflags) -base:0x10780000 -out:[email protected] $(baselibs) @<<
   356    357   $**
   357    358   <<
   358    359   	[email protected] $*.exp
   359    360   
   360    361   $(PRJSTUBLIB): $(PRJSTUBOBJS)
   361    362   	$(lib32) -nologo -out:[email protected] $(PRJSTUBOBJS)
   362    363