[icinga-checkins] icinga.org: icinga2/feature/check_nscp-12874: Fix Url query without values

git at icinga.org git at icinga.org
Fri Oct 14 15:54:39 CEST 2016


Module: icinga2
Branch: feature/check_nscp-12874
Commit: de783c7162270b8e32b4998af7487a28378f40dd
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=de783c7162270b8e32b4998af7487a28378f40dd

Author: Jean Flach <jean-marcel.flach at netways.de>
Date:   Mon Oct 10 11:42:18 2016 +0200

Fix Url query without values

fixes #12883

---

 lib/remote/url.cpp |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/remote/url.cpp b/lib/remote/url.cpp
index 77074af..d1e0125 100644
--- a/lib/remote/url.cpp
+++ b/lib/remote/url.cpp
@@ -384,7 +384,11 @@ bool Url::ParseQuery(const String& query)
 		String key = token.SubStr(0, pHelper);
 		String value = Empty;
 
+<<<<<<< HEAD
 		if (pHelper != String::NPos && pHelper != token.GetLength() - 1)
+=======
+		if (pHelper != token.NPos && pHelper != token.GetLength() - 1)
+>>>>>>> Fix Url query without values
 			value = token.SubStr(pHelper+1);
 
 		if (!ValidateToken(value, ACQUERY))



More information about the icinga-checkins mailing list