diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-09 00:00:15 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-09 00:00:15 (GMT) |
| commit | fe9b1390573b760aec573bbf2de2e1edf1caa52a (patch) | |
| tree | c4bb2814cf6da2cdba22e2bbf0cd8a09536cf8a3 /src | |
| parent | 546efb2cdb64e968e3376a2d426e653e4da4f5d2 (diff) | |
| parent | 6c24cde00e3a046e6face6f08ec2ed996b54a8f1 (diff) | |
| download | Qt-fe9b1390573b760aec573bbf2de2e1edf1caa52a.zip Qt-fe9b1390573b760aec573bbf2de2e1edf1caa52a.tar.gz Qt-fe9b1390573b760aec573bbf2de2e1edf1caa52a.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 4 | ||||
| -rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index ba1609f..e3a771a 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -66,6 +66,7 @@ int qFindString(const QChar *haystack, int haystackLen, int from, #define RXERR_DISABLED QT_TRANSLATE_NOOP("QRegExp", "disabled feature used") #define RXERR_CHARCLASS QT_TRANSLATE_NOOP("QRegExp", "bad char class syntax") #define RXERR_LOOKAHEAD QT_TRANSLATE_NOOP("QRegExp", "bad lookahead syntax") +#define RXERR_LOOKBEHIND QT_TRANSLATE_NOOP("QRegExp", "lookbehinds not supported, see QTBUG-2371") #define RXERR_REPETITION QT_TRANSLATE_NOOP("QRegExp", "bad repetition syntax") #define RXERR_OCTAL QT_TRANSLATE_NOOP("QRegExp", "invalid octal value") #define RXERR_LEFTDELIM QT_TRANSLATE_NOOP("QRegExp", "missing left delim") @@ -3231,6 +3232,9 @@ int QRegExpEngine::getToken() #endif case ':': return Tok_MagicLeftParen; + case '<': + error(RXERR_LOOKBEHIND); + return Tok_MagicLeftParen; default: error(RXERR_LOOKAHEAD); return Tok_MagicLeftParen; diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 2a2ad55..85cd06c 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -814,6 +814,9 @@ static const char *certificate_blacklist[] = { // "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust + + "120001705", "Digisign Server ID (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Verizon CyberTrust + "1276011370", "Digisign Server ID - (Enrich)", // (Malaysian) Digicert Sdn. Bhd. cross-signed by Entrust 0 }; |