aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2003-08-29 14:49:46 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2003-08-29 14:49:46 +0000
commit9b35e9d994aa63cfd2782c7667c20ced6f73d9c3 (patch)
treec6dad97c06e1edcf1f955ee23379974c17afd7da
parent[w3m-dev 03950] rel attribute of anchor tag (diff)
downloadw3m-9b35e9d994aa63cfd2782c7667c20ced6f73d9c3.tar.gz
w3m-9b35e9d994aa63cfd2782c7667c20ced6f73d9c3.zip
[w3m-dev 03957] Location: from local-CGI
* file.c (loadGeneralFile): don't parse header for local file redirected by Location: from local-CGI From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
-rw-r--r--ChangeLog8
-rw-r--r--file.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 35e8fd4..ddc868a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-29 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03957] Location: from local-CGI
+ * file.c (loadGeneralFile): don't parse header for local file
+ redirected by Location: from local-CGI
+
2003-08-12 TSUCHIYA Masatoshi <tsuchiya@pine.kuee.kyoto-u.ac.jp>
* [w3m-dev 03950] rel attribute of anchor tag
@@ -7989,4 +7995,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.857 2003/08/11 17:33:08 ukai Exp $
+$Id: ChangeLog,v 1.858 2003/08/29 14:49:46 ukai Exp $
diff --git a/file.c b/file.c
index 6b48a5d..4ed0360 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.225 2003/07/07 15:39:43 ukai Exp $ */
+/* $Id: file.c,v 1.226 2003/08/29 14:49:46 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -1848,6 +1848,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
t = f.guess_type;
}
else if (searchHeader) {
+ searchHeader = SearchHeader = FALSE;
if (t_buf == NULL)
t_buf = newBuffer(INIT_BUFFER_WIDTH);
readHeader(&f, t_buf, searchHeader_through, &pu);
@@ -1868,7 +1869,6 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
t = checkContentType(t_buf);
if (t == NULL)
t = "text/plain";
- searchHeader = SearchHeader = FALSE;
}
else if (DefaultType) {
t = DefaultType;