diff options
Diffstat (limited to 'plugins/uriparser')
-rw-r--r-- | plugins/uriparser/Uri.h | 10 | ||||
-rw-r--r-- | plugins/uriparser/UriBase.h | 4 | ||||
-rw-r--r-- | plugins/uriparser/UriCommon.c | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriCompare.c | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriDefsAnsi.h | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriDefsConfig.h | 4 | ||||
-rw-r--r-- | plugins/uriparser/UriDefsUnicode.h | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriEscape.c | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriFile.c | 4 | ||||
-rw-r--r-- | plugins/uriparser/UriIp4.c | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriIp4.h | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriIp4Base.c | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriNormalize.c | 4 | ||||
-rw-r--r-- | plugins/uriparser/UriNormalizeBase.c | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriParse.c | 10 | ||||
-rw-r--r-- | plugins/uriparser/UriParseBase.c | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriQuery.c | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriRecompose.c | 2 | ||||
-rw-r--r-- | plugins/uriparser/UriResolve.c | 6 | ||||
-rw-r--r-- | plugins/uriparser/UriShorten.c | 4 |
20 files changed, 37 insertions, 33 deletions
diff --git a/plugins/uriparser/Uri.h b/plugins/uriparser/Uri.h index 4a18580..a3f7914 100644 --- a/plugins/uriparser/Uri.h +++ b/plugins/uriparser/Uri.h | |||
@@ -1,8 +1,9 @@ | |||
1 | /* | 1 | /* f9ca23a99fc1c8ff610e2bdc0bff3c4bb4d883ccbff5851fe7a1398f9b6aca57 (0.8.5+) |
2 | * | ||
2 | * uriparser - RFC 3986 URI parsing library | 3 | * uriparser - RFC 3986 URI parsing library |
3 | * | 4 | * |
4 | * Copyright (C) 2007, Weijia Song <songweijia@gmail.com> | 5 | * Copyright (C) 2007, Weijia Song <songweijia@gmail.com> |
5 | * Copyright (C) 2007, Sebastian Pipping <webmaster@hartwork.org> | 6 | * Copyright (C) 2007, Sebastian Pipping <sebastian@pipping.org> |
6 | * All rights reserved. | 7 | * All rights reserved. |
7 | * | 8 | * |
8 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without |
@@ -157,7 +158,8 @@ typedef struct URI_TYPE(UriStruct) { | |||
157 | URI_TYPE(PathSegment) * pathTail; /**< Tail of the list behind pathHead */ | 158 | URI_TYPE(PathSegment) * pathTail; /**< Tail of the list behind pathHead */ |
158 | URI_TYPE(TextRange) query; /**< Query without leading "?" */ | 159 | URI_TYPE(TextRange) query; /**< Query without leading "?" */ |
159 | URI_TYPE(TextRange) fragment; /**< Query without leading "#" */ | 160 | URI_TYPE(TextRange) fragment; /**< Query without leading "#" */ |
160 | UriBool absolutePath; /**< Absolute path flag, distincting "a" and "/a" */ | 161 | UriBool absolutePath; /**< Absolute path flag, distincting "a" and "/a"; |
162 | always <c>URI_FALSE</c> for URIs with host */ | ||
161 | UriBool owner; /**< Memory owner flag */ | 163 | UriBool owner; /**< Memory owner flag */ |
162 | 164 | ||
163 | void * reserved; /**< Reserved to the parser */ | 165 | void * reserved; /**< Reserved to the parser */ |
@@ -567,7 +569,7 @@ int URI_FUNC(UriStringToUnixFilename)(const URI_CHAR * uriString, | |||
567 | 569 | ||
568 | /** | 570 | /** |
569 | * Extracts a Windows filename from a %URI string. | 571 | * Extracts a Windows filename from a %URI string. |
570 | * The destination buffer must be large enough to hold len(uriString) + 1 - 8 | 572 | * The destination buffer must be large enough to hold len(uriString) + 1 - 5 |
571 | * characters in case of an absolute %URI or len(uriString) + 1 in case | 573 | * characters in case of an absolute %URI or len(uriString) + 1 in case |
572 | * of a relative %URI. | 574 | * of a relative %URI. |
573 | * | 575 | * |
diff --git a/plugins/uriparser/UriBase.h b/plugins/uriparser/UriBase.h index bc63b05..45ba5ab 100644 --- a/plugins/uriparser/UriBase.h +++ b/plugins/uriparser/UriBase.h | |||
@@ -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 |
@@ -55,7 +55,7 @@ | |||
55 | /* Version */ | 55 | /* Version */ |
56 | #define URI_VER_MAJOR 0 | 56 | #define URI_VER_MAJOR 0 |
57 | #define URI_VER_MINOR 8 | 57 | #define URI_VER_MINOR 8 |
58 | #define URI_VER_RELEASE 4 | 58 | #define URI_VER_RELEASE 5 |
59 | #define URI_VER_SUFFIX_ANSI "" | 59 | #define URI_VER_SUFFIX_ANSI "" |
60 | #define URI_VER_SUFFIX_UNICODE URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI) | 60 | #define URI_VER_SUFFIX_UNICODE URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI) |
61 | 61 | ||
diff --git a/plugins/uriparser/UriCommon.c b/plugins/uriparser/UriCommon.c index 37d6b39..571d6d4 100644 --- a/plugins/uriparser/UriCommon.c +++ b/plugins/uriparser/UriCommon.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 |
diff --git a/plugins/uriparser/UriCompare.c b/plugins/uriparser/UriCompare.c index 6896f64..35f5a13 100644 --- a/plugins/uriparser/UriCompare.c +++ b/plugins/uriparser/UriCompare.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 |
diff --git a/plugins/uriparser/UriDefsAnsi.h b/plugins/uriparser/UriDefsAnsi.h index deaefaa..d6dbcad 100644 --- a/plugins/uriparser/UriDefsAnsi.h +++ b/plugins/uriparser/UriDefsAnsi.h | |||
@@ -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 |
diff --git a/plugins/uriparser/UriDefsConfig.h b/plugins/uriparser/UriDefsConfig.h index d87ccb6..9f7ac65 100644 --- a/plugins/uriparser/UriDefsConfig.h +++ b/plugins/uriparser/UriDefsConfig.h | |||
@@ -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 |
@@ -88,7 +88,7 @@ | |||
88 | /* http://predef.sourceforge.net/precomp.html#sec32 */ | 88 | /* http://predef.sourceforge.net/precomp.html#sec32 */ |
89 | /* http://msdn2.microsoft.com/en-us/library/ms882281.aspx */ | 89 | /* http://msdn2.microsoft.com/en-us/library/ms882281.aspx */ |
90 | # define URI_INLINE __forceinline | 90 | # define URI_INLINE __forceinline |
91 | #elif (__STDC_VERSION__ >= 199901L) | 91 | #elif (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) |
92 | /* C99, "inline" is a keyword */ | 92 | /* C99, "inline" is a keyword */ |
93 | # define URI_INLINE inline | 93 | # define URI_INLINE inline |
94 | #else | 94 | #else |
diff --git a/plugins/uriparser/UriDefsUnicode.h b/plugins/uriparser/UriDefsUnicode.h index fa4befc..8bb8bc2 100644 --- a/plugins/uriparser/UriDefsUnicode.h +++ b/plugins/uriparser/UriDefsUnicode.h | |||
@@ -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 |
diff --git a/plugins/uriparser/UriEscape.c b/plugins/uriparser/UriEscape.c index 79ee3a6..17f8bad 100644 --- a/plugins/uriparser/UriEscape.c +++ b/plugins/uriparser/UriEscape.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 |
diff --git a/plugins/uriparser/UriFile.c b/plugins/uriparser/UriFile.c index 9cf788f..332f6a9 100644 --- a/plugins/uriparser/UriFile.c +++ b/plugins/uriparser/UriFile.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 |
@@ -83,7 +83,7 @@ static URI_INLINE int URI_FUNC(FilenameToUriString)(const URI_CHAR * filename, | |||
83 | is_windows_network = (filename[0] == _UT('\\')) && (filename[1] == _UT('\\')); | 83 | is_windows_network = (filename[0] == _UT('\\')) && (filename[1] == _UT('\\')); |
84 | absolute = fromUnix | 84 | absolute = fromUnix |
85 | ? (filename[0] == _UT('/')) | 85 | ? (filename[0] == _UT('/')) |
86 | : ((filename[0] != _UT('\0')) && (filename[1] == _UT(':')) | 86 | : (((filename[0] != _UT('\0')) && (filename[1] == _UT(':'))) |
87 | || is_windows_network); | 87 | || is_windows_network); |
88 | 88 | ||
89 | if (absolute) { | 89 | if (absolute) { |
diff --git a/plugins/uriparser/UriIp4.c b/plugins/uriparser/UriIp4.c index c00910b..ee067d3 100644 --- a/plugins/uriparser/UriIp4.c +++ b/plugins/uriparser/UriIp4.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 |
diff --git a/plugins/uriparser/UriIp4.h b/plugins/uriparser/UriIp4.h index 885a35c..9251c49 100644 --- a/plugins/uriparser/UriIp4.h +++ b/plugins/uriparser/UriIp4.h | |||
@@ -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 |
diff --git a/plugins/uriparser/UriIp4Base.c b/plugins/uriparser/UriIp4Base.c index 5cd298f..f066246 100644 --- a/plugins/uriparser/UriIp4Base.c +++ b/plugins/uriparser/UriIp4Base.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 |
diff --git a/plugins/uriparser/UriNormalize.c b/plugins/uriparser/UriNormalize.c index 49db9ff..d68c371 100644 --- a/plugins/uriparser/UriNormalize.c +++ b/plugins/uriparser/UriNormalize.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 |
@@ -434,8 +434,8 @@ static URI_INLINE UriBool URI_FUNC(MakeOwner)(URI_TYPE(Uri) * uri, | |||
434 | && (ranger->text.afterLast != NULL) | 434 | && (ranger->text.afterLast != NULL) |
435 | && (ranger->text.afterLast > ranger->text.first)) { | 435 | && (ranger->text.afterLast > ranger->text.first)) { |
436 | free((URI_CHAR *)ranger->text.first); | 436 | free((URI_CHAR *)ranger->text.first); |
437 | free(ranger); | ||
438 | } | 437 | } |
438 | free(ranger); | ||
439 | ranger = next; | 439 | ranger = next; |
440 | } | 440 | } |
441 | 441 | ||
diff --git a/plugins/uriparser/UriNormalizeBase.c b/plugins/uriparser/UriNormalizeBase.c index bac5888..8dbe7fd 100644 --- a/plugins/uriparser/UriNormalizeBase.c +++ b/plugins/uriparser/UriNormalizeBase.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 |
diff --git a/plugins/uriparser/UriParse.c b/plugins/uriparser/UriParse.c index e3cdc68..5eee16d 100644 --- a/plugins/uriparser/UriParse.c +++ b/plugins/uriparser/UriParse.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 |
@@ -193,7 +193,7 @@ static UriBool URI_FUNC(OnExitOwnPortUserInfo)(URI_TYPE(ParserState) * state, co | |||
193 | static UriBool URI_FUNC(OnExitSegmentNzNcOrScheme2)(URI_TYPE(ParserState) * state, const URI_CHAR * first); | 193 | static UriBool URI_FUNC(OnExitSegmentNzNcOrScheme2)(URI_TYPE(ParserState) * state, const URI_CHAR * first); |
194 | static void URI_FUNC(OnExitPartHelperTwo)(URI_TYPE(ParserState) * state); | 194 | static void URI_FUNC(OnExitPartHelperTwo)(URI_TYPE(ParserState) * state); |
195 | 195 | ||
196 | static void URI_FUNC(ResetParserState)(URI_TYPE(ParserState) * state); | 196 | static void URI_FUNC(ResetParserStateExceptUri)(URI_TYPE(ParserState) * state); |
197 | 197 | ||
198 | static UriBool URI_FUNC(PushPathSegment)(URI_TYPE(ParserState) * state, const URI_CHAR * first, const URI_CHAR * afterLast); | 198 | static UriBool URI_FUNC(PushPathSegment)(URI_TYPE(ParserState) * state, const URI_CHAR * first, const URI_CHAR * afterLast); |
199 | 199 | ||
@@ -2022,7 +2022,7 @@ static const URI_CHAR * URI_FUNC(ParseZeroMoreSlashSegs)(URI_TYPE(ParserState) * | |||
2022 | 2022 | ||
2023 | 2023 | ||
2024 | 2024 | ||
2025 | static URI_INLINE void URI_FUNC(ResetParserState)(URI_TYPE(ParserState) * state) { | 2025 | static URI_INLINE void URI_FUNC(ResetParserStateExceptUri)(URI_TYPE(ParserState) * state) { |
2026 | URI_TYPE(Uri) * const uriBackup = state->uri; | 2026 | URI_TYPE(Uri) * const uriBackup = state->uri; |
2027 | memset(state, 0, sizeof(URI_TYPE(ParserState))); | 2027 | memset(state, 0, sizeof(URI_TYPE(ParserState))); |
2028 | state->uri = uriBackup; | 2028 | state->uri = uriBackup; |
@@ -2071,7 +2071,7 @@ int URI_FUNC(ParseUriEx)(URI_TYPE(ParserState) * state, const URI_CHAR * first, | |||
2071 | uri = state->uri; | 2071 | uri = state->uri; |
2072 | 2072 | ||
2073 | /* Init parser */ | 2073 | /* Init parser */ |
2074 | URI_FUNC(ResetParserState)(state); | 2074 | URI_FUNC(ResetParserStateExceptUri)(state); |
2075 | URI_FUNC(ResetUri)(uri); | 2075 | URI_FUNC(ResetUri)(uri); |
2076 | 2076 | ||
2077 | /* Parse */ | 2077 | /* Parse */ |
@@ -2211,9 +2211,9 @@ UriBool URI_FUNC(_TESTING_ONLY_ParseIpSix)(const URI_CHAR * text) { | |||
2211 | const URI_CHAR * const afterIpSix = text + URI_STRLEN(text); | 2211 | const URI_CHAR * const afterIpSix = text + URI_STRLEN(text); |
2212 | const URI_CHAR * res; | 2212 | const URI_CHAR * res; |
2213 | 2213 | ||
2214 | URI_FUNC(ResetParserState)(&parser); | ||
2215 | URI_FUNC(ResetUri)(&uri); | 2214 | URI_FUNC(ResetUri)(&uri); |
2216 | parser.uri = &uri; | 2215 | parser.uri = &uri; |
2216 | URI_FUNC(ResetParserStateExceptUri)(&parser); | ||
2217 | parser.uri->hostData.ip6 = malloc(1 * sizeof(UriIp6)); | 2217 | parser.uri->hostData.ip6 = malloc(1 * sizeof(UriIp6)); |
2218 | res = URI_FUNC(ParseIPv6address2)(&parser, text, afterIpSix); | 2218 | res = URI_FUNC(ParseIPv6address2)(&parser, text, afterIpSix); |
2219 | URI_FUNC(FreeUriMembers)(&uri); | 2219 | URI_FUNC(FreeUriMembers)(&uri); |
diff --git a/plugins/uriparser/UriParseBase.c b/plugins/uriparser/UriParseBase.c index 75e4761..1d4ef6e 100644 --- a/plugins/uriparser/UriParseBase.c +++ b/plugins/uriparser/UriParseBase.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 |
diff --git a/plugins/uriparser/UriQuery.c b/plugins/uriparser/UriQuery.c index 7adb073..f0cd4f8 100644 --- a/plugins/uriparser/UriQuery.c +++ b/plugins/uriparser/UriQuery.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 |
diff --git a/plugins/uriparser/UriRecompose.c b/plugins/uriparser/UriRecompose.c index 09daee0..9678aac 100644 --- a/plugins/uriparser/UriRecompose.c +++ b/plugins/uriparser/UriRecompose.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 |
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) |
diff --git a/plugins/uriparser/UriShorten.c b/plugins/uriparser/UriShorten.c index c839ae5..0145f68 100644 --- a/plugins/uriparser/UriShorten.c +++ b/plugins/uriparser/UriShorten.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 |
@@ -131,7 +131,7 @@ static URI_INLINE UriBool URI_FUNC(EqualsAuthority)(const URI_TYPE(Uri) * first, | |||
131 | 131 | ||
132 | 132 | ||
133 | 133 | ||
134 | int URI_FUNC(RemoveBaseUriImpl)(URI_TYPE(Uri) * dest, | 134 | static int URI_FUNC(RemoveBaseUriImpl)(URI_TYPE(Uri) * dest, |
135 | const URI_TYPE(Uri) * absSource, | 135 | const URI_TYPE(Uri) * absSource, |
136 | const URI_TYPE(Uri) * absBase, | 136 | const URI_TYPE(Uri) * absBase, |
137 | UriBool domainRootMode) { | 137 | UriBool domainRootMode) { |