commit 4ffab4e1de2e630c8ecbd5a6805c6a228e78cc99
parent bd136d5b26a676c4416df48e94240ca64c3e485a
Author: ukai <ukai>
Date: Sun, 13 Apr 2003 18:36:50 +0000
[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>
Diffstat:
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git 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
diff --git a/file.c b/file.c
@@ -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
@@ -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);