about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CHANGES7
-rw-r--r--PACKAGE/debian/doc-base4
-rw-r--r--WWW/Library/Implementation/HTTP.c6
-rw-r--r--src/LYCurses.c4
4 files changed, 13 insertions, 8 deletions
diff --git a/CHANGES b/CHANGES
index 01bebe83..a8f2be7b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,10 @@
--- $LynxId: CHANGES,v 1.856 2016/11/04 17:10:16 tom Exp $
+-- $LynxId: CHANGES,v 1.857 2016/11/04 18:43:49 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
 2016-11-04 (2.8.9dev.10)
+* improved for OpenSSL 1.1 (Taketo Kabe).
 * improve warning message when stripping user/password from URL; report on
   http://seclists.org/oss-sec/2016/q4/322 treated as a Lynx parsing error the
   punctuation such as "?" which is permitted by RFC-1738 in a user or password
@@ -66,7 +67,7 @@ Changes since Lynx 2.8 release
   (suggested by TG) -TD
 * fix some typos found by lintian -Axel Beckert
 * correct buffer size in pretty_html() function of LYKeymap.c -TG
-* add support for some HTML5 elements -Kihara Hideto 
+* add support for some HTML5 elements -Kihara Hideto
   Using this change, you can jump to <section id="speakers">.
   (The addition in src{0,1}_HTMLDTD.txt is copied from DIV.)
   <section>, <article>, <main>, <aside>, <header>, <footer>, <nav>, <figure>
@@ -149,7 +150,7 @@ Changes since Lynx 2.8 release
 * correct shortcut for "Send To" link used in Inno Setup script, broken in
   2.8.8dev.15 -TD
 * amend change made in 2.8.8dev.10 to LYLocal.c get_filename(), ensuring that
-  the bstring parameter can be (re)allocated within that function's call to 
+  the bstring parameter can be (re)allocated within that function's call to
   LYgetBString() (report by Raoul Megelas) -TG
 * build-fixes for djgpp 2.04 and gcc 4.8.4 using Watt-32 -GV
 
diff --git a/PACKAGE/debian/doc-base b/PACKAGE/debian/doc-base
index e77e7c2c..ef651b77 100644
--- a/PACKAGE/debian/doc-base
+++ b/PACKAGE/debian/doc-base
@@ -6,5 +6,5 @@ Abstract: This manual describes what lynx-dev is
 Section: Network/Web Browsing
 
 Format: HTML
-Index: /usr/share/doc/lynx-dev/lynx_help/lynx_help_main.html.gz
-Files: /usr/share/doc/lynx-dev/lynx_help/*.html.gz
+Index: /usr/share/doc/lynx-dev/help_dir/lynx_help_main.html.gz
+Files: /usr/share/doc/lynx-dev/help_dir/*.html.gz
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index a4cb9c0e..420aae17 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.156 2016/11/04 13:27:29 tom Exp $
+ * $LynxId: HTTP.c,v 1.157 2016/11/04 18:42:10 Taketo.Kabe Exp $
  *
  * HyperText Tranfer Protocol	- Client implementation		HTTP.c
  * ==========================
@@ -882,7 +882,11 @@ static int HTLoadHTTP(const char *arg,
 #elif SSLEAY_VERSION_NUMBER >= 0x0900
 #ifndef USE_NSS_COMPAT_INCL
 	if (!try_tls) {
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+	    SSL_set_min_proto_version(handle, TLS1_1_VERSION);
+#else
 	    SSL_set_options(handle, SSL_OP_NO_TLSv1);
+#endif
 	    CTRACE((tfp, "...adding SSL_OP_NO_TLSv1\n"));
 	}
 #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 4608b0a9..ab264b29 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.c,v 1.180 2014/07/24 22:08:24 tom Exp $ */
+/* $LynxId: LYCurses.c,v 1.181 2016/11/04 21:54:57 tom Exp $ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 
@@ -3232,7 +3232,7 @@ long LYgetattrs(WINDOW * win)
      * FIXME: this ignores the color-pair, which for most implementations is
      * not stored in the attribute value.
      */
-    (void) wattr_get(win, &attrs, &pair, NULL);
+    (void) (wattr_get) (win, &attrs, &pair, NULL);
     result = (long) attrs;
 #endif
     return result;