From 12723d3c6b95e45e11744e003a01d7c7a2553afb Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Sun, 13 Apr 2003 18:36:50 +0000
Subject: [w3m-dev 03873] SSL & compressed stream * file.c (loadGeneralFile):
always update ssl_certificate * url.c (openURL): initialize URLFile From:
Fumitoshi UKAI <ukai@debian.or.jp>
---
ChangeLog | 8 +++++++-
file.c | 5 ++---
url.c | 3 ++-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 75e8415..47d77b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-14 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 03873] SSL & compressed stream
+ * file.c (loadGeneralFile): always update ssl_certificate
+ * url.c (openURL): initialize URLFile
+
2003-04-12 NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>
* [w3m-dev 03872] goodict.cgi
@@ -7732,4 +7738,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.822 2003/04/12 14:28:55 ukai Exp $
+$Id: ChangeLog,v 1.823 2003/04/13 18:36:50 ukai Exp $
diff --git a/file.c b/file.c
index 5ac7c83..287c9b4 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.220 2003/04/06 16:27:54 ukai Exp $ */
+/* $Id: file.c,v 1.221 2003/04/13 18:36:51 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -2043,8 +2043,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
t_buf->bufferprop |= BP_FRAME;
}
#ifdef USE_SSL
- if (IStype(f.stream) == IST_SSL)
- t_buf->ssl_certificate = f.ssl_certificate;
+ t_buf->ssl_certificate = f.ssl_certificate;
#endif
frame_source = flag & RG_FRAME_SRC;
b = loadSomething(&f, pu.real_file ? pu.real_file : pu.file, proc, t_buf);
diff --git a/url.c b/url.c
index 29d3d0a..8e8befe 100644
--- a/url.c
+++ b/url.c
@@ -1,4 +1,4 @@
-/* $Id: url.c,v 1.76 2003/03/14 02:07:57 ukai Exp $ */
+/* $Id: url.c,v 1.77 2003/04/13 18:36:51 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -1497,6 +1497,7 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
}
}
+ memset(&uf, 0, sizeof uf);
uf.scheme = pu->scheme;
uf.url = parsedURL2Str(pu)->ptr;
pu->is_nocache = (option->flag & RG_NOCACHE);
--
cgit v1.2.3