From f66b2baedce1e9350ad18d402317dcc1847e35e3 Mon Sep 17 00:00:00 2001
From: satbaby <crashdvb@googlemail.com>
Date: Mon, 17 Dec 2012 22:01:46 +0100
Subject: [PATCH] nhttpd: dont doubles decode, revert
 ed318d97bc7ab06299e9504c7e3249cd8dc0324c

---
 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 2 +-
 src/nhttpd/yhttpd_core/yrequest.cpp            | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
index bd352e888..08968fddd 100644
--- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
@@ -561,7 +561,7 @@ void CControlAPI::MessageCGI(CyhookHandler *hh)
 
 	if (event != 0)
 	{
-		message=decodeString(message);
+		//message=decodeString(message);
 		NeutrinoAPI->EventServer->sendEvent(event, CEventServer::INITID_HTTPD, (void *) message.c_str(), message.length() + 1);
 		hh->SendOk();
 	}
diff --git a/src/nhttpd/yhttpd_core/yrequest.cpp b/src/nhttpd/yhttpd_core/yrequest.cpp
index 84ccc5274..ae3a543d7 100644
--- a/src/nhttpd/yhttpd_core/yrequest.cpp
+++ b/src/nhttpd/yhttpd_core/yrequest.cpp
@@ -161,11 +161,7 @@ bool CWebserverRequest::ParseParams(std::string param_string) {
 		if (!ySplitStringExact(param_string, "&", param, param_string))
 			ende = true;
 		if (ySplitStringExact(param, "=", name, value)) {
-			if("channelname" == name){//skip doubles decode on channlename
-				value = trim((value));
-			}else{
-				value = trim(decodeString(value));
-			}
+			value = trim(decodeString(value));
 			if (ParameterList[name].empty())
 				ParameterList[name] = value;
 			else {
@@ -215,7 +211,7 @@ bool CWebserverRequest::ParseHeader(std::string header) {
 void CWebserverRequest::analyzeURL(std::string url) {
 	ParameterList.clear();
 	// URI decode
-	url = decodeString(url);
+	//url = decodeString(url);
 	url = trim(url, "\r\n"); // non-HTTP-Standard: allow \r or \n in URL. Delete it.
 	UrlData["fullurl"] = url;
 	// split Params