diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-11-06 16:28:05 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-11-06 16:28:05 (GMT) |
| commit | d8462ed0c6fff27176f1c8909aabdb410d11ec70 (patch) | |
| tree | 7beccf8625b1ad0acb64a608b69a898547c04a33 /library | |
| parent | 62aca3895f16c465b05b0c93ae919635ccc2471d (diff) | |
| parent | 07bc7f6239dbbfb01001aacdfaece126250e1965 (diff) | |
| download | tcl-d8462ed0c6fff27176f1c8909aabdb410d11ec70.zip tcl-d8462ed0c6fff27176f1c8909aabdb410d11ec70.tar.gz tcl-d8462ed0c6fff27176f1c8909aabdb410d11ec70.tar.bz2 | |
merge 8.5
Diffstat (limited to 'library')
| -rw-r--r-- | library/http/http.tcl | 16 | ||||
| -rw-r--r-- | library/http/pkgIndex.tcl | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl index ce9f634..fa0425d 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -11,7 +11,7 @@ package require Tcl 8.4 # Keep this in sync with pkgIndex.tcl and with the install directories in # Makefiles -package provide http 2.7.9 +package provide http 2.7.10 namespace eval http { # Allow resourcing to not clobber existing data @@ -199,15 +199,13 @@ proc http::Finish {token {errormsg ""} {skipCB 0}} { if {[info exists state(after)]} { after cancel $state(after) } - if {[info exists state(-command)] && !$skipCB} { - if {[catch {eval $state(-command) {$token}} err]} { - if {$errormsg eq ""} { - set state(error) [list $err $errorInfo $errorCode] - set state(status) error - } + if {[info exists state(-command)] && !$skipCB + && ![info exists state(done-command-cb)]} { + set state(done-command-cb) yes + if {[catch {eval $state(-command) {$token}} err] && $errormsg eq ""} { + set state(error) [list $err $errorInfo $errorCode] + set state(status) error } - # Command callback may already have unset our state - unset -nocomplain state(-command) } } diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl index 815ac12..0b5cdeb 100644 --- a/library/http/pkgIndex.tcl +++ b/library/http/pkgIndex.tcl @@ -1,4 +1,4 @@ # Tcl package index file, version 1.1 if {![package vsatisfies [package provide Tcl] 8.4]} {return} -package ifneeded http 2.7.9 [list tclPkgSetup $dir http 2.7.9 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] +package ifneeded http 2.7.10 [list tclPkgSetup $dir http 2.7.10 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] |