From 73cf721919b84edc8912541b6c396ec2186797f2 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Tue, 16 Oct 2018 16:54:00 -0400
Subject: minor bug fixes

---
 ds9/doc/release/r8.0.html                     | 4 +++-
 ds9/library/comm.tcl                          | 2 +-
 ds9/library/ds9.tcl                           | 2 +-
 ds9/library/url.tcl                           | 6 ++++--
 ds9/macos/SAOImageDS9.app/Contents/Info.plist | 6 +++---
 ds9/win/ds9.rc                                | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ds9/doc/release/r8.0.html b/ds9/doc/release/r8.0.html
index 979402b..09c547f 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 retreiveing 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/ds9.tcl b/ds9/library/ds9.tcl
index 24f0881..ae97a47 100644
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
@@ -13,7 +13,7 @@ proc DS9Def {} {
     }
 
     # for beta version, MUST have space
-    set ds9(version) {8.0}
+    set ds9(version) {8.0 rc6}
 
     set ds9(top) .
     set ds9(mb) .mb
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
diff --git a/ds9/macos/SAOImageDS9.app/Contents/Info.plist b/ds9/macos/SAOImageDS9.app/Contents/Info.plist
index d41fb7b..69a5649 100644
--- a/ds9/macos/SAOImageDS9.app/Contents/Info.plist
+++ b/ds9/macos/SAOImageDS9.app/Contents/Info.plist
@@ -35,7 +35,7 @@
 	<key>CFBundleExecutable</key>
 	<string>ds9</string>
 	<key>CFBundleGetInfoString</key>
-	<string>"SAOImageDS9 8.0
+	<string>"SAOImageDS9 8.0rc6
 Copyright 1999-2018
 Smithsonian Astrophysical Observatory"</string>
 	<key>CFBundleIconFile</key>
@@ -49,11 +49,11 @@ Smithsonian Astrophysical Observatory"</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>8.0</string>
+	<string>8.0rc6</string>
 	<key>CFBundleSignature</key>
 	<string>DS9</string>
 	<key>CFBundleVersion</key>
-	<string>8.0</string>
+	<string>8.0rc6</string>
 	<key>NSHighResolutionCapable</key>
 	<string>True</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/ds9/win/ds9.rc b/ds9/win/ds9.rc
index 0a0050d..6250834 100644
--- a/ds9/win/ds9.rc
+++ b/ds9/win/ds9.rc
@@ -1,6 +1,6 @@
 #include <windows.h>
 
-#define VV "8.0"
+#define VV "8.0rc6"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION    8,0,0,0
-- 
cgit v0.12