summaryrefslogtreecommitdiffstats
path: root/plugins/uriparser/UriResolve.c
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-05-31 13:32:09 (GMT)
committerAndreas Baumann <mail@andreasbaumann.cc>2018-05-31 13:32:09 (GMT)
commit3b6cde1cc05e4b36bf8053fc55383baa34954291 (patch)
treebada2530c0ab6c89eef89ebfdf0056f4ac3519b1 /plugins/uriparser/UriResolve.c
parenteacaad30433607fbdcf742aad4ff51aad5ddf749 (diff)
downloadmonitoring-plugins-3b6cde1cc05e4b36bf8053fc55383baa34954291.tar.gz
updated bundled version of uriparser to 0.8.5
Diffstat (limited to 'plugins/uriparser/UriResolve.c')
-rw-r--r--plugins/uriparser/UriResolve.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/uriparser/UriResolve.c b/plugins/uriparser/UriResolve.c
index 3660b6b..bb1d21a 100644
--- a/plugins/uriparser/UriResolve.c
+++ b/plugins/uriparser/UriResolve.c
@@ -2,7 +2,7 @@
2 * uriparser - RFC 3986 URI parsing library 2 * uriparser - RFC 3986 URI parsing library
3 * 3 *
4 * Copyright (C) 2007, Weijia Song <songweijia@gmail.com> 4 * Copyright (C) 2007, Weijia Song <songweijia@gmail.com>
5 * Copyright (C) 2007, Sebastian Pipping <webmaster@hartwork.org> 5 * Copyright (C) 2007, Sebastian Pipping <sebastian@pipping.org>
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
@@ -152,6 +152,8 @@ static int URI_FUNC(AddBaseUriImpl)(URI_TYPE(Uri) * absDest,
152 const URI_TYPE(Uri) * relSource, 152 const URI_TYPE(Uri) * relSource,
153 const URI_TYPE(Uri) * absBase, 153 const URI_TYPE(Uri) * absBase,
154 UriResolutionOptions options) { 154 UriResolutionOptions options) {
155 UriBool relSourceHasScheme;
156
155 if (absDest == NULL) { 157 if (absDest == NULL) {
156 return URI_ERROR_NULL; 158 return URI_ERROR_NULL;
157 } 159 }
@@ -169,7 +171,7 @@ static int URI_FUNC(AddBaseUriImpl)(URI_TYPE(Uri) * absDest,
169 /* [00/32] -- A non-strict parser may ignore a scheme in the reference */ 171 /* [00/32] -- A non-strict parser may ignore a scheme in the reference */
170 /* [00/32] -- if it is identical to the base URI's scheme. */ 172 /* [00/32] -- if it is identical to the base URI's scheme. */
171 /* [00/32] if ((not strict) and (R.scheme == Base.scheme)) then */ 173 /* [00/32] if ((not strict) and (R.scheme == Base.scheme)) then */
172 UriBool relSourceHasScheme = (relSource->scheme.first != NULL) ? URI_TRUE : URI_FALSE; 174 relSourceHasScheme = (relSource->scheme.first != NULL) ? URI_TRUE : URI_FALSE;
173 if ((options & URI_RESOLVE_IDENTICAL_SCHEME_COMPAT) 175 if ((options & URI_RESOLVE_IDENTICAL_SCHEME_COMPAT)
174 && (absBase->scheme.first != NULL) 176 && (absBase->scheme.first != NULL)
175 && (relSource->scheme.first != NULL) 177 && (relSource->scheme.first != NULL)