diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | url.c | 9 |
2 files changed, 11 insertions, 6 deletions
@@ -1,5 +1,11 @@ 2003-10-23 ABE Yuji <cbo46560@pop12.odn.ne.jp> + * [w3m-dev 04011] accessing to an `https' URI with a fragment via a proxy + * url.c (HTTPrequestURI): drop fragment + (openURL): don't clear pu->label + +2003-10-23 ABE Yuji <cbo46560@pop12.odn.ne.jp> + * [w3m-dev 04010] support for deprecated __ss_family * acinclude.m4 (AC_W3M_IPv6): check __ss_family * config.h.in: add HAVE_OLD_SS_FAMILY @@ -8249,4 +8255,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.889 2003/10/22 18:44:30 ukai Exp $ +$Id: ChangeLog,v 1.890 2003/10/22 18:48:09 ukai Exp $ @@ -1,4 +1,4 @@ -/* $Id: url.c,v 1.85 2003/10/20 16:41:56 ukai Exp $ */ +/* $Id: url.c,v 1.86 2003/10/22 18:48:09 ukai Exp $ */ #include "fm.h" #include <sys/types.h> #include <sys/socket.h> @@ -1340,7 +1340,10 @@ HTTPrequestURI(ParsedURL *pu, HRequest *hr) } } else { + char *save_label = pu->label; + pu->label = NULL; Strcat(tmp, _parsedURL2Str(pu, TRUE)); + pu->label = save_label; } return tmp; } @@ -1627,7 +1630,6 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, #endif /* USE_SSL */ non_null(HTTP_proxy)) && !Do_not_use_proxy && pu->host != NULL && !check_no_proxy(pu->host)) { - char *save_label; hr->flag |= HR_FLAG_PROXY; #ifdef USE_SSL if (pu->scheme == SCM_HTTPS && *status == HTST_CONNECT) { @@ -1659,8 +1661,6 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, #endif return uf; } - save_label = pu->label; - pu->label = NULL; #ifdef USE_SSL if (pu->scheme == SCM_HTTPS) { if (*status == HTST_NORMAL) { @@ -1679,7 +1679,6 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current, { tmp = HTTPrequest(pu, current, hr, extra_header); *status = HTST_NORMAL; - pu->label = save_label; } } else { |