Changeset 156717 in webkit
- Timestamp:
- Oct 1, 2013 10:03:58 AM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r156716 r156717 1 2013-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 1 14 2013-10-01 Myles C. Maxfield <mmaxfield@apple.com> 2 15 -
trunk/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp
r156550 r156717 307 307 return false; 308 308 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); 311 311 if (err != CURLE_OK) 312 312 return false; 313 313 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(); 318 318 319 319 String realm; … … 876 876 { 877 877 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(); 879 879 880 880 // Remove any fragment part, otherwise curl will send it as part of the request. 881 kurl.removeFragmentIdentifier();881 url.removeFragmentIdentifier(); 882 882 883 883 ResourceHandleInternal* d = job->getInternal(); 884 String url = kurl.string();885 886 if ( kurl.isLocalFile()) {884 String urlString = url.string(); 885 886 if (url.isLocalFile()) { 887 887 // Remove any query part sent to a local file. 888 if (! kurl.query().isEmpty()) {888 if (!url.query().isEmpty()) { 889 889 // 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(); 892 892 } 893 893 // Determine the MIME type based on the path. … … 936 936 937 937 // 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()); 939 939 curl_easy_setopt(d->m_handle, CURLOPT_URL, d->m_url); 940 940
Note: See TracChangeset
for help on using the changeset viewer.