commit 8d92dfafba8f1b10a1d917c7a3e6a84d755a3541
parent 226ab092fcfd1aee3921f4d45432bc3e58b14506
Author: ukai <ukai>
Date: Wed, 22 Oct 2003 18:48:09 +0000
[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
From: ABE Yuji <cbo46560@pop12.odn.ne.jp>
Diffstat:
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git a/url.c b/url.c
@@ -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 {