From ee7333baf76119f83a3d227283a99a47982fbb21 Mon Sep 17 00:00:00 2001
From: Greg Wilkins
Date: Fri, 13 May 2011 07:28:38 +0000
Subject: strangely after the release?

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3138 7e9141cc-0065-0410-87d8-b60c137991c4
---
 VERSION.txt                                              |  2 +-
 .../eclipse/jetty/io/nio/SslSelectChannelEndPoint.java   |  6 +++---
 .../test/java/org/eclipse/jetty/server/HttpURITest.java  | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index a7648569e6..af069cb655 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,4 +1,4 @@
-jetty-7.4.1.v20110512
+jetty-7.4.1.v20110513
  + 288563 remove unsupported and deprecated --secure option
  + 332907 Add context property to ObjectName of JMX MBeans
  + 336056 Ability to override the computation of the ContextHandler to deploy the DefaultServlet on the HttpService
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
index 5bcf9b5046..a0caa285a2 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslSelectChannelEndPoint.java
@@ -739,7 +739,7 @@ public class SslSelectChannelEndPoint extends SelectChannelEndPoint
         }
         catch(SSLException e)
         {
-            Log.warn(this+" "+e);
+            Log.warn(getRemoteAddr()+":"+getRemotePort()+" "+e);
             super.close();
             throw e;
         }
@@ -832,7 +832,7 @@ public class SslSelectChannelEndPoint extends SelectChannelEndPoint
                     }
                     catch(SSLException e)
                     {
-                        Log.warn(this+" "+e);
+                        Log.warn(getRemoteAddr()+":"+getRemotePort()+" "+e);
                         super.close();
                         throw e;
                     }
@@ -913,7 +913,7 @@ public class SslSelectChannelEndPoint extends SelectChannelEndPoint
                 }
                 catch(SSLException e)
                 {
-                    Log.warn(this+" "+e);
+                    Log.warn(getRemoteAddr()+":"+getRemotePort()+" "+e);
                     super.close();
                     throw e;
                 }
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
index a62fc9c6b6..220261803c 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
@@ -20,13 +20,16 @@ import static org.junit.Assert.fail;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.net.URLEncoder;
 
 import junit.framework.Assert;
 
 import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.io.ByteArrayBuffer;
 import org.eclipse.jetty.util.MultiMap;
+import org.eclipse.jetty.util.URIUtil;
 import org.junit.Test;
+import org.omg.Dynamic.Parameter;
 
 public class HttpURITest
 {
@@ -235,6 +238,19 @@ public class HttpURITest
         }        
         
     }
+
+    @Test
+    public void testExtB() throws Exception
+    {
+        for (String value: new String[]{"a","abcdABCD","\u00C0","\u697C","\uD869\uDED5","\uD840\uDC08"} )
+        {
+            HttpURI uri = new HttpURI("/path?value="+URLEncoder.encode(value,"UTF-8"));
+            
+            MultiMap<String> parameters = new MultiMap<String>();
+            uri.decodeQueryTo(parameters,"UTF-8");
+            assertEquals(value,parameters.get("value"));
+        }
+    }
     
     
     private final String[][] connect_tests=
-- 
cgit v1.2.3