You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2008/07/14 20:41:55 UTC

svn commit: r676680 - /ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/Properties.java

Author: midon
Date: Mon Jul 14 11:41:54 2008
New Revision: 676680

URL: http://svn.apache.org/viewvc?rev=676680&view=rev
Log:
set UTF-8 as the default encoding for HttpClient

Modified:
    ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/Properties.java

Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/Properties.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/Properties.java?rev=676680&r1=676679&r2=676680&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/Properties.java (original)
+++ ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/Properties.java Mon Jul 14 11:41:54 2008
@@ -63,12 +63,12 @@
     public static final String PROP_HTTP_PROXY_DOMAIN = PROP_HTTP_PROXY_PREFIX + "domain";
     public static final String PROP_HTTP_PROXY_USER = PROP_HTTP_PROXY_PREFIX + "user";
     public static final String PROP_HTTP_PROXY_PASSWORD = PROP_HTTP_PROXY_PREFIX + "password";
+    public static final String PROP_HTTP_PROTOCOL_ENCODING = "http.protocol.encoding";
 
     // Httpclient specific
     public static final String PROP_HTTP_MAX_REDIRECTS = HttpClientParams.MAX_REDIRECTS;
 
     // Axis2-specific
-    public static final String PROP_HTTP_PROTOCOL_ENCODING = "http.protocol.encoding";
     public static final String PROP_HTTP_REQUEST_CHUNK = "http.request.chunk";
     public static final String PROP_HTTP_REQUEST_GZIP = "http.request.gzip";
     public static final String PROP_HTTP_ACCEPT_GZIP = "http.accept.gzip";
@@ -199,6 +199,9 @@
                         log.warn("Mal-formatted Property: [" + Properties.PROP_HTTP_SOCKET_TIMEOUT + "=" + value + "] Property will be skipped.");
                 }
             }
+
+            // set the default encoding for HttpClient (HttpClient uses ISO-8859-1 by default)
+            p.setParameter(HttpMethodParams.HTTP_CONTENT_CHARSET, "UTF-8");
             if (properties.containsKey(PROP_HTTP_PROTOCOL_ENCODING)) {
                 p.setParameter(HttpMethodParams.HTTP_CONTENT_CHARSET, properties.get(PROP_HTTP_PROTOCOL_ENCODING));
             }