[w3m-dev 03875] Re: SSL & compressed stream

* file.c (loadGeneralFile): check t_buf != NULL
* url.c (openURL): don't initialize URLFile here
	(init_stream): 0 clear URLFile
From: Fumitoshi UKAI  <ukai@debian.or.jp>

3 files changed, 13 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 47d77b1..42cdbf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-04-14  Fumitoshi UKAI  <ukai@debian.or.jp>
 
+	* [w3m-dev 03875] Re: SSL & compressed stream
+	* file.c (loadGeneralFile): check t_buf != NULL
+	* url.c (openURL): don't initialize URLFile here
+		(init_stream): 0 clear URLFile
+
+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
@@ -7738,4 +7745,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.823 2003/04/13 18:36:50 ukai Exp $
+$Id: ChangeLog,v 1.824 2003/04/14 03:29:37 ukai Exp $
diff --git a/file.c b/file.c
index 287c9b4..7863e0b 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.221 2003/04/13 18:36:51 ukai Exp $ */
+/* $Id: file.c,v 1.222 2003/04/14 03:29:38 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -2043,7 +2043,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	t_buf->bufferprop |= BP_FRAME;
     }
 #ifdef USE_SSL
-    t_buf->ssl_certificate = f.ssl_certificate;
+    if (t_buf)
+	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 8e8befe..f2b5e8b 100644
--- a/url.c
+++ b/url.c
@@ -1,4 +1,4 @@
-/* $Id: url.c,v 1.77 2003/04/13 18:36:51 ukai Exp $ */
+/* $Id: url.c,v 1.78 2003/04/14 03:29:38 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -1437,6 +1437,7 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra)
 void
 init_stream(URLFile *uf, int scheme, InputStream stream)
 {
+    memset(uf, 0, sizeof(URLFile));
     uf->stream = stream;
     uf->scheme = scheme;
     uf->encoding = ENC_7BIT;
@@ -1497,7 +1498,6 @@ 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);