[w3m-dev 03914] a fragment in the Referer URI

* url.c (otherinfo): strip URI fragment
From: ABE Yuji <cbo46560@pop12.odn.ne.jp>

2 files changed, 15 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 60fbd20..399a3cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-18  ABE Yuji <cbo46560@pop12.odn.ne.jp>
+
+	* [w3m-dev 03914] a fragment in the Referer URI
+	* url.c (otherinfo): strip URI fragment
+
 2003-06-13  Hiroyuki Ito <hito@crl.go.jp>
 
 	* [w3m-dev 03913] fix gif animation support
@@ -7850,4 +7855,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.841 2003/06/13 15:03:02 ukai Exp $
+$Id: ChangeLog,v 1.842 2003/06/17 18:02:41 ukai Exp $
diff --git a/url.c b/url.c
index d12f83b..8386179 100644
--- a/url.c
+++ b/url.c
@@ -1,4 +1,4 @@
-/* $Id: url.c,v 1.79 2003/05/10 18:20:29 ukai Exp $ */
+/* $Id: url.c,v 1.80 2003/06/17 18:02:41 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -1279,13 +1279,20 @@ otherinfo(ParsedURL *target, ParsedURL *current, char *referer)
 	if (referer == NULL && current && current->scheme != SCM_LOCAL &&
 	    (current->scheme != SCM_FTP ||
 	     (current->user == NULL && current->pass == NULL))) {
+	    char *p = current->label;
 	    Strcat_charp(s, "Referer: ");
+	    current->label = NULL;
 	    Strcat(s, parsedURL2Str(current));
+	    current->label = p;
 	    Strcat_charp(s, "\r\n");
 	}
 	else if (referer != NULL && referer != NO_REFERER) {
+	    char *p = strchr(referer, '#');
 	    Strcat_charp(s, "Referer: ");
-	    Strcat_charp(s, referer);
+	    if (p)
+		Strcat_charp_n(s, referer, p - referer);
+	    else
+		Strcat_charp(s, referer);
 	    Strcat_charp(s, "\r\n");
 	}
     }