--- peercast/core/common/common.h.orig	2006-09-20 16:47:56 +0400

+++ peercast/core/common/common.h	2009-11-08 14:01:09 +0300

@@ -274,7 +274,7 @@ inline int strToID(char *str)

 }

 // -----------------------------------

-char *getCGIarg(const char *str, const char *arg);

+const char *getCGIarg(const char *str, const char *arg);

 bool cmpCGIarg(char *str, char *arg, char *value);

 bool hasCGIarg(char *str, char *arg);

--- peercast/core/common/html.cpp.orig	2006-09-20 16:47:56 +0400

+++ peercast/core/common/html.cpp	2009-11-08 14:13:25 +0300

@@ -103,7 +103,7 @@ void HTML::writeVariable(Stream &s,const

 			r = true;

 		}else if (varName.startsWith("loop.hit."))

 		{

-			char *idstr = getCGIarg(tmplArgs,"id=");

+			const char *idstr = getCGIarg(tmplArgs,"id=");

 			if (idstr)

 			{

 				GnuID id;

@@ -136,7 +136,7 @@ void HTML::writeVariable(Stream &s,const

 	{

 		if (varName.startsWith("page.channel."))

 		{

-			char *idstr = getCGIarg(tmplArgs,"id=");

+			const char *idstr = getCGIarg(tmplArgs,"id=");

 			if (idstr)

 			{

 				GnuID id;

@@ -150,7 +150,7 @@ void HTML::writeVariable(Stream &s,const

 			String v = varName+5;

 			v.append('=');

-			char *a = getCGIarg(tmplArgs,v);

+			const char *a = getCGIarg(tmplArgs,v);

 			if (a)

 			{

 				s.writeString(a);		

--- peercast/core/common/sys.cpp.orig	2006-09-20 16:47:56 +0400

+++ peercast/core/common/sys.cpp	2009-11-08 14:05:16 +0300

@@ -740,12 +740,12 @@ void LogBuffer::write(const char *str, T

 }

 // -----------------------------------

-char *getCGIarg(const char *str, const char *arg)

+const char *getCGIarg(const char *str, const char *arg)

 {

 	if (!str)

 		return NULL;

-	char *s = strstr(str,arg);

+	const char *s = strstr(str,arg);

 	if (!s)

 		return NULL;

--- peercast/core/common/servhs.cpp.orig	2009-11-08 14:20:19 +0300

+++ peercast/core/common/servhs.cpp	2009-11-08 20:03:49 +0300

@@ -150,10 +150,10 @@ void Servent::handshakeHTTP(HTTP &http, 

 			if (!isAllowed(ALLOW_BROADCAST))

 				throw HTTPException(HTTP_SC_UNAVAILABLE,503);

-			char *pwdArg = getCGIarg(fn,"pass=");

-			char *songArg = getCGIarg(fn,"song=");

-			char *mountArg = getCGIarg(fn,"mount=");

-			char *urlArg = getCGIarg(fn,"url=");

+			const char *pwdArg = getCGIarg(fn,"pass=");

+			const char *songArg = getCGIarg(fn,"song=");

+			const char *mountArg = getCGIarg(fn,"mount=");

+			const char *urlArg = getCGIarg(fn,"url=");

 			if (pwdArg && songArg)

 			{

@@ -589,7 +589,7 @@ bool Servent::handshakeAuth(HTTP &http,c

 	char user[64],pass[64];

 	user[0] = pass[0] = 0;

-	char *pwd  = getCGIarg(args, "pass=");

+	const char *pwd  = getCGIarg(args, "pass=");

 	if ((pwd) && strlen(servMgr->password))

 	{

@@ -700,7 +700,7 @@ void Servent::handshakeCMD(char *cmd)

 	{

 		if (cmpCGIarg(cmd,"cmd=","redirect"))

 		{

-			char *j = getCGIarg(cmd,"url=");

+			const char *j = getCGIarg(cmd,"url=");

 			if (j)

 			{

 				termArgs(cmd);

@@ -1124,7 +1124,7 @@ void Servent::handshakeCMD(char *cmd)

 					index++;

 				}

-				char *findArg = getCGIarg(cmd,"keywords=");

+				const char *findArg = getCGIarg(cmd,"keywords=");

 				if (hasCGIarg(cmd,"relay"))

 				{