diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-12 11:10:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-09-12 11:10:49 (GMT) |
| commit | d6a5f77a66fb8cd3131bcf21897e39f953c40ae0 (patch) | |
| tree | 814b584eed5967ed93da791c34a8775d4f13d544 /library/http | |
| parent | 9fd4244e4f77dce5470abdc7d85c9c7d75186b09 (diff) | |
| parent | 5a421912ecffcfe680588b3b91ac62ee907e79ec (diff) | |
| download | tcl-d6a5f77a66fb8cd3131bcf21897e39f953c40ae0.zip tcl-d6a5f77a66fb8cd3131bcf21897e39f953c40ae0.tar.gz tcl-d6a5f77a66fb8cd3131bcf21897e39f953c40ae0.tar.bz2 | |
Merge 8.6
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 38e07cc..3f4da2e 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -795,7 +795,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 } @@ -1606,7 +1606,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) @@ -1666,7 +1666,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 @@ -4382,7 +4382,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] |