From 49883bb9cb1d66d377982f092174846e29697313 Mon Sep 17 00:00:00 2001 From: Ito Hiroyuki Date: Tue, 3 Aug 2010 10:02:16 +0000 Subject: * register user name and password for proxy authentication. * remove option -pauth --- ChangeLog | 16 +++++++++++++++- doc-jp/MANUAL.html | 2 -- doc-jp/README.passwd | 22 ++++++++++++++++++++++ doc-jp/w3m.1 | 3 --- doc/MANUAL.html | 2 -- doc/README.passwd | 23 +++++++++++++++++++++++ doc/w3m.1 | 3 --- file.c | 3 ++- fm.h | 4 +--- main.c | 21 +++++---------------- url.c | 4 +--- 11 files changed, 69 insertions(+), 34 deletions(-) create mode 100644 doc-jp/README.passwd create mode 100644 doc/README.passwd diff --git a/ChangeLog b/ChangeLog index d97baab..b78b2c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2010-08-03 Ito Hiroyuki + + * [w3m-dev 04343] + * file.c (loadGeneralFile): register user name and password for proxy authentication. + * url.c (HTTPrequest): unused variable seen_proxy_auth was removed + * fm.h: global variables proxy_auth_cookie and pauth are removed + * main.c (main): remove option -pauth + * doc/MANUAL.html: ditto + * doc-jp/MANUAL.html: ditto + * doc-jp/w3m.1: ditto + * doc/w3m.1: ditto + * doc/README.passwd: added + * doc-jp/README.passwd: added + 2010-07-31 Tatsuya Kinoshita * [w3m-dev 04350] Re: w3m's bugs from bugs.debian.org @@ -9078,4 +9092,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.1024 2010/08/02 10:33:35 htrb Exp $ +$Id: ChangeLog,v 1.1025 2010/08/03 10:02:16 htrb Exp $ diff --git a/doc-jp/MANUAL.html b/doc-jp/MANUAL.html index 0b24619..41d70f1 100644 --- a/doc-jp/MANUAL.html +++ b/doc-jp/MANUAL.html @@ -100,8 +100,6 @@ HTML オプションの名前や値は，~/.w3m/config で指定するものと同じ．
-no-proxy
プロキシを利用しない． -
-pauth user:pass -
プロキシ認証用のユーザ名とパスワードを指定する．
-no-mouse
マウスを利用しない．
-cookie diff --git a/doc-jp/README.passwd b/doc-jp/README.passwd new file mode 100644 index 0000000..efefdb3 --- /dev/null +++ b/doc-jp/README.passwd @@ -0,0 +1,22 @@ +HTTP $BG'>Z$N$"$k%Z!<%8$dG'>Z$N$"$k(B proxy $B$KBP$7$F!"(B +$B%f!<%6L>$H%Q%9%o!<%I$r@_Dj$7$F$*$/$3$H$,=PMh$^$9!#(B + +passwd_file $B$G;XDj$7$?%U%!%$%k$K(B +port $B%]!<%HHV9f(B +path $B%m!<%+%k%Q!<%H(B +realm realm$B$NJ8;zNs(B +login $B%f!<%6L>(B +passwd $B%Q%9%o!<%I(B +proxy + +machine$B$G$O$8$^$C$FJN,2DG=(B + +proxy $B$H=q$$$?>l9g$O(B proxy $B$N%Q%9%o!<%I$H$_$J$7$^$9!#(B + +passwd_file $B$,B>$N%f!<%6!<$+$iFI$a$k>l9g7Y9p$,=P$^$9$,!"(BOS $B$N@)8B$J$I$G(B +$B%U%!%$%k$N%Q!<%_%C%7%g%s$rJQ$($i$l$J$$>l9g$O$3$N7Y9p$r(B +disable_secret_security_check $B$N@_Dj$GL58z$K$G$-$^$9!#(B diff --git a/doc-jp/w3m.1 b/doc-jp/w3m.1 index 3a93122..73ab7c2 100644 --- a/doc-jp/w3m.1 +++ b/doc-jp/w3m.1 @@ -103,9 +103,6 @@ Bookmark .B \-no\-proxy プロキシを利用しない． .TP -.BI \-pauth\ user:pass -プロキシ認証用のユーザ名とパスワードを指定する． -.TP .B \-no\-mouse マウスを利用しない． .TP diff --git a/doc/MANUAL.html b/doc/MANUAL.html index 4877f72..c134462 100644 --- a/doc/MANUAL.html +++ b/doc/MANUAL.html @@ -103,8 +103,6 @@ same as that appears in ~/.w3m/config.
Process cookies.
-no-cookie
Don't process cookies. -
-pauth username:password -
Set username and password for (basic) proxy authentication.
-num
Show linenumber.
-dump diff --git a/doc/README.passwd b/doc/README.passwd new file mode 100644 index 0000000..f65fa77 --- /dev/null +++ b/doc/README.passwd @@ -0,0 +1,23 @@ +You can save your passwords and usernames for a web page which require +HTTP certification or a proxy certification. + +The configuration file is designated in "passwd_file" parameter. The +format of the configuration file is as follows + +machine hostname +port port number +path local part +realm realm string +login username +passwd password +proxy + +Each configuration is began with machine and ended before the next machine. +You can omit port, path and realm. + +proxy means settings for proxy certification. + +If passwd_file is readable from other users, w3m shows a warning for +that. If you can not set the permission for the passwd_file because +of the restriction of your OS, you can suppress the warning with the +setting of disable_secret_security_check. diff --git a/doc/w3m.1 b/doc/w3m.1 index d29928f..008544e 100644 --- a/doc/w3m.1 +++ b/doc/w3m.1 @@ -120,9 +120,6 @@ use cookie. .B -no-cookie don't use cookie .TP -.B -pauth user:pass -proxy authentication -.TP .B -s squeeze multiple blank lines .TP diff --git a/file.c b/file.c index dd460fa..a073f92 100644 --- a/file.c +++ b/file.c @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.263 2010/08/02 10:33:35 htrb Exp $ */ +/* $Id: file.c,v 1.264 2010/08/03 10:02:16 htrb Exp $ */ #include "fm.h" #include #include "myctype.h" @@ -1924,6 +1924,7 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer, UFclose(&f); add_auth_cookie_flag = 1; status = HTST_NORMAL; + add_auth_user_passwd(auth_pu, qstr_unquote(realm)->ptr, uname, pwd, 1); goto load_doc; } } diff --git a/fm.h b/fm.h index be2a0ab..2dc0762 100644 --- a/fm.h +++ b/fm.h @@ -1,4 +1,4 @@ -/* $Id: fm.h,v 1.145 2010/07/26 11:38:53 htrb Exp $ */ +/* $Id: fm.h,v 1.146 2010/08/03 10:02:16 htrb Exp $ */ /* * w3m: WWW wo Miru utility * @@ -979,8 +979,6 @@ global int IgnoreCase init(TRUE); global int WrapSearch init(FALSE); global int squeezeBlankLine init(FALSE); global char *BookmarkFile init(NULL); -global char *pauth init(NULL); -global Str proxy_auth_cookie init(NULL); global int UseExternalDirBuffer init(TRUE); global char *DirBufferCommand init("file:///$LIB/dirlist" CGI_EXTENSION); #ifdef USE_DICT diff --git a/main.c b/main.c index d2793e2..15351b2 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.264 2010/07/25 09:55:05 htrb Exp $ */ +/* $Id: main.c,v 1.265 2010/08/03 10:02:16 htrb Exp $ */ #define MAINPROGRAM #include "fm.h" #include @@ -242,7 +242,6 @@ fusage(FILE * f, int err) fprintf(f, " -cookie use cookie (-no-cookie: don't use cookie)\n"); #endif /* USE_COOKIE */ - fprintf(f, " -pauth user:pass proxy authentication\n"); fprintf(f, " -graph use graphic character\n"); fprintf(f, " -no-graph don't use graphic character\n"); #ifdef DEBIAN /* replaced by ukai: pager requires -s */ @@ -326,12 +325,13 @@ sig_chld(int signo) pid_t pid; #ifdef HAVE_WAITPID - while ((pid = waitpid(-1, &p_stat, WNOHANG)) > 0) { + while ((pid = waitpid(-1, &p_stat, WNOHANG)) > 0) #elif HAVE_WAIT3 - while ((pid = wait3(&p_stat, WNOHANG, NULL)) > 0) { + while ((pid = wait3(&p_stat, WNOHANG, NULL)) > 0) #else - if ((pid = wait(&p_stat)) > 0) { + if ((pid = wait(&p_stat)) > 0) #endif + { DownloadList *d; if (WIFEXITED(p_stat)) { @@ -702,17 +702,6 @@ main(int argc, char **argv, char **envp) accept_cookie = TRUE; } #endif /* USE_COOKIE */ - else if (!strcmp("-pauth", argv[i])) { - if (++i >= argc) - usage(); - proxy_auth_cookie = Strnew_m_charp("Basic ", - encodeB(argv[i])->ptr, - NULL); - while (argv[i][0]) { - argv[i][0] = '\0'; - argv[i]++; - } - } #ifdef DEBIAN else if (!strcmp("-s", argv[i])) #else diff --git a/url.c b/url.c index e6bf576..1973795 100644 --- a/url.c +++ b/url.c @@ -1,4 +1,4 @@ -/* $Id: url.c,v 1.97 2010/07/20 00:09:34 htrb Exp $ */ +/* $Id: url.c,v 1.98 2010/08/03 10:02:16 htrb Exp $ */ #include "fm.h" #ifndef __MINGW32_VERSION #include @@ -1379,7 +1379,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra) Str tmp; TextListItem *i; int seen_www_auth = 0; - int seen_proxy_auth = 0; #ifdef USE_COOKIE Str cookie; #endif /* USE_COOKIE */ @@ -1403,7 +1402,6 @@ HTTPrequest(ParsedURL *pu, ParsedURL *current, HRequest *hr, TextList *extra) } if (strncasecmp(i->ptr, "Proxy-Authorization:", sizeof("Proxy-Authorization:") - 1) == 0) { - seen_proxy_auth = 1; #ifdef USE_SSL if (pu->scheme == SCM_HTTPS && hr->command != HR_COMMAND_CONNECT) -- cgit v1.2.3