commit b57e1fd402dc65c9ccbe24aebf524f6b30a0e57c
parent 2c84f37390fa2d417c0b6fed69a6a8e512946a38
Author: ukai <ukai>
Date: Mon, 4 Feb 2002 14:49:21 +0000
[w3m-dev 02985] inputAnswer() and no "ssl_forbid_method"
* file.c (inputAnswer): buf size is 80
* url.c (openSSLHandle): if old_ssl_forbid_method == ssl_forbid_method
ssl path is not modified
From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat:
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-04 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 02985] inputAnswer() and no "ssl_forbid_method"
+ * file.c (inputAnswer): buf size is 80
+ * url.c (openSSLHandle): if old_ssl_forbid_method == ssl_forbid_method
+ ssl path is not modified
+
2002-02-04 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 02980] Re: code_to_str not found ifndef JP_CHARSET
diff --git a/file.c b/file.c
@@ -6982,7 +6982,7 @@ char *
inputAnswer(char *prompt)
{
char *ans;
- char buf[2];
+ char buf[80];
if (fmInitialized) {
term_raw();
@@ -6991,7 +6991,7 @@ inputAnswer(char *prompt)
else {
printf(prompt);
fflush(stdout);
- fgets(buf, 2, stdin);
+ fgets(buf, 80, stdin);
ans = allocStr(buf, 1);
}
return ans;
diff --git a/url.c b/url.c
@@ -286,8 +286,9 @@ openSSLHandle(int sock, char *hostname)
static int old_ssl_verify_server = -1;
#endif
- if (!old_ssl_forbid_method || !ssl_forbid_method ||
- strcmp(old_ssl_forbid_method, ssl_forbid_method)) {
+ if (old_ssl_forbid_method != ssl_forbid_method
+ && (!old_ssl_forbid_method || !ssl_forbid_method ||
+ strcmp(old_ssl_forbid_method, ssl_forbid_method))) {
old_ssl_forbid_method = ssl_forbid_method;
#ifdef USE_SSL_VERIFY
ssl_path_modified = 1;