about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--WWW/Library/Implementation/HTFile.c4
-rw-r--r--WWW/Library/Implementation/HTGopher.c4
3 files changed, 8 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index 8f8b75e3..78d52295 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,11 @@
--- $LynxId: CHANGES,v 1.973 2018/05/04 22:33:56 tom Exp $
+-- $LynxId: CHANGES,v 1.974 2018/05/06 20:06:36 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2018-05-03 (2.8.9dev.18)
+2018-05-06 (2.8.9dev.18)
+* ignore content-encoding in HTContentToCompressType() if the content-type is
+  known, to improve the suggested filename (report by Russell Bell) -TD
 * add support for using client certificate with OpenSSL configuration (patch
   by Elliot Thomas).
 * fix a few more memory leaks -TD
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 1f3ec5eb..4cf03f69 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.148 2018/03/05 22:37:12 tom Exp $
+ * $LynxId: HTFile.c,v 1.149 2018/05/06 19:46:38 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -1423,7 +1423,7 @@ CompressFileType HTContentToCompressType(HTParentAnchor *anchor)
     const char *ct = HTAnchor_content_type(anchor);
     const char *ce = HTAnchor_content_encoding(anchor);
 
-    if (ce == NULL && ct != 0) {
+    if (ct != 0) {
 	method = HTContentTypeToCompressType(ct);
     } else if (ce != 0) {
 	method = HTEncodingToCompressType(ce);
diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c
index 916140e9..1417d9b6 100644
--- a/WWW/Library/Implementation/HTGopher.c
+++ b/WWW/Library/Implementation/HTGopher.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTGopher.c,v 1.66 2018/03/20 23:38:15 tom Exp $
+ * $LynxId: HTGopher.c,v 1.67 2018/05/04 22:42:37 tom Exp $
  *
  *			GOPHER ACCESS				HTGopher.c
  *			=============
@@ -1712,7 +1712,7 @@ static char *link_to_URL(const char *arg)
 	result = next + 1;
     }
     /* check if the selector is the special html one */
-    if (!strncmp(result, "hURL:", 5)) {
+    if (!strncmp(result, "hURL:", (size_t)5)) {
 	result += 5;
 	next = result;
 	result = temp;