Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support : Fixes for Verbatim Regeneration of URL String Form

Browse Source 
A URL in string form should be able to be parsed and then verbatim
regenerated according to 'UrlTest'.  This change fixes this ability
for the case where there is a '?' initiating a query or a '//'
initiating a host/authority section.

Partly Fixes #14377

Change-Id: I6547253c3cdc22d79514edf75284e9725d1a2d17
Reviewed-on: https://review.haiku-os.org/512
Reviewed-by: Jérôme Duval <jerome.duval@gmail.com>
This commit is contained in:
Andrew Lindesay 2018-09-04 23:31:12 +02:00 committed by Jérôme Duval
parent 44c4473bf0
commit 3cc5e76f2d
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/kits/support/Url.cpp
View File

@ -984,6 +984,7 @@ BUrl::_ExplodeUrlString(const BString& url)
explode_url_parse_state state = EXPLODE_PROTOCOL;
int32 offset = 0;
int32 length = url.Length();
bool forceHasHost = false;
const char *url_c = url.String();
// The regexp is provided in RFC3986 (URI generic syntax), Appendix B
@ -1033,6 +1034,9 @@ BUrl::_ExplodeUrlString(const BString& url)
// to parsing the path.
if (strncmp(&url_c[offset], "//", 2) == 0) {
state = EXPLODE_AUTHORITY;
// if we see the // then this would imply that a host is
// to be rendered even if no host has been parsed.
forceHasHost = true;
offset += 2;
} else {
state = EXPLODE_PATH;
@ -1068,6 +1072,10 @@ BUrl::_ExplodeUrlString(const BString& url)
offset, explode_is_request_char);
SetRequest(BString(&url_c[offset], end_request - offset));
offset = end_request;
// if there is a "?" in the parse then it is clear that
// there is a 'request' / query present regardless if there
// are any valid key-value pairs.
fHasRequest = true;
}
state = EXPLODE_FRAGMENT;
break;
@ -1091,6 +1099,9 @@ BUrl::_ExplodeUrlString(const BString& url)
}
}
if (forceHasHost)
fHasHost = true;
return B_OK;
}