summaryrefslogtreecommitdiffstats
path: root/opensuse/core/tdelibs/disable-idn-support.diff
diff options
context:
space:
mode:
authorRobert Xu <[email protected]>2012-03-31 14:28:06 -0400
committerRobert Xu <[email protected]>2012-03-31 14:28:06 -0400
commit59dd46ef985a719579132efa6a9aa49bfeeae112 (patch)
tree93d8c721ff263e67aaf59e364496862872ded8fb /opensuse/core/tdelibs/disable-idn-support.diff
parentc141f0bc29b6e2eeda5ca08a043d26546a1427f9 (diff)
downloadtde-packaging-59dd46ef985a719579132efa6a9aa49bfeeae112.tar.gz
tde-packaging-59dd46ef985a719579132efa6a9aa49bfeeae112.zip
better late than never, hm...
Diffstat (limited to 'opensuse/core/tdelibs/disable-idn-support.diff')
-rw-r--r--opensuse/core/tdelibs/disable-idn-support.diff12
1 files changed, 6 insertions, 6 deletions
diff --git a/opensuse/core/tdelibs/disable-idn-support.diff b/opensuse/core/tdelibs/disable-idn-support.diff
index 37c59bc91..eab2b7282 100644
--- a/opensuse/core/tdelibs/disable-idn-support.diff
+++ b/opensuse/core/tdelibs/disable-idn-support.diff
@@ -1,7 +1,7 @@
-Index: kdecore/network/kresolver.cpp
+Index: tdecore/network/kresolver.cpp
===================================================================
---- kdecore/network/kresolver.cpp.orig
-+++ kdecore/network/kresolver.cpp
+--- tdecore/network/kresolver.cpp.orig
++++ tdecore/network/kresolver.cpp
@@ -50,6 +50,7 @@
// IDN
@@ -11,7 +11,7 @@ Index: kdecore/network/kresolver.cpp
#endif
@@ -1084,6 +1085,10 @@ static QStringList splitLabels(const QSt
- static QCString ToASCII(const QString& label)
+ static TQCString ToASCII(const TQString& label)
{
#ifdef HAVE_IDNA_H
+ // We do disable it by default for security reasons for now.
@@ -22,13 +22,13 @@ Index: kdecore/network/kresolver.cpp
// function :)
@@ -1118,6 +1123,10 @@ static QCString ToASCII(const QString& l
- static QString ToUnicode(const QString& label)
+ static TQString ToUnicode(const TQString& label)
{
#ifdef HAVE_IDNA_H
+ // We do disable it by default for security reasons for now.
+ if ( getenv("KDE_NO_IPV6") && strcmp( getenv("KDE_NO_IPV6"), "no" ) )
+ return label;
+
- // We have idna.h, so we can use the idna_to_unicode
+ // We have idna.h, so we can use the idna_to_tqunicode
// function :)