Re: [w3m-dev 03320] Re: Passwords

* etc.c (dir_under): same path is ok
* file.c (loadGeneralFile): if missing, return NULL
	ssl cert already checked
* html.h (URLFILE): add ssl_certificate
* istream.c (ssl_get_certificate): change args
* istream.h (ssl_get_certificate): ditto
* url.c (openSSLHandle): add p_cert
	ssl certificate check here
	(HTTPrequest): auth_cookie fix
From: AIDA Shinra <aida-s@jcom.home.ne.jp>

1 files changed, 8 insertions, 8 deletions

diff --git a/file.c b/file.c
index 7d4ef66..fc62f4f 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.101 2002/09/24 16:35:02 ukai Exp $ */
+/* $Id: file.c,v 1.102 2002/09/28 16:30:07 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -1582,6 +1582,11 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	return NULL;
     }
 
+    if (status == HTST_MISSING) {
+	UFclose(&f);
+	return NULL;
+    }
+
     /* openURL() succeeded */
     if (SETJMP(AbortLoading) != 0) {
 	/* transfer interrupted */
@@ -1955,13 +1960,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	t_buf->bufferprop |= BP_FRAME;
     }
 #ifdef USE_SSL
-    if (IStype(f.stream) == IST_SSL) {
-	Str s = ssl_get_certificate(f.stream, pu.host);
-	if (s == NULL)
-	    return NULL;
-	else
-	    t_buf->ssl_certificate = s->ptr;
-    }
+    if (IStype(f.stream) == IST_SSL)
+	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);