mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-03 19:31:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Implement component-wise URL comparison

Browse Source 
svn path=/trunk/netsurf/; revision=2697
This commit is contained in:
John Mark Bell 2006-07-02 22:34:04 +00:00
parent 71287140ca
commit b7af14b591
3 changed files with 73 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/fetchcache.c
View File

@ -419,9 +419,13 @@ void fetchcache_callback(fetch_msg msg, void *p, const void *data,
* destroyed in content_clean() */
c->status = CONTENT_STATUS_ERROR;
if (result == URL_FUNC_OK) {
bool same;
result = url_compare(c->url, url, &same);
/* check that we're not attempting to
* redirect to the same URL */
if (strcasecmp(c->url, url) == 0) {
if (result != URL_FUNC_OK || same) {
msg_data.error =
messages_get("BadRedirect");
content_broadcast(c,

66
utils/url.c
View File

@ -823,6 +823,72 @@ url_func_result url_escape(const char *unescaped, char **result)
return URL_FUNC_OK;
}
/**
* Compare two absolute, normalized URLs
*
* \param url1 URL 1
* \param url2 URL 2
* \param result Pointer to location to store result (true if URLs match)
* \return URL_FUNC_OK on success
*/
url_func_result url_compare(const char *url1, const char *url2, bool *result)
{
url_func_result status;
struct url_components c1, c2;
bool res = true;
assert(url1 && url2 && result);
/* Decompose URLs */
status = url_get_components(url1, &c1, false);
if (status != URL_FUNC_OK) {
url_destroy_components(&c1);
return status;
}
status = url_get_components(url2, &c2, false);
if (status != URL_FUNC_OK) {
url_destroy_components(&c2);
url_destroy_components(&c1);
return status;
}
if (((c1.scheme && c2.scheme) || (!c1.scheme && !c2.scheme )) &&
((c1.authority && c2.authority) ||
(!c1.authority && !c2.authority)) &&
((c1.path && c2.path) || (!c1.path && !c2.path)) &&
((c1.query && c2.query) ||
(!c1.query && !c2.query)) &&
((c1.fragment && c2.fragment) ||
(!c1.fragment && !c2.fragment))) {
if (c1.scheme)
res &= strcasecmp(c1.scheme, c2.scheme) == 0;
/** \todo consider each part of the authority separately */
if (c1.authority)
res &= strcasecmp(c1.authority, c2.authority) == 0;
if (c1.path)
res &= strcmp(c1.path, c2.path) == 0;
if (c1.query)
res &= strcmp(c1.query, c2.query) == 0;
if (c1.fragment)
res &= strcmp(c1.fragment, c2.fragment) == 0;
} else {
/* Can't match */
res = false;
}
*result = res;
url_destroy_components(&c2);
url_destroy_components(&c1);
return URL_FUNC_OK;
}
/**
* Split a URL into separate components

2
utils/url.h
View File

@ -31,6 +31,8 @@ url_func_result url_canonical_root(const char *url, char **result);
url_func_result url_strip_lqf(const char *url, char **result);
url_func_result url_plq(const char *url, char **result);
url_func_result url_path(const char *url, char **result);
url_func_result url_compare(const char *url1, const char *url2,
bool *result);
char *path_to_url(const char *path);
char *url_to_path(const char *url);