github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-05 17:44:55 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*Web: HttpClient handling of '#' in url

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4710 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-03-21 14:06:53 +00:00
parent d30beb6a84
commit 4deefe7ecd
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
uppsrc/Web/httpcli.cpp
View file

@ -47,21 +47,24 @@ HttpClient::~HttpClient()
HttpClient& HttpClient::URL(const char *u)
{
const char *t = u;
while(*t && *t != '?')
while(*t && *t != '?' && *t != '#')
if(*t++ == '/' && *t == '/') {
u = ++t;
break;
}
t = u;
while(*u && *u != ':' && *u != '/' && *u != '?')
while(*u && *u != ':' && *u != '/' && *u != '?' && *u != '#')
u++;
if(*u == '?' && u[1])
if(strchr(u, '?'))
hasurlvar = true;
host = String(t, u);
port = 0;
if(*u == ':')
port = ScanInt(u + 1, &u);
path = u;
int q = path.Find('#');
if(q >= 0)
path.Trim(q);
return *this;
}
@ -172,7 +175,7 @@ String HttpClient::CalculateDigest(String authenticate) const
hv1 << username << ':' << realm << ':' << password;
String ha1 = MD5String(hv1);
hv2 << (method == METHOD_GET ? "GET" : method == METHOD_PUT ? "PUT" : method == METHOD_POST ? "POST" : "READ")
<< ':' << path;
<< ':' << UrlEncode(path);
String ha2 = MD5String(hv2);
int nc = 1;
String cnonce = FormatIntHex(Random(), 8);