[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit WebRequest.java,1.42,1.43

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

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

Modified Files:
	WebRequest.java 
Log Message:
Handle embedded spaces in URL

Index: WebRequest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebRequest.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- WebRequest.java	25 Jul 2002 11:19:18 -0000	1.42
+++ WebRequest.java	15 Aug 2002 00:06:31 -0000	1.43
@@ -298,9 +298,28 @@
      **/
     private WebRequest( URL urlBase, String urlString, String target, ParameterHolder parameterHolder ) {
         _urlBase   = urlBase;
-        _urlString = urlString;
+        _urlString = escape( urlString );
         _target    = target;
         _parameterHolder = parameterHolder;
+    }
+
+
+    private static String escape( String urlString ) {
+        if (urlString.indexOf( ' ' ) < 0) return urlString;
+        StringBuffer sb = new StringBuffer();
+
+        int start = 0;
+        do {
+            int index = urlString.indexOf( ' ', start );
+            if (index < 0) {
+                sb.append( urlString.substring( start ) );
+                break;
+            } else {
+                sb.append( urlString.substring( start, index ) ).append( "%20" );
+                start = index+1;
+            }
+        } while (true);
+        return sb.toString();
     }