aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2003-01-10 16:29:23 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2003-01-10 16:29:23 +0000
commit4976d0cfe9fc47aa8b0da10d41abe8cb65873355 (patch)
treecece1e8d88f8f10b52809d339cc3785ca579134b
parent[w3m-dev 03625] keymap key SEARCH string (diff)
downloadw3m-4976d0cfe9fc47aa8b0da10d41abe8cb65873355.tar.gz
w3m-4976d0cfe9fc47aa8b0da10d41abe8cb65873355.zip
[w3m-dev 03626] Re: relative URL
* url.c (parseURL2): copy if scheme is local or local-cgi From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat (limited to '')
-rw-r--r--ChangeLog7
-rw-r--r--url.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 18221b7..1b1cab2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2003-01-11 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+ * [w3m-dev 03626] Re: relative URL
+ * url.c (parseURL2): copy if scheme is local or local-cgi
+
+2003-01-11 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
* [w3m-dev 03625] keymap key SEARCH string
* main.c (srch): accept command argument
(reMark): accept command argument
@@ -6275,4 +6280,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.664 2003/01/10 16:23:52 ukai Exp $
+$Id: ChangeLog,v 1.665 2003/01/10 16:29:23 ukai Exp $
diff --git a/url.c b/url.c
index 2c4b656..af335fc 100644
--- a/url.c
+++ b/url.c
@@ -1,4 +1,4 @@
-/* $Id: url.c,v 1.66 2003/01/08 17:24:13 ukai Exp $ */
+/* $Id: url.c,v 1.67 2003/01/10 16:29:28 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -1026,7 +1026,9 @@ parseURL2(char *url, ParsedURL *pu, ParsedURL *current)
pu->file = expandName(pu->file);
if (current && (pu->scheme == current->scheme ||
- (pu->scheme == SCM_FTP && current->scheme == SCM_FTPDIR))
+ (pu->scheme == SCM_FTP && current->scheme == SCM_FTPDIR) ||
+ (pu->scheme == SCM_LOCAL &&
+ current->scheme == SCM_LOCAL_CGI))
&& pu->host == NULL) {
/* Copy omitted element from the current URL */
pu->user = current->user;