[w3m-dev 03429] https proxy

* fm.h (HTTPS_proxy): added
	(HTTPS_proxy_parsed): added
* main.c (main): check https_proxy
* rc.c (CMT_HTTPS_PROXY): added
	(https_proxy): added
	(parse_proxy): HTTPS_proxy
* url.c (openURL): for HTTPS, use HTTPS_proxy
	(schemeToProxy): HTTPS_proxy_parsed
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-11-14 16:56:22 +00:00
parent 5dee213f2e
commit 41139c1337
5 changed files with 64 additions and 15 deletions

16
rc.c
View File

@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.62 2002/11/12 12:42:51 ukai Exp $ */
/* $Id: rc.c,v 1.63 2002/11/14 16:56:24 ukai Exp $ */
/*
* Initialization file etc.
*/
@@ -91,6 +91,9 @@ static char *config_file = NULL;
#define CMT_VISITED_ANCHOR "ˬ<>줿<EFBFBD><ECA4BF><EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󥯤Ͽ<F3A5AFA4><CFBF><EFBFBD><EFBFBD>Ѥ<EFBFBD><D1A4><EFBFBD>"
#define CMT_V_COLOR "ˬ<>줿<EFBFBD><ECA4BF><EFBFBD>Ȥ<EFBFBD><C8A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󥯤ο<F3A5AFA4>"
#define CMT_HTTP_PROXY "HTTP<54>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>(URL<52><4C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
#ifdef USE_SSL
#define CMT_HTTPS_PROXY "HTTPS<50>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>(URL<52><4C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
#endif /* USE_SSL */
#ifdef USE_GOPHER
#define CMT_GOPHER_PROXY "GOPHER<45>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD>(URL<52><4C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
#endif /* USE_GOPHER */
@@ -240,6 +243,9 @@ static char *config_file = NULL;
#define CMT_BG_COLOR "Color of background"
#define CMT_MARK_COLOR "Color of mark"
#define CMT_HTTP_PROXY "URL of HTTP proxy host"
#ifdef USE_SSL
#define CMT_HTTPS_PROXY "URL of HTTPS proxy host"
#endif /* USE_SSL */
#ifdef USE_GOPHER
#define CMT_GOPHER_PROXY "URL of GOPHER proxy host"
#endif /* USE_GOPHER */
@@ -630,6 +636,10 @@ struct param_ptr params3[] = {
struct param_ptr params4[] = {
{"http_proxy", P_STRING, PI_TEXT, (void *)&HTTP_proxy, CMT_HTTP_PROXY,
NULL},
#ifdef USE_SSL
{"https_proxy", P_STRING, PI_TEXT, (void *)&HTTPS_proxy, CMT_HTTPS_PROXY,
NULL},
#endif /* USE_SSL */
#ifdef USE_GOPHER
{"gopher_proxy", P_STRING, PI_TEXT, (void *)&GOPHER_proxy,
CMT_GOPHER_PROXY, NULL},
@@ -1220,6 +1230,10 @@ parse_proxy()
{
if (non_null(HTTP_proxy))
parseURL(HTTP_proxy, &HTTP_proxy_parsed, NULL);
#ifdef USE_SSL
if (non_null(HTTPS_proxy))
parseURL(HTTPS_proxy, &HTTPS_proxy_parsed, NULL);
#endif /* USE_SSL */
#ifdef USE_GOPHER
if (non_null(GOPHER_proxy))
parseURL(GOPHER_proxy, &GOPHER_proxy_parsed, NULL);