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

[Timothy]

thatcher    05/12/05 14:56:52

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               WebView.subproj Tag: Safari-2-0-branch WebDataSource.m
                        WebDataSourcePrivate.h
  Log:
          Merged fix from TOT to Safari-2-0-branch
  
      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:
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3118.4.86 +25 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3118.4.85
  retrieving revision 1.3118.4.86
  diff -u -r1.3118.4.85 -r1.3118.4.86
  --- ChangeLog	3 Dec 2005 01:18:21 -0000	1.3118.4.85
  +++ ChangeLog	5 Dec 2005 22:56:33 -0000	1.3118.4.86
  @@ -1,3 +1,28 @@
  +2005-12-04  Timothy Hatcher  <timothy at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
  +
  +    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:
  +
   === WebKit-417.6 ===
   
   2005-12-01  Timothy Hatcher  <timothy at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.198.8.5 +6 -2      WebKit/WebView.subproj/WebDataSource.m
  
  Index: WebDataSource.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebDataSource.m,v
  retrieving revision 1.198.8.4
  retrieving revision 1.198.8.5
  diff -u -r1.198.8.4 -r1.198.8.5
  --- WebDataSource.m	16 Sep 2005 19:35:40 -0000	1.198.8.4
  +++ WebDataSource.m	5 Dec 2005 22:56:51 -0000	1.198.8.5
  @@ -387,8 +387,8 @@
               
           _private->mainClient = [[WebMainResourceClient alloc] initWithDataSource:self];
           if ([_private->request respondsToSelector:@selector(setHTTPShouldHandleMixedReplace:)]) {
  -            [_private->request setHTTPShouldHandleMixedReplace:YES];
  -            [_private->mainClient setSupportsMultipartContent:YES]; 
  +            [_private->request setHTTPShouldHandleMixedReplace:_private->supportsMultipartContent];
  +            [_private->mainClient setSupportsMultipartContent:_private->supportsMultipartContent]; 
           } else
               [_private->mainClient setSupportsMultipartContent:NO];
               
  @@ -1123,6 +1123,10 @@
       
       LOG(Loading, "creating datasource for %@", [request URL]);
       _private->request = [_private->originalRequest mutableCopy];
  +    if ([_private->request respondsToSelector:@selector(setHTTPShouldHandleMixedReplace:)]) {
  +        [_private->request setHTTPShouldHandleMixedReplace:YES];
  +        _private->supportsMultipartContent = YES;
  +    }
   
       ++WebDataSourceCount;
       
  
  
  
  1.141.8.2 +2 -0      WebKit/WebView.subproj/WebDataSourcePrivate.h
  
  Index: WebDataSourcePrivate.h
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebDataSourcePrivate.h,v
  retrieving revision 1.141.8.1
  retrieving revision 1.141.8.2
  diff -u -r1.141.8.1 -r1.141.8.2
  --- WebDataSourcePrivate.h	9 Sep 2005 17:17:01 -0000	1.141.8.1
  +++ WebDataSourcePrivate.h	5 Dec 2005 22:56:51 -0000	1.141.8.2
  @@ -115,6 +115,8 @@
       
       NSMutableDictionary *subresources;
       NSMutableDictionary *pendingSubframeArchives;
  +
  +    BOOL supportsMultipartContent;
   }
   
   @end