aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-12-14 16:09:51 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-12-14 16:09:51 +0000
commitb5420dc7c52edb05b8ac97e192939a11b3fe14a8 (patch)
treec6e1823afda9ab0816cdcdb665a6c6894d03370b
parent[w3m-dev 03571] base=0 -> 10 in toNumber() (diff)
downloadw3m-b5420dc7c52edb05b8ac97e192939a11b3fe14a8.tar.gz
w3m-b5420dc7c52edb05b8ac97e192939a11b3fe14a8.zip
[w3m-dev 03573] Re: Bug#172851: w3m: In form, takes hostname as baseref for relative URI action
* url.c (parseURL): if empty is URL, base URL is used From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat (limited to '')
-rw-r--r--ChangeLog7
-rw-r--r--url.c10
2 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 07c6854..736a0dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-15 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 03573] Re: Bug#172851: w3m: In form, takes hostname as baseref for relative URI action
+ * url.c (parseURL): if empty is URL, base URL is used
+
2002-12-15 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03571] base=0 -> 10 in toNumber()
@@ -5868,4 +5873,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.622 2002/12/14 15:37:56 ukai Exp $
+$Id: ChangeLog,v 1.623 2002/12/14 16:09:51 ukai Exp $
diff --git a/url.c b/url.c
index fd328c3..8de86a3 100644
--- a/url.c
+++ b/url.c
@@ -1,4 +1,4 @@
-/* $Id: url.c,v 1.59 2002/12/14 15:18:39 ukai Exp $ */
+/* $Id: url.c,v 1.60 2002/12/14 16:09:51 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -675,6 +675,14 @@ parseURL(char *url, ParsedURL *p_url, ParsedURL *current)
p_url->query = NULL;
p_url->label = NULL;
+ /* RFC1808: Relative Uniform Resource Locators
+ * 4. Resolving Relative URLs
+ */
+ if (*url == '\0' && current) {
+ copyParsedURL(p_url, current);
+ return;
+ }
+
if (*url == '#') { /* label only */
if (current)
copyParsedURL(p_url, current);