From eea5f7e7c7827ef4a26f6f60fd6c8e0c4c604cc3 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Wed, 21 Dec 2016 01:15:30 +0300 Subject: [PATCH] tdeio/kmimemagic: remove MAGIC_CONTINUE flag This resolves bug 2713 The MAGIC_CONTINUE flag resulted in a malformed mimemagic responses like "application/x-executable\012- application/octet-stream" instead of just "application/x-executable". This string being unparsed then caused the KMimeType::findByURL() to fallback to application/octet-stream for nearly every mimetype. Signed-off-by: Alexander Golubev (cherry picked from commit f54496a1f2d99bea12af3db999a53515109f99a3) --- tdeio/tdeio/kmimemagic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tdeio/tdeio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp index ba5a8dd0a..42f4d676c 100644 --- a/tdeio/tdeio/kmimemagic.cpp +++ b/tdeio/tdeio/kmimemagic.cpp @@ -192,7 +192,7 @@ void process(struct config_rec* conf, const TQString & fn) { KDE_struct_stat sb; TQCString fileName = TQFile::encodeName( fn ); - int magic_flags = MAGIC_CONTINUE|MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/; + int magic_flags = MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/; if (conf->followLinks) { magic_flags |= MAGIC_SYMLINK; } @@ -299,7 +299,7 @@ KMimeMagicResult *KMimeMagic::findBufferType(const TQByteArray &array) { conf->resultBuf = MIME_BINARY_ZEROSIZE; } else { - int magic_flags = MAGIC_CONTINUE|MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/; + int magic_flags = MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/; if (conf->followLinks) { magic_flags |= MAGIC_SYMLINK; }