summaryrefslogtreecommitdiff
path: root/src/UriResolve.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhsoting.net>2018-03-21 22:11:07 +0100
committerJörg Frings-Fürst <debian@jff-webhsoting.net>2018-03-21 22:11:07 +0100
commitc17b127df11ec779784c0b41e7e1500d041bd077 (patch)
treeec134b40f87f90bb6de54f3c2a15135cdb7f723b /src/UriResolve.c
parent0ca227c7ff3be80a64807df27ffe7066cf447e09 (diff)
parent6d05f3e01a26fa416c9d0150163db20abac4b4ef (diff)
Update upstream source from tag 'upstream/0.8.5'
Update to upstream version '0.8.5' with Debian dir e35894d616fcb570578d09c39828e967d4b6b4b0
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)