w3m

commit b92edab0b469a4660638d65edb6b41b40787760d
parent edd8f2d3dd2caafce8545f85c6f199e31619f731
Author: ukai <ukai>
Date:   Tue,  3 Dec 2002 15:00:52 +0000

[w3m-dev 03505] Re: coredump when ssl error
* file.c (loadGeneralFile): term_raw(), SIGINT before retry
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
5
+++++
M
file.c
 | 
8
++++----

2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-03  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03505] Re: coredump when ssl error
+	* file.c (loadGeneralFile): term_raw(), SIGINT before retry
+
 2002-12-03  AIDA Shinra <aida-s@jcom.home.ne.jp>
 
 	* [w3m-dev 03504] coredump when ssl error
diff --git a/file.c b/file.c
@@ -1496,6 +1496,10 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
     add_auth_cookie_flag = 0;
 
   load_doc:
+    if (fmInitialized)
+	term_raw();
+    if (prevtrap)
+	signal(SIGINT, prevtrap);
     url_option.referer = referer;
     url_option.flag = flag;
     f = openURL(tpath, &pu, current, &url_option, request, extra_header, of,
@@ -1508,10 +1512,6 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	/* openURL failure: it means either (1) the requested URL is a directory name
 	 * on an FTP server, or (2) is a local directory name. 
 	 */
-	if (fmInitialized)
-	    term_raw();
-	if (prevtrap)
-	    signal(SIGINT, prevtrap);
 	switch (f.scheme) {
 	case SCM_FTPDIR:
 	    {