diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-10-18 18:36:52 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-10-18 18:36:52 (GMT) |
| commit | 01779e2225fe31245ad94ccd01f95c5c7d805494 (patch) | |
| tree | 604419116c3aedbb152ecdc500f418059c95fac7 /ds9 | |
| parent | 6e339e7f5405f43e971edae22bd21a6d03b9ade8 (diff) | |
| parent | c08c815e3bd6b62cb17ae1eda4fcce81059d316d (diff) | |
| download | blt-01779e2225fe31245ad94ccd01f95c5c7d805494.zip blt-01779e2225fe31245ad94ccd01f95c5c7d805494.tar.gz blt-01779e2225fe31245ad94ccd01f95c5c7d805494.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/url.tcl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ds9/doc/release/r8.0.html b/ds9/doc/release/r8.0.html index f355d8e..d30d785 100644 --- a/ds9/doc/release/r8.0.html +++ b/ds9/doc/release/r8.0.html @@ -93,7 +93,9 @@ incorrectly calculating an index into the data cube.</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>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>10.16.2018 SAMP: added -keepalive to http::geturl calls in cases of retreiveing large files from servers that use Transport-encoding: chunked.</tt></li> +<li><tt>10.17.2018 SAMP: reset http token in case of error.</tt></li> +<li><tt>10.17.2018 CUBE: fixed an issue with properly rounding slice number.</tt></li> <li><tt><b>10.18.2018 RELEASE version 8.0rc6</b></tt></li> </ol> </div> diff --git a/ds9/library/url.tcl b/ds9/library/url.tcl index 1c159f9..ac217b6 100644 --- a/ds9/library/url.tcl +++ b/ds9/library/url.tcl @@ -146,7 +146,6 @@ proc LoadURLFitsHTTP {url layer mode} { -timeout $ihttp(timeout) \ -headers "[ProxyHTTP]"] - # reset errorInfo (may be set in http::geturl) global errorInfo set errorInfo {} @@ -215,6 +214,7 @@ proc LoadURLFitsHTTP {url layer mode} { default { Error "HTTP [msgcat::mc {Error}] $code" + http::reset $token return } } |