diff options
| author | Timothy Pearson <[email protected]> | 2011-08-13 12:21:22 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-08-13 12:21:22 -0500 |
| commit | f65bcb8326e06816d7dc49e58bda120182dbbcd6 (patch) | |
| tree | 4e7fef001fc523929450778d10c86b41e6e32eda /opensuse/tdelibs/disable-idn-support.diff | |
| parent | 131df957b41b4683571b1e36e6fed9d614d32356 (diff) | |
| parent | fa41f32b69994ecd75b7359fa2df08ea5a3480ab (diff) | |
| download | tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.tar.gz tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'opensuse/tdelibs/disable-idn-support.diff')
| -rw-r--r-- | opensuse/tdelibs/disable-idn-support.diff | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/opensuse/tdelibs/disable-idn-support.diff b/opensuse/tdelibs/disable-idn-support.diff new file mode 100644 index 000000000..37c59bc91 --- /dev/null +++ b/opensuse/tdelibs/disable-idn-support.diff @@ -0,0 +1,34 @@ +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 :) + |