diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-05-28 20:18:52 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-05-28 20:18:52 (GMT) |
| commit | 206d3c1b9c3c7f563898f8f8aa590a543f308eaa (patch) | |
| tree | ca5d53dc03fcc74c3d14d92281b412081aa43a82 /ds9/library | |
| parent | 2222fb279bd3127891eeb1d57e35dcba0e3f3d83 (diff) | |
| parent | 3a8ec573a50533e73202e06d4161927c6d428bbe (diff) | |
| download | blt-206d3c1b9c3c7f563898f8f8aa590a543f308eaa.zip blt-206d3c1b9c3c7f563898f8f8aa590a543f308eaa.tar.gz blt-206d3c1b9c3c7f563898f8f8aa590a543f308eaa.tar.bz2 | |
Merge branch 'master' into devel
Diffstat (limited to 'ds9/library')
| -rw-r--r-- | ds9/library/hvsup.tcl | 2 | ||||
| -rw-r--r-- | ds9/library/imgsvr.tcl | 6 |
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}]] |