From 1cb2823d2241005ecc53bbff33932916bf669f38 Mon Sep 17 00:00:00 2001 From: fbraem Date: Thu, 24 Oct 2013 17:03:43 +0200 Subject: [PATCH 01/10] Solve wrong escaping of unicode characters --- JSON/src/Stringifier.cpp | 54 ++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/JSON/src/Stringifier.cpp b/JSON/src/Stringifier.cpp index 687d37b70..b6a20ab6a 100644 --- a/JSON/src/Stringifier.cpp +++ b/JSON/src/Stringifier.cpp @@ -92,41 +92,41 @@ void Stringifier::formatString(const std::string& value, std::ostream& out) out << '"'; for (std::string::const_iterator it = value.begin(); it != value.end(); ++it) { - switch (*it) - { - case '"': + if (*it == 0x20 || + *it == 0x21 || + (*it >= 0x23 && *it <= 0x2E) || + (*it >= 0x30 && *it <= 0x5B) || + (*it >= 0x5D && *it <= 0xFF)) + out << *it; + else if (*it == '"') out << "\\\""; - break; - case '\\': + else if (*it == '\\') out << "\\\\"; - break; - case '\b': + else if (*it == '\b') out << "\\b"; - break; - case '\f': + else if (*it == '\f') out << "\\f"; - break; - case '\n': + else if (*it == '\n') out << "\\n"; - break; - case '\r': + else if (*it == '\r') out << "\\r"; - break; - case '\t': + else if (*it == '\t') out << "\\t"; - break; - default: + else if ( *it == '\0' ) + out << "\\u0000"; + else { - if ( *it > 0 && *it <= 0x1F ) - { - out << "\\u" << std::hex << std::uppercase << std::setfill('0') << std::setw(4) << static_cast(*it); - } - else - { - out << *it; - } - break; - } + const char *hexdigits = "0123456789ABCDEF"; + unsigned long u = (std::min)(static_cast(static_cast(*it)), 0xFFFFul); + int d1 = u / 4096; u -= d1 * 4096; + int d2 = u / 256; u -= d2 * 256; + int d3 = u / 16; u -= d3 * 16; + int d4 = u; + out << "\\u"; + out << hexdigits[d1]; + out << hexdigits[d2]; + out << hexdigits[d3]; + out << hexdigits[d4]; } } out << '"'; From 65988bbf8d7a9afb078a9473c352e96c391e1898 Mon Sep 17 00:00:00 2001 From: fbraem Date: Wed, 19 Feb 2014 19:07:02 +0100 Subject: [PATCH 02/10] Use Int32 for messageLength --- MongoDB/include/Poco/MongoDB/MessageHeader.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/MongoDB/include/Poco/MongoDB/MessageHeader.h b/MongoDB/include/Poco/MongoDB/MessageHeader.h index ef096ba4f..b2bce5a2e 100644 --- a/MongoDB/include/Poco/MongoDB/MessageHeader.h +++ b/MongoDB/include/Poco/MongoDB/MessageHeader.h @@ -76,7 +76,7 @@ public: void write(BinaryWriter& writer); /// Writes the header - std::size_t getMessageLength() const; + Int32 getMessageLength() const; /// Returns the message length OpCode opCode() const; @@ -95,13 +95,13 @@ private: MessageHeader(OpCode opcode); /// Constructor. - void setMessageLength(std::size_t length); + void setMessageLength(Int32 length); /// Sets the message length - std::size_t _messageLength; - Int32 _requestID; - Int32 _responseTo; - OpCode _opCode; + Int32 _messageLength; + Int32 _requestID; + Int32 _responseTo; + OpCode _opCode; friend class Message; }; @@ -113,13 +113,13 @@ inline MessageHeader::OpCode MessageHeader::opCode() const } -inline std::size_t MessageHeader::getMessageLength() const +inline Int32 MessageHeader::getMessageLength() const { return _messageLength; } -inline void MessageHeader::setMessageLength(std::size_t length) +inline void MessageHeader::setMessageLength(Int32 length) { _messageLength = MSG_HEADER_SIZE + length; } From ea666bb16b4720e58c77383919d4791bcb361c25 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Mon, 10 Mar 2014 21:20:18 -0500 Subject: [PATCH 03/10] Building Poco 1.5.2 for Synology RS812+ (Intel Atom) #405 --- Foundation/include/Poco/Config.h | 5 +++++ Foundation/include/Poco/DirectoryWatcher.h | 9 +++++++++ Foundation/src/DirectoryWatcher.cpp | 8 ++++++++ Foundation/testsuite/src/DirectoryWatcherTest.cpp | 8 ++++++++ Foundation/testsuite/src/DirectoryWatcherTest.h | 10 ++++++++++ Foundation/testsuite/src/FilesystemTestSuite.cpp | 2 ++ 6 files changed, 42 insertions(+) diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h index 37c69b7cd..fceecc668 100644 --- a/Foundation/include/Poco/Config.h +++ b/Foundation/include/Poco/Config.h @@ -120,6 +120,11 @@ #endif +// Define to disable compilation of DirectoryWatcher +// on platforms with no inotify. +// #define POCO_NO_INOTIFY + + // Following are options to remove certain features // to reduce library/executable size for smaller // embedded platforms. By enabling these options, diff --git a/Foundation/include/Poco/DirectoryWatcher.h b/Foundation/include/Poco/DirectoryWatcher.h index 5f4b4742d..fac2029d5 100644 --- a/Foundation/include/Poco/DirectoryWatcher.h +++ b/Foundation/include/Poco/DirectoryWatcher.h @@ -41,6 +41,11 @@ #include "Poco/Foundation.h" + + +#ifndef POCO_NO_INOTIFY + + #include "Poco/File.h" #include "Poco/BasicEvent.h" #include "Poco/Runnable.h" @@ -242,4 +247,8 @@ inline const File& DirectoryWatcher::directory() const } // namespace Poco +#endif // POCO_NO_INOTIFY + + #endif // Foundation_DirectoryWatcher_INCLUDED + diff --git a/Foundation/src/DirectoryWatcher.cpp b/Foundation/src/DirectoryWatcher.cpp index 62a715df7..c79c36f70 100644 --- a/Foundation/src/DirectoryWatcher.cpp +++ b/Foundation/src/DirectoryWatcher.cpp @@ -35,6 +35,11 @@ #include "Poco/DirectoryWatcher.h" + + +#ifndef POCO_NO_INOTIFY + + #include "Poco/Path.h" #include "Poco/Glob.h" #include "Poco/DirectoryIterator.h" @@ -616,3 +621,6 @@ bool DirectoryWatcher::supportsMoveEvents() const } // namespace Poco + + +#endif // POCO_NO_INOTIFY diff --git a/Foundation/testsuite/src/DirectoryWatcherTest.cpp b/Foundation/testsuite/src/DirectoryWatcherTest.cpp index 6be8b6ed8..e48533c11 100644 --- a/Foundation/testsuite/src/DirectoryWatcherTest.cpp +++ b/Foundation/testsuite/src/DirectoryWatcherTest.cpp @@ -31,6 +31,11 @@ #include "DirectoryWatcherTest.h" + + +#ifndef POCO_NO_INOTIFY + + #include "CppUnit/TestCaller.h" #include "CppUnit/TestSuite.h" #include "Poco/DirectoryWatcher.h" @@ -312,3 +317,6 @@ CppUnit::Test* DirectoryWatcherTest::suite() return pSuite; } + + +#endif // POCO_NO_INOTIFY diff --git a/Foundation/testsuite/src/DirectoryWatcherTest.h b/Foundation/testsuite/src/DirectoryWatcherTest.h index e0643243f..83e2191c9 100644 --- a/Foundation/testsuite/src/DirectoryWatcherTest.h +++ b/Foundation/testsuite/src/DirectoryWatcherTest.h @@ -37,6 +37,11 @@ #include "Poco/Foundation.h" + + +#ifndef POCO_NO_INOTIFY + + #include "Poco/DirectoryWatcher.h" #include "Poco/Path.h" #include "CppUnit/TestCase.h" @@ -80,4 +85,9 @@ private: }; +#endif // POCO_NO_INOTIFY + + #endif // DirectoryWatcherTest_INCLUDED + + diff --git a/Foundation/testsuite/src/FilesystemTestSuite.cpp b/Foundation/testsuite/src/FilesystemTestSuite.cpp index 492868c01..6b503f8e9 100644 --- a/Foundation/testsuite/src/FilesystemTestSuite.cpp +++ b/Foundation/testsuite/src/FilesystemTestSuite.cpp @@ -45,7 +45,9 @@ CppUnit::Test* FilesystemTestSuite::suite() pSuite->addTest(PathTest::suite()); pSuite->addTest(FileTest::suite()); pSuite->addTest(GlobTest::suite()); +#ifndef POCO_NO_INOTIFY pSuite->addTest(DirectoryWatcherTest::suite()); +#endif // POCO_NO_INOTIFY pSuite->addTest(DirectoryIteratorsTest::suite()); return pSuite; From 98960a25a5d347b82042ef71b62dbc74010c1c47 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Tue, 11 Mar 2014 13:32:44 +0100 Subject: [PATCH 04/10] =?UTF-8?q?=20-=20fixed=20makedepend.*=20scripts=20t?= =?UTF-8?q?o=20work=20in=20paths=20containing=20'.o*'=20(contributed=20by?= =?UTF-8?q?=20Per-Erik=20Bj=C3=B6rkstad,=20H=C3=A5kan=20Bengtsen)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/script/makedepend.SunCC | 2 +- build/script/makedepend.aCC | 2 +- build/script/makedepend.clang | 2 +- build/script/makedepend.cxx | 2 +- build/script/makedepend.gcc | 2 +- build/script/makedepend.qcc | 2 +- build/script/makedepend.xlC | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/script/makedepend.SunCC b/build/script/makedepend.SunCC index dcd62d3af..cfb1a1e44 100755 --- a/build/script/makedepend.SunCC +++ b/build/script/makedepend.SunCC @@ -21,4 +21,4 @@ shift dir4=$1 shift -CC -xM1 $@ $source | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target +CC -xM1 $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target diff --git a/build/script/makedepend.aCC b/build/script/makedepend.aCC index d7f273ee6..357a2e92c 100755 --- a/build/script/makedepend.aCC +++ b/build/script/makedepend.aCC @@ -23,5 +23,5 @@ shift tmpfile=`basename $target` aCC -E +maked $@ $source >/dev/null -sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" <$tmpfile >$target +sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" <$tmpfile >$target rm $tmpfile diff --git a/build/script/makedepend.clang b/build/script/makedepend.clang index fa1841546..95846964c 100755 --- a/build/script/makedepend.clang +++ b/build/script/makedepend.clang @@ -28,4 +28,4 @@ else CLANG=clang++ fi -$CLANG -MM $@ $source | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target +$CLANG -MM $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target diff --git a/build/script/makedepend.cxx b/build/script/makedepend.cxx index 9512e37c9..7c5100ce6 100755 --- a/build/script/makedepend.cxx +++ b/build/script/makedepend.cxx @@ -21,4 +21,4 @@ shift dir4=$1 shift -cxx -M $@ $source | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target +cxx -M $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target diff --git a/build/script/makedepend.gcc b/build/script/makedepend.gcc index 088c1f0c4..0653c1769 100755 --- a/build/script/makedepend.gcc +++ b/build/script/makedepend.gcc @@ -21,4 +21,4 @@ shift dir4=$1 shift -$CC -MM $@ $source | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target +$CC -MM $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target diff --git a/build/script/makedepend.qcc b/build/script/makedepend.qcc index 32e1dec7e..317221982 100755 --- a/build/script/makedepend.qcc +++ b/build/script/makedepend.qcc @@ -20,4 +20,4 @@ shift dir4=$1 shift -$CC -E -Wp,-MM $@ $source | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target +$CC -E -Wp,-MM $@ $source | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target diff --git a/build/script/makedepend.xlC b/build/script/makedepend.xlC index 9f78a14bd..c880398af 100755 --- a/build/script/makedepend.xlC +++ b/build/script/makedepend.xlC @@ -27,5 +27,5 @@ $CXX -qmakedep -E -w $@ $cwd/$source >/dev/null ufile=`basename $source` ufile=`echo $ufile | sed "s#\.cpp#\.u#"` -cat $ufile | sort | uniq | grep -v '/usr/include' | grep -v '/usr/vacpp' | sed "s#\(.*\.o\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target +cat $ufile | sort | uniq | grep -v '/usr/include' | grep -v '/usr/vacpp' | sed "s#\(.*\.o$\)#$dir1/\1 $dir2/\1 $dir3/\1 $dir4/\1#" >$target From d9f92d506d1ba039e80feaa7f0f7d28ac52caef3 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Tue, 11 Mar 2014 20:31:06 -0500 Subject: [PATCH 05/10] Update MessageHeader.h --- MongoDB/include/Poco/MongoDB/MessageHeader.h | 1 + 1 file changed, 1 insertion(+) diff --git a/MongoDB/include/Poco/MongoDB/MessageHeader.h b/MongoDB/include/Poco/MongoDB/MessageHeader.h index b2bce5a2e..1cb3a9a2e 100644 --- a/MongoDB/include/Poco/MongoDB/MessageHeader.h +++ b/MongoDB/include/Poco/MongoDB/MessageHeader.h @@ -121,6 +121,7 @@ inline Int32 MessageHeader::getMessageLength() const inline void MessageHeader::setMessageLength(Int32 length) { + poco_assert (_messageLength >= 0); _messageLength = MSG_HEADER_SIZE + length; } From f94d14c472479ffbf361a67343b8655a164e4ea2 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Tue, 11 Mar 2014 21:29:37 -0500 Subject: [PATCH 06/10] Update CHANGELOG --- CHANGELOG | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index ca80d4ae5..ad60900ca 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ This is the changelog file for the POCO C++ Libraries. -Release 1.5.3 (2014-02-xx) +Release 1.5.3 (2014-05-xx) ========================== - fixed GH# 316: Poco::DateTimeFormatter::append() gives wrong result for @@ -16,6 +16,26 @@ Release 1.5.3 (2014-02-xx) have been changed to use Poco::Clock instead of Poco::Timestamp and are now unaffected by system realtime clock changes. - fixed GH# 350: Memory leak in Data/ODBC with BLOB +- Correctly set MySQL time_type for Poco::Data::Date. +- fixed GH #352: Removed redundant #includes and fixed spelling mistakes. +- fixed setting of MYSQL_BIND is_unsigned value. +- fixed GH #360: CMakeLists foundation: add Clock.cpp in the list of source files +- Add extern "C" around on HPUX platform. +- added runtests.sh +- fixed CPPUNIT_IGNORE parsing +- fixed Glob from start path, for platforms not alowing transverse from root (Android) +- added NTPClient (Rangel Reale) +- added PowerShell build script +- added SmartOS build support +- fix warnings in headers +- XMLWriter: removed unnecessary apostrophe escaping (&apos) +- MongoDB: use Int32 for messageLength +- fixed GH #380: SecureSocket+DialogSocket crashes with SIGSEGV when timeout occours +- Improve RSADigestEngine, using Poco::Crypto::DigestEngine to calculate hash before signing +- added Poco::PBKDF2Engine +- added support for a 'Priority' attribute on cookies. +- GH #386: fixed bug in MailMessage without content-transfer-encoding header +- GH #384: ew hash algorithms support for RSADigestEngine Release 1.5.2 (2013-09-16) From 1950377a8ebcc1b200a15b40a1d89ed56761a735 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Tue, 11 Mar 2014 21:33:23 -0500 Subject: [PATCH 07/10] Update CONTRIBUTORS --- CONTRIBUTORS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 7709743ed..9ca0cc144 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -36,6 +36,11 @@ Matej Knopp Patrice Tarabbia Lucas Clemente Karl Reid +Pascal Bach +Cristian Thiago Moecke +Sergei Nikulov +Aaron Kaluszka +Iyed Bennour -- $Id$ From f20994e2c3815251a964f729b3d0d47405f08b00 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 12 Mar 2014 13:58:32 +0100 Subject: [PATCH 08/10] Add missing files to CMakeLists.txt This makes Poco compile with CMake again. --- Foundation/CMakeLists.txt | 1 + Foundation/testsuite/CMakeLists.txt | 2 ++ Net/CMakeLists.txt | 4 ++++ Net/testsuite/CMakeLists.txt | 2 ++ 4 files changed, 9 insertions(+) diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt index caac886bb..672db75c4 100644 --- a/Foundation/CMakeLists.txt +++ b/Foundation/CMakeLists.txt @@ -53,6 +53,7 @@ set( BASE_SRCS src/DigestEngine.cpp src/DigestStream.cpp src/DirectoryIterator.cpp + src/DirectoryIteratorStrategy.cpp src/DirectoryWatcher.cpp src/Environment.cpp src/Error.cpp diff --git a/Foundation/testsuite/CMakeLists.txt b/Foundation/testsuite/CMakeLists.txt index 6840f3acb..5d08083ec 100644 --- a/Foundation/testsuite/CMakeLists.txt +++ b/Foundation/testsuite/CMakeLists.txt @@ -53,6 +53,7 @@ src/HexBinaryTest.cpp src/LRUCacheTest.cpp src/LineEndingConverterTest.cpp src/LinearHashTableTest.cpp +src/ListMapTest.cpp src/LocalDateTimeTest.cpp src/LogStreamTest.cpp src/LoggerTest.cpp @@ -79,6 +80,7 @@ src/NumberFormatterTest.cpp src/NumberParserTest.cpp src/PathTest.cpp src/PatternFormatterTest.cpp +src/PBKDF2EngineTest.cpp src/PriorityEventTest.cpp src/ProcessTest.cpp src/ProcessesTestSuite.cpp diff --git a/Net/CMakeLists.txt b/Net/CMakeLists.txt index 0c0e619b6..5a824dedf 100644 --- a/Net/CMakeLists.txt +++ b/Net/CMakeLists.txt @@ -62,9 +62,13 @@ set( BASE_SRCS src/Net.cpp src/NetException.cpp src/NetworkInterface.cpp + src/NTPClient.cpp + src/NTPEventArgs.cpp + src/NTPPacket.cpp src/NullPartHandler.cpp src/PartHandler.cpp src/PartSource.cpp + src/PartStore.cpp src/POP3ClientSession.cpp src/QuotedPrintableDecoder.cpp src/QuotedPrintableEncoder.cpp diff --git a/Net/testsuite/CMakeLists.txt b/Net/testsuite/CMakeLists.txt index f98ca1910..efb4c37f4 100644 --- a/Net/testsuite/CMakeLists.txt +++ b/Net/testsuite/CMakeLists.txt @@ -39,6 +39,8 @@ src/NameValueCollectionTest.cpp src/NetCoreTestSuite.cpp src/NetTestSuite.cpp src/NetworkInterfaceTest.cpp +src/NTPClientTest.cpp +src/NTPClientTestSuite.cpp src/POP3ClientSessionTest.cpp src/QuotedPrintableTest.cpp src/RawSocketTest.cpp From 850148f77582cf9b87e06563d62c4ec0021eac08 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 12 Mar 2014 14:05:44 +0100 Subject: [PATCH 09/10] Add SHA1 test for Poco::Crypto::DigestEngine --- Crypto/testsuite/src/DigestEngineTest.cpp | 17 +++++++++++++++++ Crypto/testsuite/src/DigestEngineTest.h | 1 + 2 files changed, 18 insertions(+) diff --git a/Crypto/testsuite/src/DigestEngineTest.cpp b/Crypto/testsuite/src/DigestEngineTest.cpp index bc7e150d8..ed3be1688 100644 --- a/Crypto/testsuite/src/DigestEngineTest.cpp +++ b/Crypto/testsuite/src/DigestEngineTest.cpp @@ -78,6 +78,22 @@ void DigestEngineTest::testMD5() assert (DigestEngine::digestToHex(engine.digest()) == "57edf4a22be3c955ac49da2e2107b67a"); } +void DigestEngineTest::testSHA1() +{ + DigestEngine engine("SHA1"); + + // test vectors from FIPS 180-1 + + engine.update("abc"); + assert (DigestEngine::digestToHex(engine.digest()) == "a9993e364706816aba3e25717850c26c9cd0d89d"); + + engine.update("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"); + assert (DigestEngine::digestToHex(engine.digest()) == "84983e441c3bd26ebaae4aa1f95129e5e54670f1"); + + for (int i = 0; i < 1000000; ++i) + engine.update('a'); + assert (DigestEngine::digestToHex(engine.digest()) == "34aa973cd4c4daa4f61eeb2bdbad27316534016f"); +} void DigestEngineTest::setUp() { @@ -94,6 +110,7 @@ CppUnit::Test* DigestEngineTest::suite() CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("DigestEngineTest"); CppUnit_addTest(pSuite, DigestEngineTest, testMD5); + CppUnit_addTest(pSuite, DigestEngineTest, testSHA1); return pSuite; } diff --git a/Crypto/testsuite/src/DigestEngineTest.h b/Crypto/testsuite/src/DigestEngineTest.h index 24206436b..9872f6a59 100644 --- a/Crypto/testsuite/src/DigestEngineTest.h +++ b/Crypto/testsuite/src/DigestEngineTest.h @@ -47,6 +47,7 @@ public: ~DigestEngineTest(); void testMD5(); + void testSHA1(); void setUp(); void tearDown(); From cd607b6f28908526677246dbcc5f76cf1d6617e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Wed, 12 Mar 2014 17:11:55 +0100 Subject: [PATCH 10/10] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c880cc60f..25529f5cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ compiler: - clang before_install: - sudo apt-get update -qq - - sudo DEBIAN_FRONTEND=noninteractive apt-get -qq -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade +# - sudo DEBIAN_FRONTEND=noninteractive apt-get -qq -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade - sudo apt-get install -qq -y unixodbc-dev libmysqlclient-dev script: ./configure && make -s -j2