Changeset 17582 in webkit


Ignore:
Timestamp:
Nov 3, 2006 2:28:20 PM (17 years ago)
Author:
mjs
Message:

Not reviewed, fix for accidental commit.

  • roll back some network changes accidentally committed with a previous patch.
  • WebCore.xcodeproj/project.pbxproj:
  • bridge/mac/WebCoreFrameBridge.mm: (-[WebCoreFrameBridge getData:andResponse:forURL:]): (-[WebCoreFrameBridge getAllResourceDatas:andResponses:]):
  • loader/CachedCSSStyleSheet.cpp: (WebCore::CachedCSSStyleSheet::checkNotify):
  • loader/CachedImage.cpp: (WebCore::CachedImage::createImage):
  • loader/CachedResource.cpp: (WebCore::CachedResource::CachedResource): (WebCore::CachedResource::~CachedResource): (WebCore::CachedResource::setExpireDate): (WebCore::CachedResource::isExpired):
  • loader/CachedResource.h: (WebCore::CachedResource::response):
  • loader/LoaderFunctions.h:
  • loader/loader.cpp: (WebCore::Loader::receivedResponse): (WebCore::Loader::didReceivedResponse):
  • loader/loader.h:
  • loader/mac/FormDataStream.h:
  • loader/mac/FormDataStream.m: (WebCore::formCreate): (WebCore::formFinalize):
  • loader/mac/ImageDocumentMac.mm: (WebCore::finishImageLoad):
  • loader/mac/LoaderFunctionsMac.mm: (WebCore::CheckCacheObjectStatus): (WebCore::CachedResource::setResponse):
  • loader/mac/SubresourceLoaderMac.mm: (WebCore::SubresourceLoader::willSendRequest):
  • platform/network/ResourceHandle.h:
  • platform/network/ResourceHandleClient.h: (WebCore::ResourceHandleClient::receivedRedirect):
  • platform/network/ResourceRequest.h:
  • platform/network/ResourceResponse.h: (WebCore::ResourceResponse::ResourceResponse):
  • platform/network/mac/ResourceHandleMac.mm: (WebCore::ResourceHandle::redirectedToURL):
  • xml/xmlhttprequest.cpp: (WebCore::XMLHttpRequest::receivedRedirect):
  • xml/xmlhttprequest.h:
