diff options
| author | kjnash <k.j.nash@usa.net> | 2022-09-15 14:58:59 (GMT) |
|---|---|---|
| committer | kjnash <k.j.nash@usa.net> | 2022-09-15 14:58:59 (GMT) |
| commit | 9e810a504500232f79a23de35a33127dc19bd34b (patch) | |
| tree | 075ab3f448d6e167ba88e6aa574cce3c881b44e2 /library/http | |
| parent | aca6eed0f36ee531e3e3c8eeb6c6c966ad80057f (diff) | |
| parent | 0371b9ed8d4bd0943122234faf1c03cfc14b3405 (diff) | |
| download | tcl-9e810a504500232f79a23de35a33127dc19bd34b.zip tcl-9e810a504500232f79a23de35a33127dc19bd34b.tar.gz tcl-9e810a504500232f79a23de35a33127dc19bd34b.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'library/http')
| -rw-r--r-- | library/http/http.tcl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl index 23b065c..326aede 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -897,7 +897,7 @@ proc http::geturl {url args} { # script or installation that modified ::tls::socketCmd is also # responsible for integrating ::http::socket into its own "new" command, # if it wishes to do so. - + if {[info exists ::tls::socketCmd] && ($::tls::socketCmd eq {::socket})} { set ::tls::socketCmd $socketCmd } @@ -1701,7 +1701,7 @@ proc http::OpenSocket {token DoLater} { # socket with the real socket, not only in $token but in all other requests # that use the same placeholder. # (2) It calls ScheduleRequest to schedule each request that uses the socket. -# +# # # Value of sockOld/sockNew can be "sock" (genuine socket) or "ph" (placeholder). # sockNew is ${token}(sock) @@ -1761,7 +1761,7 @@ proc http::ConfigureNewSocket {token sockOld DoLater} { # # FIXME If Finish is placeholder-aware, these traces can be set earlier, # in PreparePersistentConnection. - + if {[dict get $DoLater -traceread]} { set varName ::http::socketRdState($state(socketinfo)) trace add variable $varName unset ::http::CancelReadPipeline @@ -4858,7 +4858,7 @@ proc http::LoadThreadIfNeeded {} { proc http::SockInThread {caller defcmd sockargs} { package require Thread - + set catchCode [catch {eval $defcmd $sockargs} sock errdict] if {$catchCode == 0} { set catchCode [catch {thread::transfer $caller $sock; set sock} sock errdict] |