bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added more liberty to upstream username, too

Browse Source
This commit is contained in:
Vasily 2018-11-16 14:17:04 +03:00
parent efde2796a0
commit 1b26dc1128
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conf.c
View File

@ -52,7 +52,8 @@
#define BOOL "(yes|on|no|off)" #define BOOL "(yes|on|no|off)"
#define INT "((0x)?[[:digit:]]+)" #define INT "((0x)?[[:digit:]]+)"
#define ALNUM "([-a-z0-9._]+)" #define ALNUM "([-a-z0-9._]+)"
#define PASSWORD "([^:@]*)" #define USERNAME "([^:]*)"
#define PASSWORD "([^@]*)"
#define IP "((([0-9]{1,3})\\.){3}[0-9]{1,3})" #define IP "((([0-9]{1,3})\\.){3}[0-9]{1,3})"
#define IPMASK "(" IP "(/[[:digit:]]+)?)" #define IPMASK "(" IP "(/[[:digit:]]+)?)"
#define IPV6 "(" \ #define IPV6 "(" \
@ -258,7 +259,7 @@ struct {
}, },
{ {
BEGIN "(upstream)" WS "(http|socks4|socks5)" WS BEGIN "(upstream)" WS "(http|socks4|socks5)" WS
"(" ALNUM /*username*/ ":" PASSWORD /*password*/ "@" ")?" "(" USERNAME /*username*/ ":" PASSWORD /*password*/ "@" ")?"
"(" IP "|" ALNUM ")" "(" IP "|" ALNUM ")"
":" INT "(" WS STR ")?" ":" INT "(" WS STR ")?"
END, handle_upstream, NULL END, handle_upstream, NULL