[webkit-changes] cvs commit: WebKit/WebView.subproj WebDataSource.m WebDataSourcePrivate.h

[Justin]

justing     05/12/02 14:53:32

  Modified:    .        ChangeLog
               WebView.subproj WebDataSource.m WebDataSourcePrivate.h
  Log:
          <rdar://problem/4345030>
          Denver REGRESSION (10.4.2-10.4.3): Two identical warnings on "Back" from Amazon's package tracker
  
          Before checking the navigation policy for a request, the request is compared
          against the last checked request.  If the two are the same, no check is done.
          In the bug, the two requests are identical except for the boolean on
          NSURLRequests that tells Foundation to support multipart loads for that request.
          One request was the one that was used to start servicing "Back" operation, and
          the second was being used to start loading the page (it needed to be reloaded
          because it was the result of a form submission). Set the boolean on all
          NSURLRequests, not just one's that are about to be used to start a load.
  
          Reviewed by harrison
  
          * WebView.subproj/WebDataSource.m:
          (-[WebDataSource _startLoading:]):
          (-[WebDataSource initWithRequest:]):
          * WebView.subproj/WebDataSourcePrivate.h:
  
  Revision  Changes    Path
  1.3380    +21 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3379
  retrieving revision 1.3380
  diff -u -r1.3379 -r1.3380
  --- ChangeLog	1 Dec 2005 21:59:16 -0000	1.3379
  +++ ChangeLog	2 Dec 2005 22:53:23 -0000	1.3380
  @@ -1,3 +1,24 @@
  +2005-12-02  Justin Garcia <justin.garcia at apple.com>
  +
  +        <rdar://problem/4345030>
  +        Denver REGRESSION (10.4.2-10.4.3): Two identical warnings on "Back" from Amazon's package tracker
  +        
  +        Before checking the navigation policy for a request, the request is compared
  +        against the last checked request.  If the two are the same, no check is done.
  +        In the bug, the two requests are identical except for the boolean on
  +        NSURLRequests that tells Foundation to support multipart loads for that request.
  +        One request was the one that was used to start servicing "Back" operation, and
  +        the second was being used to start loading the page (it needed to be reloaded 
  +        because it was the result of a form submission). Set the boolean on all 
  +        NSURLRequests, not just one's that are about to be used to start a load.   
  +
  +        Reviewed by harrison
  +
  +        * WebView.subproj/WebDataSource.m:
  +        (-[WebDataSource _startLoading:]):
  +        (-[WebDataSource initWithRequest:]):
  +        * WebView.subproj/WebDataSourcePrivate.h:
  +
   2005-12-01  Darin Adler <darin at apple.com>
   
           Reviewed by Vicki.
  
  
  
  1.216     +3 -1      WebKit/WebView.subproj/WebDataSource.m
  
  Index: WebDataSource.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebDataSource.m,v
  retrieving revision 1.215
  retrieving revision 1.216
  diff -u -r1.215 -r1.216
  --- WebDataSource.m	24 Oct 2005 01:43:03 -0000	1.215
  +++ WebDataSource.m	2 Dec 2005 22:53:31 -0000	1.216
  @@ -397,7 +397,8 @@
               identifier = [[WebDefaultResourceLoadDelegate sharedResourceLoadDelegate] webView:_private->webView identifierForInitialRequest:_private->originalRequest fromDataSource:self];
               
           _private->mainResourceLoader = [[WebMainResourceLoader alloc] initWithDataSource:self];
  -        [_private->mainResourceLoader setSupportsMultipartContent:WKSupportsMultipartXMixedReplace(_private->request)];
  +        [_private->mainResourceLoader setSupportsMultipartContent:_private->supportsMultipartContent];
  +        
           [_private->mainResourceLoader setIdentifier: identifier];
           [[self webFrame] _addExtraFieldsToRequest:_private->request alwaysFromRequest: NO];
           if (![_private->mainResourceLoader loadWithRequest:_private->request]) {
  @@ -1090,6 +1091,7 @@
       
       LOG(Loading, "creating datasource for %@", [request URL]);
       _private->request = [_private->originalRequest mutableCopy];
  +    _private->supportsMultipartContent = WKSupportsMultipartXMixedReplace(_private->request);
   
       ++WebDataSourceCount;
       
  
  
  
  1.147     +2 -0      WebKit/WebView.subproj/WebDataSourcePrivate.h
  
  Index: WebDataSourcePrivate.h
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebDataSourcePrivate.h,v
  retrieving revision 1.146
  retrieving revision 1.147
  diff -u -r1.146 -r1.147
  --- WebDataSourcePrivate.h	8 Sep 2005 21:35:06 -0000	1.146
  +++ WebDataSourcePrivate.h	2 Dec 2005 22:53:31 -0000	1.147
  @@ -130,6 +130,8 @@
       
       NSMutableDictionary *subresources;
       NSMutableDictionary *pendingSubframeArchives;
  +    
  +    BOOL supportsMultipartContent;
   }
   
   @end