[Httpunit-commit] CVS: httpunit/src/com/meterware/servletunit ServletUnitHttpRequest.java,1.28,1.29 ServletUnitHttpResponse.java,1.18,1.19

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

Update of /cvsroot/httpunit/httpunit/src/com/meterware/servletunit
In directory sc8-pr-cvs1:/tmp/cvs-serv28617/src/com/meterware/servletunit

Modified Files:
	ServletUnitHttpRequest.java ServletUnitHttpResponse.java 
Log Message:
small fixes

Index: ServletUnitHttpRequest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitHttpRequest.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ServletUnitHttpRequest.java	20 Mar 2003 14:50:53 -0000	1.28
+++ ServletUnitHttpRequest.java	24 Mar 2003 03:22:10 -0000	1.29
@@ -669,7 +669,15 @@
      * @since 1.3
      */
     public StringBuffer getRequestURL() {
-        return null;
+        StringBuffer url = new StringBuffer();
+        try {
+            url.append( _request.getURL().getProtocol() ).append( "://" );
+            url.append( _request.getURL().getHost() );
+            url.append( _request.getURL().getPath() );
+        } catch (MalformedURLException e) {
+            throw new RuntimeException( "unable to read URL from request: " + _request );
+        }
+        return url;
     }
 
 

Index: ServletUnitHttpResponse.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitHttpResponse.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ServletUnitHttpResponse.java	27 Feb 2003 18:40:39 -0000	1.18
+++ ServletUnitHttpResponse.java	24 Mar 2003 03:22:11 -0000	1.19
@@ -1,5 +1,4 @@
 package com.meterware.servletunit;
-
 /********************************************************************************************************************
 * $Id$
 *
@@ -258,7 +257,11 @@
         _contentType = typeAndEncoding[0];
         if (typeAndEncoding[1] != null) _encoding = typeAndEncoding[1];
 
-        setHeader( "Content-type", _contentType + "; charset=" + _encoding );
+        if (_encoding.equalsIgnoreCase( HttpUnitUtils.DEFAULT_CHARACTER_SET  )) {
+            setHeader( "Content-Type", type );
+        } else {
+            setHeader( "Content-Type", _contentType + "; charset=" + _encoding );
+        }
     }
 
 
@@ -533,7 +536,7 @@
 
     private String _contentType = "text/plain";
 
-    private String _encoding    = "us-ascii";
+    private String _encoding    = HttpUnitUtils.DEFAULT_CHARACTER_SET;
 
     private PrintWriter  _writer;