summaryrefslogtreecommitdiffstats
path: root/ds9
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2019-05-28 20:18:34 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2019-05-28 20:18:34 (GMT)
commit3a8ec573a50533e73202e06d4161927c6d428bbe (patch)
treeb2cde6f02ad111a002ff82453cf50e09be13f340 /ds9
parent45619b5d0d1e761db43f1d8302c223b6746bb998 (diff)
downloadblt-3a8ec573a50533e73202e06d4161927c6d428bbe.zip
blt-3a8ec573a50533e73202e06d4161927c6d428bbe.tar.gz
blt-3a8ec573a50533e73202e06d4161927c6d428bbe.tar.bz2
URL: more tolerant of mime types when downloading via http
Diffstat (limited to 'ds9')
-rw-r--r--ds9/library/hvsup.tcl2
-rw-r--r--ds9/library/imgsvr.tcl6
2 files changed, 4 insertions, 4 deletions
diff --git a/ds9/library/hvsup.tcl b/ds9/library/hvsup.tcl
index 85a0b3b..da6ab40 100644
--- a/ds9/library/hvsup.tcl
+++ b/ds9/library/hvsup.tcl
@@ -934,7 +934,7 @@ proc HVParseSingle {varname} {
"text/html" -
"text/plain" -
"application/octet-stream" {
- # its never fails, someone can't get there mime types correct.
+ # it never fails, someone can't get there mime types correct.
# Override the mime type based on path
ParseURL $var(url) r
diff --git a/ds9/library/imgsvr.tcl b/ds9/library/imgsvr.tcl
index 3bfa845..273fe09 100644
--- a/ds9/library/imgsvr.tcl
+++ b/ds9/library/imgsvr.tcl
@@ -378,8 +378,10 @@ proc IMGSVRParse {varname} {
}
switch -- [string tolower $var(mime)] {
+ "text/html" -
+ "text/plain" -
"application/octet-stream" {
- # its never fails, someone can't get there mime types correct.
+ # it never fails, someone can't get there mime types correct.
# Override the mime type based on path
switch -- [file extension $var(fn)] {
.bz2 {set var(encoding) bzip2}
@@ -417,8 +419,6 @@ proc IMGSVRParse {varname} {
"image/x-zfits" -
"binary/x-zfits" {set var(encoding) pack}
- "text/html" -
- "text/plain" -
default {
# NOTE: error notices may come as text/html
eval [list $var(proc,error) $varname [msgcat::mc {No Data Available}]]