updated bundled version of uriparser to 0.8.5

1 files changed, 5 insertions, 5 deletions

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 @@
  * 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
@@ -193,7 +193,7 @@ static UriBool URI_FUNC(OnExitOwnPortUserInfo)(URI_TYPE(ParserState) * state, co
 static UriBool URI_FUNC(OnExitSegmentNzNcOrScheme2)(URI_TYPE(ParserState) * state, const URI_CHAR * first);
 static void URI_FUNC(OnExitPartHelperTwo)(URI_TYPE(ParserState) * state);
 
-static void URI_FUNC(ResetParserState)(URI_TYPE(ParserState) * state);
+static void URI_FUNC(ResetParserStateExceptUri)(URI_TYPE(ParserState) * state);
 
 static UriBool URI_FUNC(PushPathSegment)(URI_TYPE(ParserState) * state, const URI_CHAR * first, const URI_CHAR * afterLast);
 
@@ -2022,7 +2022,7 @@ static const URI_CHAR * URI_FUNC(ParseZeroMoreSlashSegs)(URI_TYPE(ParserState) *
 
 
 
-static URI_INLINE void URI_FUNC(ResetParserState)(URI_TYPE(ParserState) * state) {
+static URI_INLINE void URI_FUNC(ResetParserStateExceptUri)(URI_TYPE(ParserState) * state) {
         URI_TYPE(Uri) * const uriBackup = state->uri;
         memset(state, 0, sizeof(URI_TYPE(ParserState)));
         state->uri = uriBackup;
@@ -2071,7 +2071,7 @@ int URI_FUNC(ParseUriEx)(URI_TYPE(ParserState) * state, const URI_CHAR * first,
         uri = state->uri;
 
         /* Init parser */
-        URI_FUNC(ResetParserState)(state);
+        URI_FUNC(ResetParserStateExceptUri)(state);
         URI_FUNC(ResetUri)(uri);
 
         /* Parse */
@@ -2211,9 +2211,9 @@ UriBool URI_FUNC(_TESTING_ONLY_ParseIpSix)(const URI_CHAR * text) {
         const URI_CHAR * const afterIpSix = text + URI_STRLEN(text);
         const URI_CHAR * res;
 
-        URI_FUNC(ResetParserState)(&parser);
         URI_FUNC(ResetUri)(&uri);
         parser.uri = &uri;
+        URI_FUNC(ResetParserStateExceptUri)(&parser);
         parser.uri->hostData.ip6 = malloc(1 * sizeof(UriIp6));
         res = URI_FUNC(ParseIPv6address2)(&parser, text, afterIpSix);
         URI_FUNC(FreeUriMembers)(&uri);