summaryrefslogtreecommitdiffstats
path: root/opensuse/tdelibs/disable-idn-support.diff
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2011-11-10 18:04:39 -0500
committerRobert Xu <robxu9@gmail.com>2011-11-10 18:04:39 -0500
commit21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (patch)
tree2cfb64c59322628e613ed0895e3c3694d3abe6bd /opensuse/tdelibs/disable-idn-support.diff
parent8667643bff14a60d8571c599efd3e48bed3e3b12 (diff)
downloadtde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.tar.gz
tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.zip
initial commit to suse branch: eclipse integration
Diffstat (limited to 'opensuse/tdelibs/disable-idn-support.diff')
-rw-r--r--opensuse/tdelibs/disable-idn-support.diff34
1 files changed, 0 insertions, 34 deletions
diff --git a/opensuse/tdelibs/disable-idn-support.diff b/opensuse/tdelibs/disable-idn-support.diff
deleted file mode 100644
index 37c59bc91..000000000
--- a/opensuse/tdelibs/disable-idn-support.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: kdecore/network/kresolver.cpp
-===================================================================
---- kdecore/network/kresolver.cpp.orig
-+++ kdecore/network/kresolver.cpp
-@@ -50,6 +50,7 @@
-
- // IDN
- #ifdef HAVE_IDNA_H
-+# include <stdlib.h>
- # include <idna.h>
- #endif
-
-@@ -1084,6 +1085,10 @@ static QStringList splitLabels(const QSt
- static QCString ToASCII(const QString& 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.latin1();
-+
- // We have idna.h, so we can use the idna_to_ascii
- // function :)
-
-@@ -1118,6 +1123,10 @@ static QCString ToASCII(const QString& l
- static QString ToUnicode(const QString& 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
- // function :)
-