Changeset 156717 in webkit


Ignore:
Timestamp:
Oct 1, 2013 10:03:58 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Rename URL type variables in Curl network backend.
https://bugs.webkit.org/show_bug.cgi?id=122158

Patch by Szabolcs Dávid <davidsz@inf.u-szeged.hu> on 2013-10-01
Reviewed by Darin Adler.

I changed the name of the URL objects to match with the new class name.

  • platform/network/curl/ResourceHandleManager.cpp:

(WebCore::getProtectionSpace):
(WebCore::ResourceHandleManager::initializeHandle):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r156716 r156717  
     12013-10-01  Szabolcs Dávid  <davidsz@inf.u-szeged.hu>
     2
     3        Rename URL type variables in Curl network backend.
     4        https://bugs.webkit.org/show_bug.cgi?id=122158
     5
     6        Reviewed by Darin Adler.
     7
     8        I changed the name of the URL objects to match with the new class name.
     9
     10        * platform/network/curl/ResourceHandleManager.cpp:
     11        (WebCore::getProtectionSpace):
     12        (WebCore::ResourceHandleManager::initializeHandle):
     13
    1142013-10-01  Myles C. Maxfield  <mmaxfield@apple.com>
    215
  • trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp

    r156550 r156717  
    307307        return false;
    308308
    309     const char* url = 0;
    310     err = curl_easy_getinfo(h, CURLINFO_EFFECTIVE_URL, &url);
     309    const char* effectiveUrl = 0;
     310    err = curl_easy_getinfo(h, CURLINFO_EFFECTIVE_URL, &effectiveUrl);
    311311    if (err != CURLE_OK)
    312312        return false;
    313313
    314     URL kurl(ParsedURLString, url);
    315 
    316     String host = kurl.host();
    317     String protocol = kurl.protocol();
     314    URL url(ParsedURLString, effectiveUrl);
     315
     316    String host = url.host();
     317    String protocol = url.protocol();
    318318
    319319    String realm;
     
    876876{
    877877    static const int allowedProtocols = CURLPROTO_FILE | CURLPROTO_FTP | CURLPROTO_FTPS | CURLPROTO_HTTP | CURLPROTO_HTTPS;
    878     URL kurl = job->firstRequest().url();
     878    URL url = job->firstRequest().url();
    879879
    880880    // Remove any fragment part, otherwise curl will send it as part of the request.
    881     kurl.removeFragmentIdentifier();
     881    url.removeFragmentIdentifier();
    882882
    883883    ResourceHandleInternal* d = job->getInternal();
    884     String url = kurl.string();
    885 
    886     if (kurl.isLocalFile()) {
     884    String urlString = url.string();
     885
     886    if (url.isLocalFile()) {
    887887        // Remove any query part sent to a local file.
    888         if (!kurl.query().isEmpty()) {
     888        if (!url.query().isEmpty()) {
    889889            // By setting the query to a null string it'll be removed.
    890             kurl.setQuery(String());
    891             url = kurl.string();
     890            url.setQuery(String());
     891            urlString = url.string();
    892892        }
    893893        // Determine the MIME type based on the path.
     
    936936
    937937    // url is in ASCII so latin1() will only convert it to char* without character translation.
    938     d->m_url = fastStrDup(url.latin1().data());
     938    d->m_url = fastStrDup(urlString.latin1().data());
    939939    curl_easy_setopt(d->m_handle, CURLOPT_URL, d->m_url);
    940940
Note: See TracChangeset for help on using the changeset viewer.