summaryrefslogtreecommitdiff
path: root/src/UriResolve.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhsoting.net>2018-03-22 07:26:59 +0100
committerJörg Frings-Fürst <debian@jff-webhsoting.net>2018-03-22 07:26:59 +0100
commit9da10f705434d2a18d1ac3670f16d9b10e77f10c (patch)
tree5fb118d3fa2a2193faf3758898ee7fe2b6abb549 /src/UriResolve.c
parent12af0f6afae11029a608e33b98047aea4e82da7d (diff)
parent52052c161e3230d27658d819be68abd4597aa6eb (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/UriResolve.c')
-rw-r--r--src/UriResolve.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/UriResolve.c b/src/UriResolve.c
index 3660b6b..bb1d21a 100644
--- a/src/UriResolve.c
+++ b/src/UriResolve.c
@@ -2,7 +2,7 @@
* uriparser - RFC 3986 URI parsing library
*
* Copyright (C) 2007, Weijia Song <songweijia@gmail.com>
- * Copyright (C) 2007, Sebastian Pipping <webmaster@hartwork.org>
+ * Copyright (C) 2007, Sebastian Pipping <sebastian@pipping.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -152,6 +152,8 @@ static int URI_FUNC(AddBaseUriImpl)(URI_TYPE(Uri) * absDest,
const URI_TYPE(Uri) * relSource,
const URI_TYPE(Uri) * absBase,
UriResolutionOptions options) {
+ UriBool relSourceHasScheme;
+
if (absDest == NULL) {
return URI_ERROR_NULL;
}
@@ -169,7 +171,7 @@ static int URI_FUNC(AddBaseUriImpl)(URI_TYPE(Uri) * absDest,
/* [00/32] -- A non-strict parser may ignore a scheme in the reference */
/* [00/32] -- if it is identical to the base URI's scheme. */
/* [00/32] if ((not strict) and (R.scheme == Base.scheme)) then */
- UriBool relSourceHasScheme = (relSource->scheme.first != NULL) ? URI_TRUE : URI_FALSE;
+ relSourceHasScheme = (relSource->scheme.first != NULL) ? URI_TRUE : URI_FALSE;
if ((options & URI_RESOLVE_IDENTICAL_SCHEME_COMPAT)
&& (absBase->scheme.first != NULL)
&& (relSource->scheme.first != NULL)