[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit WebClient.java,1.3,1.4 WebRequest.java,1.16,1.17

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit
In directory usw-pr-cvs1:/tmp/cvs-serv19605/src/com/meterware/httpunit

Modified Files:
	WebClient.java WebRequest.java 
Log Message:
Handle redirection in subframes

Index: WebClient.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebClient.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebClient.java	2001/01/08 16:40:36	1.3
+++ WebClient.java	2001/04/03 16:49:08	1.4
@@ -2,7 +2,7 @@
 /********************************************************************************************************************
 * $Id$
 *
-* Copyright (c) 2000, Russell Gold
+* Copyright (c) 2000-2001, Russell Gold
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 
 * documentation files (the "Software"), to deal in the Software without restriction, including without limitation 
@@ -68,7 +68,9 @@
         updateCookies( response );
         if (response.getHeaderField( "Location" ) != null) {
             delay( HttpUnitOptions.getRedirectDelay() );
-            return getResponse( new RedirectWebRequest( request, response.getHeaderField( "Location" ) ) );
+            return getResponse( new RedirectWebRequest( request, 
+                                                        response.getHeaderField( "Location" ),
+                                                        request.getTarget() ) );
         } else {
             updateFrames( response );
             return response;
@@ -300,8 +302,8 @@
 class RedirectWebRequest extends WebRequest {
 
 
-    RedirectWebRequest( WebRequest baseRequest, String relativeURL ) throws MalformedURLException {
-        super( baseRequest, relativeURL );
+    RedirectWebRequest( WebRequest baseRequest, String relativeURL, String target ) throws MalformedURLException {
+        super( baseRequest, relativeURL, target );
     }
 
 

Index: WebRequest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebRequest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WebRequest.java	2001/04/02 19:54:29	1.16
+++ WebRequest.java	2001/04/03 16:49:08	1.17
@@ -176,8 +176,8 @@
     /**
      * Constructs a web request using a base request and a relative URL string.
      **/
-    protected WebRequest( WebRequest baseRequest, String urlString ) throws MalformedURLException {
-        this( baseRequest.getURL(), urlString );
+    protected WebRequest( WebRequest baseRequest, String urlString, String target ) throws MalformedURLException {
+        this( baseRequest.getURL(), urlString, target );
     }