storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 04011] accessing to an `https' URI with a fragment via a proxy

Browse Source 
* url.c (HTTPrequestURI): drop fragment
	(openURL): don't clear pu->label
From: ABE Yuji <cbo46560@pop12.odn.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2003-10-22 18:48:09 +00:00
parent 4028a343d5
commit 44fdbe22fc
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,9 @@
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> 2003-10-23 ABE Yuji <cbo46560@pop12.odn.ne.jp>
* [w3m-dev 04010] support for deprecated __ss_family * [w3m-dev 04010] support for deprecated __ss_family
@@ -8249,4 +8255,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-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 $

9
url.c
View File

@@ -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 "fm.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@@ -1340,7 +1340,10 @@ HTTPrequestURI(ParsedURL *pu, HRequest *hr)
} }
} }
else { else {
char *save_label = pu->label;
pu->label = NULL;
Strcat(tmp, _parsedURL2Str(pu, TRUE)); Strcat(tmp, _parsedURL2Str(pu, TRUE));
pu->label = save_label;
} }
return tmp; return tmp;
} }
@@ -1627,7 +1630,6 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
#endif /* USE_SSL */ #endif /* USE_SSL */
non_null(HTTP_proxy)) && !Do_not_use_proxy && non_null(HTTP_proxy)) && !Do_not_use_proxy &&
pu->host != NULL && !check_no_proxy(pu->host)) { pu->host != NULL && !check_no_proxy(pu->host)) {
char *save_label;
hr->flag |= HR_FLAG_PROXY; hr->flag |= HR_FLAG_PROXY;
#ifdef USE_SSL #ifdef USE_SSL
if (pu->scheme == SCM_HTTPS && *status == HTST_CONNECT) { if (pu->scheme == SCM_HTTPS && *status == HTST_CONNECT) {
@@ -1659,8 +1661,6 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
#endif #endif
return uf; return uf;
} }
save_label = pu->label;
pu->label = NULL;
#ifdef USE_SSL #ifdef USE_SSL
if (pu->scheme == SCM_HTTPS) { if (pu->scheme == SCM_HTTPS) {
if (*status == HTST_NORMAL) { if (*status == HTST_NORMAL) {
@@ -1679,7 +1679,6 @@ openURL(char *url, ParsedURL *pu, ParsedURL *current,
{ {
tmp = HTTPrequest(pu, current, hr, extra_header); tmp = HTTPrequest(pu, current, hr, extra_header);
*status = HTST_NORMAL; *status = HTST_NORMAL;
pu->label = save_label;
} }
} }
else { else {