WebKit Bugzilla
Attachment 358182 Details for
Bug 193075
: Add release logging to help debug HTTPS upgrade issues
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-193075-20190102090030.patch (text/plain), 3.17 KB, created by
Chris Dumez
on 2019-01-02 09:00:31 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Chris Dumez
Created:
2019-01-02 09:00:31 PST
Size:
3.17 KB
patch
obsolete
>Subversion Revision: 239568 >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 5c23432fe891564907ceb8a768a7d6eae8558ebc..ce243a567fdc106f09d961fee69e0ebcb7b107f1 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,16 @@ >+2019-01-02 Chris Dumez <cdumez@apple.com> >+ >+ Add release logging to help debug HTTPS upgrade issues >+ https://bugs.webkit.org/show_bug.cgi?id=193075 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Add release logging to help debug HTTPS upgrade issues like Bug 193026. >+ >+ * NetworkProcess/NetworkHTTPSUpgradeChecker.cpp: >+ (WebKit::NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker): >+ (WebKit::NetworkHTTPSUpgradeChecker::query): >+ > 2019-01-01 Jeff Miller <jeffm@apple.com> > > Update user-visible copyright strings to include 2019 >diff --git a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp >index d0f7d6abdb3f59e3844bd137fe50c6766d7c26b8..984e966c79847bab26e723f148bb034ca3bb6b21 100644 >--- a/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp >+++ b/Source/WebKit/NetworkProcess/NetworkHTTPSUpgradeChecker.cpp >@@ -36,6 +36,7 @@ > #include <wtf/WorkQueue.h> > > #define RELEASE_LOG_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__) >+#define RELEASE_LOG_ERROR_IF_ALLOWED(sessionID, fmt, ...) RELEASE_LOG_ERROR_IF(sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - NetworkHTTPSUpgradeChecker::" fmt, this, ##__VA_ARGS__) > > namespace WebKit { > >@@ -63,9 +64,11 @@ NetworkHTTPSUpgradeChecker::NetworkHTTPSUpgradeChecker() > ASSERT(path); > > bool isDatabaseOpen = m_database->open(path); >- ASSERT(isDatabaseOpen); >- if (!isDatabaseOpen) >+ if (!isDatabaseOpen) { >+ RELEASE_LOG_ERROR(Network, "%p - NetworkHTTPSUpgradeChecker::open failed, error message: %{public}s, database path: %{public}s", this, m_database->lastErrorMsg(), path.utf8().data()); >+ ASSERT_NOT_REACHED(); > return; >+ } > > // Since we are using a workerQueue, the sequential dispatch blocks may be called by different threads. > m_database->disableThreadingChecks(); >@@ -96,7 +99,14 @@ void NetworkHTTPSUpgradeChecker::query(String&& host, PAL::SessionID sessionID, > ASSERT_UNUSED(bindTextResult, bindTextResult == SQLITE_OK); > > int stepResult = m_statement->step(); >- ASSERT(stepResult == SQLITE_ROW || stepResult == SQLITE_DONE); >+ if (stepResult != SQLITE_ROW && stepResult != SQLITE_DONE) { >+ RELEASE_LOG_ERROR_IF_ALLOWED(sessionID, "step failed with error code %d, error message: %{public}s, database path: %{public}s", stepResult, m_database->lastErrorMsg(), networkHTTPSUpgradeCheckerDatabasePath().utf8().data()); >+ ASSERT_NOT_REACHED(); >+ RunLoop::main().dispatch([callback = WTFMove(callback)] () mutable { >+ callback(false); >+ }); >+ return; >+ } > > int resetResult = m_statement->reset(); > ASSERT_UNUSED(resetResult, resetResult == SQLITE_OK);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193075
: 358182