summaryrefslogtreecommitdiff
path: root/src/UriResolve.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhsoting.net>2015-10-07 16:32:38 +0200
committerJörg Frings-Fürst <debian@jff-webhsoting.net>2015-10-07 16:32:38 +0200
commit6739f7a7e0858ecfcf83d9cb456f6edbb2fe4095 (patch)
tree71640ef65220bea8485726e701acda2fd2c74ed3 /src/UriResolve.c
parent0d83e41f90a523f69d8701fc218ce4c133eb53c6 (diff)
parentd4ba486cc6aacbbed2be1e71ea77410052a22ac1 (diff)
Merge tag 'upstream/0.8.3'
Upstream version 0.8.3
Diffstat (limited to 'src/UriResolve.c')
-rw-r--r--src/UriResolve.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/UriResolve.c b/src/UriResolve.c
index 4af5b19..3660b6b 100644
--- a/src/UriResolve.c
+++ b/src/UriResolve.c
@@ -172,6 +172,7 @@ static int URI_FUNC(AddBaseUriImpl)(URI_TYPE(Uri) * absDest,
UriBool relSourceHasScheme = (relSource->scheme.first != NULL) ? URI_TRUE : URI_FALSE;
if ((options & URI_RESOLVE_IDENTICAL_SCHEME_COMPAT)
&& (absBase->scheme.first != NULL)
+ && (relSource->scheme.first != NULL)
&& (0 == URI_FUNC(CompareRange)(&(absBase->scheme), &(relSource->scheme)))) {
/* [00/32] undefine(R.scheme); */
relSourceHasScheme = URI_FALSE;