diff options
| author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
| commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
| tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/platform/network/mac/ResourceRequestMac.mm | |
| parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
| download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 | |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/platform/network/mac/ResourceRequestMac.mm')
| -rw-r--r-- | WebCore/platform/network/mac/ResourceRequestMac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/platform/network/mac/ResourceRequestMac.mm b/WebCore/platform/network/mac/ResourceRequestMac.mm index 6bb36a0..c4355b2 100644 --- a/WebCore/platform/network/mac/ResourceRequestMac.mm +++ b/WebCore/platform/network/mac/ResourceRequestMac.mm @@ -61,7 +61,7 @@ void ResourceRequest::doUpdateResourceRequest() if (NSString* method = [m_nsRequest.get() HTTPMethod]) m_httpMethod = method; - m_allowHTTPCookies = [m_nsRequest.get() HTTPShouldHandleCookies]; + m_allowCookies = [m_nsRequest.get() HTTPShouldHandleCookies]; NSDictionary *headers = [m_nsRequest.get() allHTTPHeaderFields]; NSEnumerator *e = [headers keyEnumerator]; @@ -113,7 +113,7 @@ void ResourceRequest::doUpdatePlatformRequest() [nsRequest setMainDocumentURL:firstPartyForCookies()]; if (!httpMethod().isEmpty()) [nsRequest setHTTPMethod:httpMethod()]; - [nsRequest setHTTPShouldHandleCookies:allowHTTPCookies()]; + [nsRequest setHTTPShouldHandleCookies:allowCookies()]; HTTPHeaderMap::const_iterator end = httpHeaderFields().end(); for (HTTPHeaderMap::const_iterator it = httpHeaderFields().begin(); it != end; ++it) |