From 189a598eba468eac0ac65af51164a0fbac87fd37 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Fri, 29 Apr 2011 14:36:31 +0000
Subject: [PATCH] Update wrong string for server certificates.

---
 .../service/httputil/HttpUtils.java           | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/net/java/sip/communicator/service/httputil/HttpUtils.java b/src/net/java/sip/communicator/service/httputil/HttpUtils.java
index b15bf01a1..e51c29cee 100644
--- a/src/net/java/sip/communicator/service/httputil/HttpUtils.java
+++ b/src/net/java/sip/communicator/service/httputil/HttpUtils.java
@@ -88,10 +88,12 @@ public static HTTPResponseResult openURLConnection(String address,
     {
         try
         {
+            HttpGet httpGet = new HttpGet(address);
             DefaultHttpClient httpClient = getHttpClient(
-                usernamePropertyName, passwordPropertyName);
+                usernamePropertyName, passwordPropertyName,
+                httpGet.getURI().getHost());
 
-            HttpEntity result = executeMethod(httpClient, new HttpGet(address));
+            HttpEntity result = executeMethod(httpClient, httpGet);
 
             if(result == null)
                 return null;
@@ -244,11 +246,12 @@ public static HTTPResponseResult postFile(String address,
         DefaultHttpClient httpClient = null;
         try
         {
-            httpClient = getHttpClient(
-                usernamePropertyName, passwordPropertyName);
-
             HttpPost postMethod = new HttpPost(address);
 
+            httpClient = getHttpClient(
+                usernamePropertyName, passwordPropertyName,
+                postMethod.getURI().getHost());
+
             String mimeType = URLConnection.guessContentTypeFromName(
                 file.getPath());
             if(mimeType == null)
@@ -311,10 +314,10 @@ public static HTTPResponseResult postForm(String address,
         DefaultHttpClient httpClient = null;
         try
         {
-            httpClient = getHttpClient(
-                usernamePropertyName, passwordPropertyName);
-
             HttpPost postMethod = new HttpPost(address);
+            httpClient = getHttpClient(
+                usernamePropertyName, passwordPropertyName,
+                postMethod.getURI().getHost());
 
             // if we have username and password in the parameters, lets
             // retrieve their values
@@ -398,10 +401,12 @@ else if(i == passwordParamIx && creds != null)
      * @param passwordPropertyName the property to use to retrieve/store
      * password value if protected site is hit, for password
      * CredentialsStorageService service is used.
+     * @param address the address we will be connecting to
      */
     private static DefaultHttpClient getHttpClient(
         String usernamePropertyName,
-        String passwordPropertyName)
+        String passwordPropertyName,
+        String address)
         throws IOException
     {
         HttpParams params = new BasicHttpParams();
@@ -420,12 +425,14 @@ private static DefaultHttpClient getHttpClient(
                 .getCertificateVerificationService().getSSLContext(
                     HttpUtilActivator.getResources().
                         getI18NString(
-                            "service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT",
-                            new String[]
-                            {
-                                HttpUtilActivator.getResources().getSettingsString(
-                                    "service.gui.APPLICATION_NAME")
-                            }));
+                            "service.gui.CERT_DIALOG_DESCRIPTION_TXT",
+                        new String[]{
+                            HttpUtilActivator.getResources().getSettingsString(
+                                "service.gui.APPLICATION_NAME"),
+                            address,
+                            Integer.toString(443)
+                        }
+                    ));
 
         Scheme sch = new Scheme("https", 443,
             new SSLSocketFactory(