diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-04-04 11:35:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-04-04 11:35:02 (GMT) |
| commit | 7cbf2552fabd7eaf48150c2d4b5bace39ae8943a (patch) | |
| tree | f795752fb3b9f805da598f052433dcf170104603 /library | |
| parent | 403ba3fe0d4ff125a0eb88ae9ee245e328c09350 (diff) | |
| parent | 3899582e36ab11dba2246f3fe06e894adfaecb2c (diff) | |
| download | tcl-7cbf2552fabd7eaf48150c2d4b5bace39ae8943a.zip tcl-7cbf2552fabd7eaf48150c2d4b5bace39ae8943a.tar.gz tcl-7cbf2552fabd7eaf48150c2d4b5bace39ae8943a.tar.bz2 | |
Merge 8.6. http -> 2.10a2
Diffstat (limited to 'library')
| -rw-r--r-- | library/http/http.tcl | 5 | ||||
| -rw-r--r-- | library/http/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | library/manifest.txt | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl index 74f93df..6f85e99 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -11,7 +11,7 @@ package require Tcl 8.6- # Keep this in sync with pkgIndex.tcl and with the install directories in # Makefiles -package provide http 2.10a1 +package provide http 2.10a2 namespace eval http { # Allow resourcing to not clobber existing data @@ -1327,8 +1327,7 @@ proc http::Connected {token proto phost srvurl} { set sock $state(sock) set isQueryChannel [info exists state(-querychannel)] set isQuery [info exists state(-query)] - set host [lindex [split $state(socketinfo) :] 0] - set port [lindex [split $state(socketinfo) :] 1] + regexp {^(.+):([^:]+)$} $state(socketinfo) {} host port set lower [string tolower $proto] set defport [lindex $urlTypes($lower) 0] diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl index b8afd79..d58e8b2 100644 --- a/library/http/pkgIndex.tcl +++ b/library/http/pkgIndex.tcl @@ -1,2 +1,2 @@ if {![package vsatisfies [package provide Tcl] 8.6-]} {return} -package ifneeded http 2.10a1 [list tclPkgSetup $dir http 2.10a1 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] +package ifneeded http 2.10a2 [list tclPkgSetup $dir http 2.10a2 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] diff --git a/library/manifest.txt b/library/manifest.txt index fdae645..a9e2725 100644 --- a/library/manifest.txt +++ b/library/manifest.txt @@ -5,7 +5,7 @@ apply {{dir} { set ::test [info script] set isafe [interp issafe] foreach {safe package version file} { - 0 http 2.10a1 {http http.tcl} + 0 http 2.10a2 {http http.tcl} 1 msgcat 1.7.1 {msgcat msgcat.tcl} 1 opt 0.4.8 {opt optparse.tcl} 0 cookiejar 0.2.0 {cookiejar cookiejar.tcl} |