summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Golubev <fatzer2@gmail.com>2016-12-20 22:15:30 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2017-01-19 00:31:35 (GMT)
commitf54496a1f2d99bea12af3db999a53515109f99a3 (patch)
treeba7ae8282a0f9c6cf58165d30695d66e74a880ec
parentd9ca16068027f45cd0e59b3bcb31be9650e0da5f (diff)
downloadtdelibs-f54496a1.zip
tdelibs-f54496a1.tar.gz
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 <fatzer2@gmail.com>
-rw-r--r--tdeio/tdeio/kmimemagic.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeio/tdeio/kmimemagic.cpp b/tdeio/tdeio/kmimemagic.cpp
index ba5a8dd..42f4d67 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;
}