Location:
trunk/WebCore
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r17581 r17582  
     12006-11-03  Maciej Stachowiak  <mjs@apple.com>
     2
     3        Not reviewed, fix for accidental commit.
     4
     5        - roll back some network changes accidentally committed with a previous patch.
     6
     7        * WebCore.xcodeproj/project.pbxproj:
     8        * bridge/mac/WebCoreFrameBridge.mm:
     9        (-[WebCoreFrameBridge getData:andResponse:forURL:]):
     10        (-[WebCoreFrameBridge getAllResourceDatas:andResponses:]):
     11        * loader/CachedCSSStyleSheet.cpp:
     12        (WebCore::CachedCSSStyleSheet::checkNotify):
     13        * loader/CachedImage.cpp:
     14        (WebCore::CachedImage::createImage):
     15        * loader/CachedResource.cpp:
     16        (WebCore::CachedResource::CachedResource):
     17        (WebCore::CachedResource::~CachedResource):
     18        (WebCore::CachedResource::setExpireDate):
     19        (WebCore::CachedResource::isExpired):
     20        * loader/CachedResource.h:
     21        (WebCore::CachedResource::response):
     22        * loader/LoaderFunctions.h:
     23        * loader/loader.cpp:
     24        (WebCore::Loader::receivedResponse):
     25        (WebCore::Loader::didReceivedResponse):
     26        * loader/loader.h:
     27        * loader/mac/FormDataStream.h:
     28        * loader/mac/FormDataStream.m:
     29        (WebCore::formCreate):
     30        (WebCore::formFinalize):
     31        * loader/mac/ImageDocumentMac.mm:
     32        (WebCore::finishImageLoad):
     33        * loader/mac/LoaderFunctionsMac.mm:
     34        (WebCore::CheckCacheObjectStatus):
     35        (WebCore::CachedResource::setResponse):
     36        * loader/mac/SubresourceLoaderMac.mm:
     37        (WebCore::SubresourceLoader::willSendRequest):
     38        * platform/network/ResourceHandle.h:
     39        * platform/network/ResourceHandleClient.h:
     40        (WebCore::ResourceHandleClient::receivedRedirect):
     41        * platform/network/ResourceRequest.h:
     42        * platform/network/ResourceResponse.h:
     43        (WebCore::ResourceResponse::ResourceResponse):
     44        * platform/network/mac/ResourceHandleMac.mm:
     45        (WebCore::ResourceHandle::redirectedToURL):
     46        * xml/xmlhttprequest.cpp:
     47        (WebCore::XMLHttpRequest::receivedRedirect):
     48        * xml/xmlhttprequest.h:
     49
    1502006-11-03  Anders Carlsson  <acarlsson@apple.com>
    251

  • trunk/WebCore/WebCore.xcodeproj/project.pbxproj

    r17577 r17582  
    281281                550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BC7085F6039007353D6 /* QualifiedName.cpp */; };
    282282                550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
    283                 650E3F690AF6C168001FA3AD /* ResourceRequestMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 650E3F670AF6C168001FA3AD /* ResourceRequestMac.h */; };
    284                 650E3F6A0AF6C168001FA3AD /* ResourceRequestMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 650E3F680AF6C168001FA3AD /* ResourceRequestMac.mm */; };
    285283                650F53DC09D15DDA00C9B0C8 /* CSSGrammar.h in Headers */ = {isa = PBXBuildFile; fileRef = 650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */; };
    286284                650F53DD09D15DDF00C9B0C8 /* CSSGrammar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6565814409D13043000E61D7 /* CSSGrammar.cpp */; };
    … …  
    304302                6552E7AA096AA11B0006F248 /* WebCoreFrameNamespaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 6552E7A8096AA11B0006F248 /* WebCoreFrameNamespaces.h */; settings = {ATTRIBUTES = (Private, ); }; };
    305303                6552E7AB096AA11B0006F248 /* WebCoreFrameNamespaces.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6552E7A9096AA11B0006F248 /* WebCoreFrameNamespaces.mm */; };
    306                 655A81BE0AEF67E6000975F0 /* HTTPHeaderMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 655A81BD0AEF67E6000975F0 /* HTTPHeaderMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
     304                655A81BE0AEF67E6000975F0 /* HTTPHeaderMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 655A81BD0AEF67E6000975F0 /* HTTPHeaderMap.h */; };
    307305                6563A9A70ADF4094000ED2CD /* LoaderNSURLRequestExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 6563A9A50ADF4094000ED2CD /* LoaderNSURLRequestExtras.h */; };
    308306                6563A9A80ADF4094000ED2CD /* LoaderNSURLRequestExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 6563A9A60ADF4094000ED2CD /* LoaderNSURLRequestExtras.m */; };
    … …  
    372370                6582A17809999EA000BEEB6D /* DeprecatedStringMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6582A17709999EA000BEEB6D /* DeprecatedStringMac.mm */; };
    373371                658436860AE01B7400E53753 /* FrameLoadRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 658436850AE01B7400E53753 /* FrameLoadRequest.h */; };
    374                 658821660AF4CDF700F01D1F /* ResourceResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 658821650AF4CDF700F01D1F /* ResourceResponse.h */; settings = {ATTRIBUTES = (Private, ); }; };
     372                658821660AF4CDF700F01D1F /* ResourceResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 658821650AF4CDF700F01D1F /* ResourceResponse.h */; };
    375373                6588216B0AF4CE1200F01D1F /* ResourceResponseMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 658821680AF4CE1200F01D1F /* ResourceResponseMac.h */; };
    376374                6588216C0AF4CE1200F01D1F /* ResourceResponseMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 658821690AF4CE1200F01D1F /* ResourceResponseMac.mm */; };
    … …  
    31933191                55998A5C052B59CC0017A6C1 /* AXObjectCache.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AXObjectCache.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    31943192                55998A5D052B59CC0017A6C1 /* AXObjectCacheMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AXObjectCacheMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    3195                 650E3F670AF6C168001FA3AD /* ResourceRequestMac.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResourceRequestMac.h; sourceTree = "<group>"; };
    3196                 650E3F680AF6C168001FA3AD /* ResourceRequestMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceRequestMac.mm; sourceTree = "<group>"; };
    31973193                650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CSSGrammar.h; sourceTree = "<group>"; };
    31983194                651B4D8309AC83370029F1EF /* DeprecatedStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DeprecatedStringList.cpp; sourceTree = "<group>"; };
    … …  
    63966392                        children = (
    63976393                                656B84EA0AEA1DDA00A095B4 /* ResourceHandleMac.mm */,
    6398                                 650E3F670AF6C168001FA3AD /* ResourceRequestMac.h */,
    6399                                 650E3F680AF6C168001FA3AD /* ResourceRequestMac.mm */,
    64006394                                658821680AF4CE1200F01D1F /* ResourceResponseMac.h */,
    64016395                                658821690AF4CE1200F01D1F /* ResourceResponseMac.mm */,
    … …  
    1052610520                                658821660AF4CDF700F01D1F /* ResourceResponse.h in Headers */,
    1052710521                                6588216B0AF4CE1200F01D1F /* ResourceResponseMac.h in Headers */,
    10528                                 650E3F690AF6C168001FA3AD /* ResourceRequestMac.h in Headers */,
    1052910522                                93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */,
    1053010523                                B2A015A90AF6CD53006BCE0E /* GraphicsContext.h in Headers */,
    … …  
    1177111764                                93E227E40AF589AD00D48324 /* SubresourceLoader.cpp in Sources */,
    1177211765                                93E22A6F0AF5E94100D48324 /* PageState.cpp in Sources */,
    11773                                 650E3F6A0AF6C168001FA3AD /* ResourceRequestMac.mm in Sources */,
    1177411766                                93CCF0580AF6C9FE00018E89 /* NavigationActionMac.mm in Sources */,
    1177511767                                93CCF0600AF6CA7600018E89 /* NavigationAction.cpp in Sources */,

  • trunk/WebCore/bridge/mac/WebCoreFrameBridge.mm

    r17563 r17582  
    17641764
    17651765    *data = resource->allData();
    1766     *response = resource->platformResponse();
     1766    *response = resource->response();
    17671767    return YES;
    17681768}
    … …  
    17861786    for (HashMap<String, CachedResource*>::const_iterator it = allResources.begin(); it != end; ++it) {
    17871787        [d addObject:it->second->allData()];
    1788         [r addObject:it->second->platformResponse()];
     1788        [r addObject:it->second->response()];
    17891789    }
    17901790

  • trunk/WebCore/loader/CachedCSSStyleSheet.cpp

    r17563 r17582  
    8787
    8888    CachedResourceClientWalker w(m_clients);
    89     while (CachedResourceClient *c = w.next())
    90         c->setCSSStyleSheet(m_response.url().url(), m_decoder->encoding().name(), m_sheet);
     89    while (CachedResourceClient *c = w.next()) {
     90        if (m_response && !IsResponseURLEqualToURL(m_response, m_url))
     91            c->setCSSStyleSheet(ResponseURL(m_response), m_decoder->encoding().name(), m_sheet);
     92        else
     93            c->setCSSStyleSheet(m_url, m_decoder->encoding().name(), m_sheet);
     94    }
    9195}
    9296

  • trunk/WebCore/loader/CachedImage.cpp

    r17563 r17582  
    136136    // Create the image if it doesn't yet exist.
    137137    if (!m_image)
    138         m_image = new Image(this, m_response.mimeType() == "application/pdf");
     138        m_image = new Image(this, ResponseMIMEType(m_response) == "application/pdf");
    139139}
    140140

  • trunk/WebCore/loader/CachedResource.cpp

    r17563 r17582  
    4141namespace WebCore {
    4242
    43 CachedResource::CachedResource(const String& URL, Type type, CachePolicy cachePolicy, unsigned size)
     43CachedResource::CachedResource(const String& URL, Type type, CachePolicy cachePolicy, time_t expireDate, unsigned size)
    4444{
    4545    m_url = URL;
    … …  
    5050    m_cachePolicy = cachePolicy;
    5151    m_request = 0;
    52     m_platformResponse = 0;
     52    m_response = 0;
    5353    m_allData = 0;
     54    m_expireDate = expireDate;
    5455    m_expireDateChanged = false;
    5556    m_accessCount = 0;
    … …  
    6970    m_deleted = true;
    7071#endif
    71     setPlatformResponse(0);
     72    setResponse(0);
    7273    setAllData(0);
    7374}
    … …  
    9394}
    9495
     96void CachedResource::setExpireDate(time_t expireDate, bool changeHttpCache)
     97{
     98    if (expireDate == m_expireDate)
     99        return;
     100
     101    if (m_status == Cached)
     102        finish();
     103
     104    m_expireDate = expireDate;
     105    if (changeHttpCache && m_expireDate)
     106       m_expireDateChanged = true;
     107}
     108
    95109bool CachedResource::isExpired() const
    96110{
    97     if (!m_response.expirationDate())
     111    if (!m_expireDate)
    98112        return false;
    99113    time_t now = time(0);
    100     return (difftime(now, m_response.expirationDate()) >= 0);
     114    return (difftime(now, m_expireDate) >= 0);
    101115}
    102116

  • trunk/WebCore/loader/CachedResource.h

    r17563 r17582  
    3232#include "PlatformString.h"
    3333#include "ResourceHandleClient.h" // defines PlatformResponse and PlatformData
    34 #include "ResourceResponse.h"
    3534#include <wtf/HashSet.h>
    3635#include <wtf/Vector.h>
    … …  
    7978    };
    8079
    81     CachedResource(const String& URL, Type type, CachePolicy cachePolicy, unsigned size = 0);
     80    CachedResource(const String& URL, Type type, CachePolicy cachePolicy, time_t expireDate, unsigned size = 0);
    8281    virtual ~CachedResource();
    8382
    … …  
    122121    void setRequest(Request*);
    123122
    124     PlatformResponse platformResponse() const { return m_platformResponse; }
    125     void setPlatformResponse(PlatformResponse);
     123    PlatformResponse response() const { return m_response; }
     124    void setResponse(PlatformResponse);
    126125    PlatformData allData() const { return m_allData; }
    127126    void setAllData(PlatformData);
    128127
    129     void setResponse(const ResourceResponse& response) { m_response = response; }
     128    bool canDelete() const { return !referenced() && !m_request; }
    130129
    131     bool canDelete() const { return !referenced() && !m_request; }
     130    void setExpireDate(time_t expireDate, bool changeHttpCache);
    132131
    133132    bool isExpired() const;
    … …  
    157156#endif
    158157
    159     ResourceResponse m_response;
    160     PlatformResponse m_platformResponse;
     158    PlatformResponse m_response;
    161159    PlatformData m_allData;
    162160
    … …  
    169167
    170168protected:
     169    time_t m_expireDate;
    171170    CachePolicy m_cachePolicy;
    172171    bool m_inCache;

  • trunk/WebCore/loader/LoaderFunctions.h

    r17563 r17582  
    5656void CheckCacheObjectStatus(DocLoader*, CachedResource*);
    5757bool CheckIfReloading(DocLoader*);
     58bool IsResponseURLEqualToURL(PlatformResponse , const String& URL);
     59DeprecatedString ResponseURL(PlatformResponse);
     60DeprecatedString ResponseMIMEType(PlatformResponse);
     61bool ResponseIsMultipart(PlatformResponse);
     62NSString* HeaderStringFromDictionary(NSDictionary* headers, int statusCode);
    5863
    5964}

  • trunk/WebCore/loader/loader.cpp

    r17563 r17582  
    128128    ASSERT(response);
    129129#endif
    130     req->cachedResource()->setPlatformResponse(response);
    131 }
    132 
    133 void Loader::didReceiveResponse(ResourceHandle* handle, const ResourceResponse& response)
     130    req->cachedResource()->setResponse(response);
     131}
     132
     133void Loader::didReceivedResponse(ResourceHandle* handle, const ResourceResponse& response)
    134134{
    135135    Request* req = m_requestsLoading.get(handle);
    136136    ASSERT(req);
    137     req->cachedResource()->setResponse(response);
     137    req->cachedResource()->setExpireDate(response.expirationDate(), false);
    138138   
    139139    String encoding = response.textEncodingName();

  • trunk/WebCore/loader/loader.h

    r17563 r17582  
    6565    private:
    6666        virtual void receivedResponse(ResourceHandle*, PlatformResponse);
    67         virtual void didReceiveResponse(ResourceHandle* handle, const ResourceResponse& response);
     67        virtual void didReceivedResponse(ResourceHandle* handle, const ResourceResponse& response);
    6868        virtual void didReceiveData(ResourceHandle*, const char*, int);
    6969        virtual void receivedAllData(ResourceHandle*, PlatformData);

  • trunk/WebCore/loader/mac/FormDataStream.h

    r17563 r17582  
    3232    class FormData;
    3333    void setHTTPBody(NSMutableURLRequest *, const FormData&);
    34     const FormData* httpBodyFromStream(NSInputStream* stream);
    3534}

  • trunk/WebCore/loader/mac/FormDataStream.m

    r17563 r17582  
    3838#import <sys/types.h>
    3939#import <wtf/Assertions.h>
    40 #import <wtf/HashMap.h>
    4140
    4241namespace WebCore {
    43 
    44 static HashMap<CFReadStreamRef, const FormData*>* streamFormDatas = 0;
    45 
    46 static HashMap<CFReadStreamRef, const FormData*>* getStreamFormDatas()
    47 {
    48     if (!streamFormDatas)
    49         streamFormDatas = new HashMap<CFReadStreamRef, const FormData*>();
    50     return streamFormDatas;
    51 }
    5242
    5343static void formEventCallback(CFReadStreamRef stream, CFStreamEventType type, void* context);
    … …  
    183173        newInfo->remainingElements.append(formData->elements()[size - i - 1]);
    184174
    185     getStreamFormDatas()->set(stream, new FormData(*formData));
    186 
    187175    return newInfo;
    188176}
    … …  
    191179{
    192180    FormStreamFields* form = static_cast<FormStreamFields*>(context);
    193 
    194     delete getStreamFormDatas()->get(stream);
    195     getStreamFormDatas()->remove(stream);
    196181
    197182    closeCurrentStream(form);
    … …  
    346331}
    347332
    348 
    349 const FormData* httpBodyFromStream(NSInputStream* stream)
    350 {
    351     return getStreamFormDatas()->get((CFReadStreamRef)stream);
    352 }
    353 
    354 }
     333}

  • trunk/WebCore/loader/mac/ImageDocumentMac.mm

    r17563 r17582  
    4646    Frame* frame = document->frame();
    4747    NSURLResponse *response = frame->loader()->documentLoader()->response();
    48     image->setPlatformResponse(response);
     48    image->setResponse(response);
    4949
    5050    IntSize size = image->imageSize();

  • trunk/WebCore/loader/mac/LoaderFunctionsMac.mm

    r17563 r17582  
    131131    }
    132132   
    133     ASSERT(cachedResource->platformResponse());
     133    ASSERT(cachedResource->response());
    134134   
    135135    // Notify the caller that we "loaded".
    … …  
    140140       
    141141    NSURLRequest *request = cachedResource->getNSURLRequest();
    142     NSURLResponse *response = cachedResource->platformResponse();
     142    NSURLResponse *response = cachedResource->response();
    143143    NSData *data = cachedResource->allData();
    144144   
    … …  
    197197}
    198198
    199 void CachedResource::setPlatformResponse(PlatformResponse response)
     199void CachedResource::setResponse(PlatformResponse response)
    200200{
    201201    HardRetain(response);
    202202    BEGIN_BLOCK_OBJC_EXCEPTIONS;
    203     HardRelease(m_platformResponse);
    204     END_BLOCK_OBJC_EXCEPTIONS;
    205 
    206     m_platformResponse = response;
     203    HardRelease(m_response);
     204    END_BLOCK_OBJC_EXCEPTIONS;
     205
     206    m_response = response;
    207207}
    208208

  • trunk/WebCore/loader/mac/SubresourceLoaderMac.mm

    r17563 r17582  
    110110    NSURLRequest *clientRequest = ResourceLoader::willSendRequest(newRequest, redirectResponse);
    111111    if (clientRequest && oldURL != [clientRequest URL] && ![oldURL isEqual:[clientRequest URL]])
    112         clientRequest = m_handle->willSendRequest(clientRequest, redirectResponse);
     112        m_handle->redirectedToURL([clientRequest URL]);
    113113    return clientRequest;
    114114}

  • trunk/WebCore/platform/network/ResourceHandle.h

    r17563 r17582  
    4949#ifdef __OBJC__
    5050@class WebCoreResourceLoaderImp;
    51 @class NSURLRequest;
    52 @class NSURLResponse;
    5351#else
    5452class WebCoreResourceLoaderImp;
    55 class NSURLRequest;
    56 class NSURLResponse;
    5753#endif
    5854#endif
    … …  
    8379
    8480#if PLATFORM(MAC)
    85     NSURLRequest *willSendRequest(NSURLRequest *, NSURLResponse *);
     81    void redirectedToURL(NSURL *url);
    8682    void addData(NSData *data);
    8783    void finishJobAndHandle(NSData *data);

  • trunk/WebCore/platform/network/ResourceHandleClient.h

    r17563 r17582  
    7575    class KURL;
    7676    class ResourceHandle;
    77     class ResourceRequest;
    7877    class ResourceResponse;
    7978
    … …  
    8382
    8483        // request may be modified
    85         virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse& redirectResponse) { }
     84        // void willSendRequest(ResourceHandle*, Request&, const ResourceResonse& redirectResponse) { }
    8685   
    8786        // void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) { }
    … …  
    9796
    9897        // old-style methods
     98        virtual void receivedRedirect(ResourceHandle*, const KURL&) { }
    9999        virtual void receivedResponse(ResourceHandle*, PlatformResponse) { }
    100100        virtual void receivedAllData(ResourceHandle*, PlatformData) { }

  • trunk/WebCore/platform/network/ResourceRequest.h

    r17563 r17582  
    118118        void setHTTPBody(const FormData& httpBody) { m_httpBody = httpBody; }
    119119       
    120         bool allowHTTPCookies() const { return m_allowHTTPCookies; }
    121         void setAllowHTTPCookies(bool allowHTTPCookies) { m_allowHTTPCookies = allowHTTPCookies; }
     120        bool allowHTTPCookies() const;
     121        void setAllowHTTPCookies(bool);
    122122
    123123    private:

  • trunk/WebCore/platform/network/ResourceResponse.h

    r17563 r17582  
    3636public:
    3737
    38     ResourceResponse()
    39         : m_expectedContentLength(0)
    40         , m_httpStatusCode(0)
    41         , m_expirationDate(0)
    42     {
    43     }
     38    ResourceResponse() : m_expectedContentLength(0), m_httpStatusCode(0) {}
    4439
    4540    ResourceResponse(const KURL& url, const String& mimeType, long long expectedLength, const String& textEncodingName, const String& filename)
    … …  
    5045        , m_suggestedFilename(filename)
    5146        , m_httpStatusCode(0)
    52         , m_expirationDate(0)
    5347    {
    5448    }
    … …  
    6963    const HTTPHeaderMap& httpHeaderFields() const { return m_httpHeaderFields; }
    7064    HTTPHeaderMap& httpHeaderFields() { return m_httpHeaderFields; }
     65
     66    // possibly add calculated expiration info
     67    // lastModifiedDate (date)
    7168
    7269    bool isMultipart() const { return m_mimeType == "multipart/x-mixed-replace"; }

  • trunk/WebCore/platform/network/mac/ResourceHandleMac.mm

    r17563 r17582  
    11/*
    2  * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
     2 * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3535#import "LoaderFunctions.h"
    3636#import "Logging.h"
    37 #import "ResourceRequestMac.h"
    3837#import "ResourceResponse.h"
    3938#import "ResourceResponseMac.h"
    … …  
    106105}
    107106
    108 NSURLRequest *ResourceHandle::willSendRequest(NSURLRequest *nsRequest, NSURLResponse* nsRedirectResponse)
     107void ResourceHandle::redirectedToURL(NSURL *url)
    109108{
    110     ASSERT(nsRequest);
    111     if (ResourceHandleClient* c = client()) {
    112         ResourceRequest request;
    113         getResourceRequest(request, nsRequest);
    114         ResourceResponse redirectResponse;
    115         getResourceResponse(redirectResponse, nsRedirectResponse);
    116         c->willSendRequest(this, request, redirectResponse);
    117         return nsURLRequest(request);
    118     }
    119 
    120     return nsRequest;
     109    ASSERT(url);
     110    if (ResourceHandleClient* c = client())
     111        c->receivedRedirect(this, KURL(url));
    121112}
    122113

  • trunk/WebCore/xml/xmlhttprequest.cpp

    r17563 r17582  
    508508}
    509509
    510 void XMLHttpRequest::willSendRequest(ResourceHandle*, ResourceRequest& request, const ResourceResponse& redirectResponse)
    511 {
    512     if (!urlMatchesDocumentDomain(request.url()))
     510void XMLHttpRequest::receivedRedirect(ResourceHandle*, const KURL& m_url)
     511{
     512    if (!urlMatchesDocumentDomain(m_url))
    513513        abort();
    514514}

  • trunk/WebCore/xml/xmlhttprequest.h

    r17563 r17582  
    8383    bool urlMatchesDocumentDomain(const KURL&) const;
    8484
    85     virtual void willSendRequest(ResourceHandle*, ResourceRequest& request, const ResourceResponse& redirectResponse);
     85    virtual void receivedRedirect(ResourceHandle*, const KURL&);
    8686    virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&);
    8787    virtual void didReceiveData(ResourceHandle*, const char* data, int size);
Note: See TracChangeset for help on using the changeset viewer.