[webkit-changes] cvs commit: WebKit/WebView.subproj WebFrame.m

[Tim]

tomernic    06/01/05 21:57:25

  Modified:    .        ChangeLog
               WebView.subproj WebFrame.m
  Log:
          Reviewed by Geoff.
  
  	<rdar://problem/4400804> Client-side redirect to a non-HTTP URL confuses Safari
  
          * WebView.subproj/WebFrame.m:
          (-[WebFrame _continueLoadRequestAfterNavigationPolicy:formState:]):
  	If we were waiting for a quick redirect, but the policy delegate decided to ignore it, then we
  	need to report that the client redirect was cancelled.
  
  Revision  Changes    Path
  1.3446    +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3445
  retrieving revision 1.3446
  diff -u -r1.3445 -r1.3446
  --- ChangeLog	6 Jan 2006 00:11:53 -0000	1.3445
  +++ ChangeLog	6 Jan 2006 05:57:20 -0000	1.3446
  @@ -1,3 +1,14 @@
  +2006-01-05  Tim Omernick  <timo at apple.com>
  +
  +        Reviewed by Geoff.
  +
  +	<rdar://problem/4400804> Client-side redirect to a non-HTTP URL confuses Safari
  +
  +        * WebView.subproj/WebFrame.m:
  +        (-[WebFrame _continueLoadRequestAfterNavigationPolicy:formState:]):
  +	If we were waiting for a quick redirect, but the policy delegate decided to ignore it, then we 
  +	need to report that the client redirect was cancelled.
  +	
   2006-01-05  John Sullivan  <sullivan at apple.com>
   
           * WebView.subproj/WebPDFView.m:
  
  
  
  1.272     +5 -0      WebKit/WebView.subproj/WebFrame.m
  
  Index: WebFrame.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebFrame.m,v
  retrieving revision 1.271
  retrieving revision 1.272
  diff -u -r1.271 -r1.272
  --- WebFrame.m	5 Jan 2006 06:41:35 -0000	1.271
  +++ WebFrame.m	6 Jan 2006 05:57:25 -0000	1.272
  @@ -2264,6 +2264,11 @@
       }
       
       if (!canContinue) {
  +        // If we were waiting for a quick redirect, but the policy delegate decided to ignore it, then we 
  +        // need to report that the client redirect was cancelled.
  +        if (_private->quickRedirectComing)
  +            [self _clientRedirectCancelled:NO];
  +
           [self _setPolicyDataSource:nil];
           // If the navigation request came from the back/forward menu, and we punt on it, we have the 
           // problem that we have optimistically moved the b/f cursor already, so move it back.  For sanity,