diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-14 16:56:22 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-14 16:56:22 +0000 |
| commit | 41139c1337fa36166ad60d4fa6bfb4709007d99f (patch) | |
| tree | 56ee8149a209ac5ad47072a4a661b6df8934c7bb /main.c | |
| parent | [w3m-dev 03428] install manual as w3m.exe.1 on Cygwin (diff) | |
| download | w3m-41139c1337fa36166ad60d4fa6bfb4709007d99f.tar.gz w3m-41139c1337fa36166ad60d4fa6bfb4709007d99f.zip | |
[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>
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.129 2002/11/12 12:41:57 ukai Exp $ */ +/* $Id: main.c,v 1.130 2002/11/14 16:56:23 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include <signal.h> @@ -417,6 +417,14 @@ main(int argc, char **argv, char **envp) ((p = getenv("HTTP_PROXY")) || (p = getenv("http_proxy")) || (p = getenv("HTTP_proxy")))) HTTP_proxy = p; +#ifdef USE_SSL + if (!non_null(HTTPS_proxy) && + ((p = getenv("HTTPS_PROXY")) || + (p = getenv("https_proxy")) || (p = getenv("HTTPS_proxy")))) + HTTPS_proxy = p; + if (HTTPS_proxy == NULL && non_null(HTTP_proxy)) + HTTPS_proxy = HTTP_proxy; +#endif /* USE_SSL */ #ifdef USE_GOPHER if (!non_null(GOPHER_proxy) && ((p = getenv("GOPHER_PROXY")) || |