diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-10-16 21:19:03 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-10-16 21:19:03 (GMT) |
| commit | 6e339e7f5405f43e971edae22bd21a6d03b9ade8 (patch) | |
| tree | 15a04de35dbec51a8ff6cf4cba729776731c57e1 /ds9 | |
| parent | cffcd86654d0e32c14385dde36fa74a0e837595d (diff) | |
| parent | a2547d4fc66d7e76bfff3ad8ede3cffc95487704 (diff) | |
| download | blt-6e339e7f5405f43e971edae22bd21a6d03b9ade8.zip blt-6e339e7f5405f43e971edae22bd21a6d03b9ade8.tar.gz blt-6e339e7f5405f43e971edae22bd21a6d03b9ade8.tar.bz2 | |
Merge branch 'master' into devel
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/doc/release/r8.0.html | 4 | ||||
| -rw-r--r-- | ds9/library/comm.tcl | 2 | ||||
| -rw-r--r-- | ds9/library/url.tcl | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/ds9/doc/release/r8.0.html b/ds9/doc/release/r8.0.html index 979402b..f355d8e 100644 --- a/ds9/doc/release/r8.0.html +++ b/ds9/doc/release/r8.0.html @@ -92,7 +92,9 @@ incorrectly calculating an index into the data cube.</tt></li> <li><tt>10.01.2018 API: Tweaked parsers to fix issue with XPA/SAMP error messages.</tt></li> <li><tt><b>10.02.2018 RELEASE version 8.0rc5</b></tt></li> <li><tt>10.08.2018 FITS: command -url: accept mime type 'text' as 'fits'.</tt></li> -<li><tt><b>12.15.2018 RELEASE version 8.0</b></tt></li> +<li><tt>10.16.2018 API: fixed an issue with CommReturn, so that it returns at the top level.</tt></li> +<li><tt>10.16.2018 SAMP: added -keepalive to http::geturl calls in cases of retrieveing large files from servers that use Transport-encoding: chunked.</tt></li> +<li><tt><b>10.18.2018 RELEASE version 8.0rc6</b></tt></li> </ol> </div> </body> diff --git a/ds9/library/comm.tcl b/ds9/library/comm.tcl index 8be7f98..8e78f6e 100644 --- a/ds9/library/comm.tcl +++ b/ds9/library/comm.tcl @@ -6,7 +6,7 @@ package provide DS9 1.0 # used to access ProcessSend*Cmd via tcl proc CommReturn {id rr} { - return "$id $rr" + return -level 3 "$id $rr" } proc CommSet {fn paramlist {safemode 0}} { diff --git a/ds9/library/url.tcl b/ds9/library/url.tcl index d8f21ee..1c159f9 100644 --- a/ds9/library/url.tcl +++ b/ds9/library/url.tcl @@ -44,12 +44,13 @@ proc GetFileHTTP {url fn} { if {[catch {http::geturl $url \ -channel $ch \ -binary 1 \ + -keepalive 1 \ + -timeout $ihttp(timeout) \ -headers "[ProxyHTTP]"} token]} { close $ch return } - # -timeout $ihttp(timeout) \ # reset errorInfo (may be set in http::geturl) global errorInfo @@ -141,9 +142,10 @@ proc LoadURLFitsHTTP {url layer mode} { set token [http::geturl $url \ -channel $ch \ -binary 1 \ + -keepalive 1 \ + -timeout $ihttp(timeout) \ -headers "[ProxyHTTP]"] - # -timeout $ihttp(timeout) \ # reset errorInfo (may be set in http::geturl) global errorInfo |