Changeset 160986 in webkit


Ignore:
Timestamp:
Dec 22, 2013 10:20:59 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[WK2][SOUP] WebContext::allowSpecificHTTPSCertificateForHost does not work correctly when m_usesNetworkProcess is false
​https://bugs.webkit.org/show_bug.cgi?id=125564

Reviewed Carlos Garcia Campos.

WebContext::allowSpecificHTTPSCertificateForHost should send
AllowSpecificHTTPSCertificateForHost to the web process when
m_usesNetworkProcess is false. Also we shouldn't guard
WebProcess::allowSpecificHTTPSCertificateForHost with
!ENABLE(NETWORK_PROCESS) because we need this method when
m_usesNetworkProcess is false.

Patch by Kwang Yul Seo <​skyul@company100.net> on 2013-12-22

  • UIProcess/WebContext.cpp:

(WebKit::WebContext::allowSpecificHTTPSCertificateForHost):

  • WebProcess/WebProcess.h:
  • WebProcess/WebProcess.messages.in:
  • WebProcess/soup/WebProcessSoup.cpp:
Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r160985 r160986  
     12013-12-22  Kwang Yul Seo  <skyul@company100.net>
     2
     3        [WK2][SOUP] WebContext::allowSpecificHTTPSCertificateForHost does not work correctly when m_usesNetworkProcess is false
     4        https://bugs.webkit.org/show_bug.cgi?id=125564
     5
     6        Reviewed Carlos Garcia Campos.
     7
     8        WebContext::allowSpecificHTTPSCertificateForHost should send
     9        AllowSpecificHTTPSCertificateForHost to the web process when
     10        m_usesNetworkProcess is false. Also we shouldn't guard
     11        WebProcess::allowSpecificHTTPSCertificateForHost with
     12        !ENABLE(NETWORK_PROCESS) because we need this method when
     13        m_usesNetworkProcess is false.
     14
     15        * UIProcess/WebContext.cpp:
     16        (WebKit::WebContext::allowSpecificHTTPSCertificateForHost):
     17        * WebProcess/WebProcess.h:
     18        * WebProcess/WebProcess.messages.in:
     19        * WebProcess/soup/WebProcessSoup.cpp:
     20
    1212013-12-22  Martin Robinson  <mrobinson@igalia.com>
    222

  • trunk/Source/WebKit2/UIProcess/WebContext.cpp

    r160952 r160986  
    11431143        return;
    11441144    }
    1145 #else
     1145#endif
     1146
    11461147#if USE(SOUP)
    11471148    m_processes[0]->send(Messages::WebProcess::AllowSpecificHTTPSCertificateForHost(certificate->certificateInfo(), host), 0);
    … …  
    11501151    UNUSED_PARAM(certificate);
    11511152    UNUSED_PARAM(host);
    1152 #endif
    11531153#endif
    11541154

  • trunk/Source/WebKit2/WebProcess/WebProcess.h

    r160487 r160986  
    175175    void updateActivePages();
    176176
    177 #if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
     177#if USE(SOUP)
    178178    void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
    179179#endif

  • trunk/Source/WebKit2/WebProcess/WebProcess.messages.in

    r160487 r160986  
    8484#endif
    8585
    86 #if !ENABLE(NETWORK_PROCESS) && USE(SOUP)
     86#if USE(SOUP)
    8787    AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, String host)
    8888#endif

  • trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp

    r160487 r160986  
    236236}
    237237
    238 #if !ENABLE(NETWORK_PROCESS)
    239238void WebProcess::allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo& certificateInfo, const String& host)
    240239{
    241240    WebCore::ResourceHandle::setClientCertificate(host, certificateInfo.certificate());
    242241}
    243 #endif
     242
    244243} // namespace WebKit
Note: See TracChangeset for help on using the changeset viewer.