Changeset 27865 in webkit


Ignore:
Timestamp:
Nov 16, 2007 5:32:01 PM (16 years ago)
Author:
andersca@apple.com
Message:

WebCore:

Reviewed by Adam.

<rdar://problem/5603832>
XMLHttpRequest readyState 3 & responseText buffer issues.

  • platform/network/cf/ResourceHandleCFNet.cpp: (WebCore::makeFinalRequest): Add new parameter which controls whether content sniffing should be turned off.


(WebCore::ResourceHandle::loadResourceSynchronously):
Always content sniff sync loads.


  • platform/network/cf/ResourceRequestCFNet.cpp: (WebCore::ResourceRequest::doUpdatePlatformRequest): If the ResourceRequest already has a backing CFURLRequest, make a copy of it. This preserves any properties set on the CFURLRequest.

LayoutTests:

Reviewed by Adam.

<rdar://problem/5603832>
XMLHttpRequest readyState 3 & responseText buffer issues.

Remove http/tests/xmlhttprequest/small-chunks-response-text.html from the Skipped list.


  • platform/win/Skipped:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r27863 r27865  
     12007-11-16  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Adam.
     4
     5        <rdar://problem/5603832>
     6        XMLHttpRequest readyState 3 & responseText buffer issues.
     7
     8        Remove http/tests/xmlhttprequest/small-chunks-response-text.html from the Skipped list.
     9       
     10        * platform/win/Skipped:
     11   
    1122007-11-16  Dan Bernstein  <mitz@apple.com>
    213
    … …  
    10531064        * fast/xpath/preceding-axis.xhtml: Added.
    10541065
     1066>>>>>>> .r27862
    105510672007-11-15  Justin Garcia  <justin.garcia@apple.com>
    10561068

  • trunk/LayoutTests/platform/win/Skipped

    r27863 r27865  
    599599http/tests/xmlhttprequest/connection-error-sync.html
    600600http/tests/xmlhttprequest/failed-auth.html
    601 http/tests/xmlhttprequest/small-chunks-response-text.html
    602601plugins/netscape-plugin-setwindow-size.html
    603602svg/custom/gradient-stop-style-change.svg

  • trunk/WebCore/ChangeLog

    r27862 r27865  
     12007-11-16  Anders Carlsson  <andersca@apple.com>
     2
     3        Reviewed by Adam.
     4
     5        <rdar://problem/5603832>
     6        XMLHttpRequest readyState 3 & responseText buffer issues.
     7
     8        * platform/network/cf/ResourceHandleCFNet.cpp:
     9        (WebCore::makeFinalRequest):
     10        Add new parameter which controls whether content sniffing should be turned off.
     11       
     12        (WebCore::ResourceHandle::loadResourceSynchronously):
     13        Always content sniff sync loads.
     14       
     15        * platform/network/cf/ResourceRequestCFNet.cpp:
     16        (WebCore::ResourceRequest::doUpdatePlatformRequest):
     17        If the ResourceRequest already has a backing CFURLRequest, make a copy of it. This preserves
     18        any properties set on the CFURLRequest.
     19
    1202007-11-16  Jon Honeycutt  <jhoneycutt@apple.com>
    221

  • trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

    r27598 r27865  
    222222}
    223223
    224 static CFURLRequestRef makeFinalRequest(const ResourceRequest& request)
     224static CFURLRequestRef makeFinalRequest(const ResourceRequest& request, bool shouldContentSniff)
    225225{
    226226    CFMutableURLRequestRef newRequest = CFURLRequestCreateMutableCopy(kCFAllocatorDefault, request.cfURLRequest());
    227227   
     228    if (!shouldContentSniff)
     229        wkSetCFURLRequestShouldContentSniff(newRequest, false);
     230
    228231    if (allowsAnyHTTPSCertificateHosts().contains(request.url().host().lower())) {
    229232        CFTypeRef keys[] = { kCFStreamSSLAllowsAnyRoot, kCFStreamSSLAllowsExpiredRoots }; 
    … …  
    246249        return false;
    247250
    248     RetainPtr<CFURLRequestRef> request(AdoptCF, makeFinalRequest(d->m_request));
     251    RetainPtr<CFURLRequestRef> request(AdoptCF, makeFinalRequest(d->m_request, d->m_shouldContentSniff));
    249252
    250253    // CFURLConnection Callback API currently at version 1
    … …  
    352355    CFURLResponseRef cfResponse = 0;
    353356    CFErrorRef cfError = 0;
    354     RetainPtr<CFURLRequestRef> cfRequest(AdoptCF, makeFinalRequest(request));
     357    RetainPtr<CFURLRequestRef> cfRequest(AdoptCF, makeFinalRequest(request, true));
    355358
    356359    CFDataRef data = CFURLConnectionSendSynchronousRequest(cfRequest.get(), &cfResponse, &cfError, request.timeoutInterval());

  • trunk/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

    r26361 r27865  
    5858void ResourceRequest::doUpdatePlatformRequest()
    5959{
    60     RetainPtr<CFURLRef> url(AdoptCF, ResourceRequest::url().createCFURL());
    61     RetainPtr<CFURLRef> mainDocumentURL(AdoptCF, ResourceRequest::mainDocumentURL().createCFURL());
     60    CFMutableURLRequestRef cfRequest;
    6261
    63     CFMutableURLRequestRef cfRequest = CFURLRequestCreateMutable(0, url.get(), (CFURLRequestCachePolicy)cachePolicy(), timeoutInterval(), mainDocumentURL.get());
     62    if (m_cfRequest)
     63        cfRequest = CFURLRequestCreateMutableCopy(0, m_cfRequest.get());
     64    else {
     65        RetainPtr<CFURLRef> url(AdoptCF, ResourceRequest::url().createCFURL());
     66        RetainPtr<CFURLRef> mainDocumentURL(AdoptCF, ResourceRequest::mainDocumentURL().createCFURL());
     67
     68        cfRequest = CFURLRequestCreateMutable(0, url.get(), (CFURLRequestCachePolicy)cachePolicy(), timeoutInterval(), mainDocumentURL.get());
     69    }
    6470
    6571    RetainPtr<CFStringRef> requestMethod(AdoptCF, httpMethod().createCFString());
Note: See TracChangeset for help on using the changeset viewer.