2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6f18a42c..fd5c94a5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+QXmpp 0.9.4 (UNRELEASED)
+------------------------
+
+ - Do not ignore SSL errors by default (issue 113), if you need to deal with
+   broken SSL configurations, set QXmppConfiguration::ignoreSslErrors to true.
+
 QXmpp 0.9.3 (Dec 3, 2015)
 -------------------------
 
diff --git a/src/client/QXmppConfiguration.cpp b/src/client/QXmppConfiguration.cpp
index 7d32c7cd..fc124d77 100644
--- a/src/client/QXmppConfiguration.cpp
+++ b/src/client/QXmppConfiguration.cpp
@@ -64,7 +64,7 @@ public:
     // which authentication systems to use (if any)
     bool useSASLAuthentication;
     bool useNonSASLAuthentication;
-    // default is true
+    // default is false
     bool ignoreSslErrors;
 
     QXmppConfiguration::StreamSecurityMode streamSecurityMode;
@@ -87,7 +87,7 @@ QXmppConfigurationPrivate::QXmppConfigurationPrivate()
     , autoReconnectionEnabled(true)
     , useSASLAuthentication(true)
     , useNonSASLAuthentication(true)
-    , ignoreSslErrors(true)
+    , ignoreSslErrors(false)
     , streamSecurityMode(QXmppConfiguration::TLSEnabled)
     , nonSASLAuthMechanism(QXmppConfiguration::NonSASLDigest)
     , saslAuthMechanism("DIGEST-MD5")