Merged branch 'jetty-9.2.x' into 'master'.

jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java

@@ -527,6 +527,15 @@ public abstract class HttpReceiver
         return updated;
     }
 
+    @Override
+    public String toString()
+    {
+        return String.format("%s@%x(rcv=%s)",
+                getClass().getSimpleName(),
+                hashCode(),
+                responseState);
+    }
+
     /**
      * The request states {@link HttpReceiver} goes through when receiving a response.
      */

jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java

@@ -547,6 +547,16 @@ public abstract class HttpSender implements AsyncContentProvider.Listener
         return new IllegalStateException("Expected " + current + " found " + senderState.get() + " instead");
     }
 
+    @Override
+    public String toString()
+    {
+        return String.format("%s@%x(req=%s,snd=%s)",
+                getClass().getSimpleName(),
+                hashCode(),
+                requestState,
+                senderState);
+    }
+
     /**
      * The request states {@link HttpSender} goes through when sending a request.
      */

jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpChannelOverHTTP.java

@@ -105,6 +105,10 @@ public class HttpChannelOverHTTP extends HttpChannel
     @Override
     public String toString()
     {
-        return String.format("%s@%x", getClass().getSimpleName(), hashCode());
+        return String.format("%s@%x(send=%s,recv=%s)",
+                getClass().getSimpleName(),
+                hashCode(),
+                sender,
+                receiver);
     }
 }

jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java

@@ -152,11 +152,12 @@ public class HttpConnectionOverHTTP extends AbstractConnection implements Connec
     @Override
     public String toString()
     {
-        return String.format("%s@%h(l:%s <-> r:%s)",
+        return String.format("%s@%h(l:%s <-> r:%s)[%s]",
                 getClass().getSimpleName(),
                 this,
                 getEndPoint().getLocalAddress(),
-                getEndPoint().getRemoteAddress());
+                getEndPoint().getRemoteAddress(),
+                channel);
     }
 
     private class Delegate extends HttpConnection

jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpReceiverOverHTTP.java

@@ -308,6 +308,6 @@ public class HttpReceiverOverHTTP extends HttpReceiver implements HttpParser.Res
     @Override
     public String toString()
     {
-        return String.format("%s@%x on %s", getClass().getSimpleName(), hashCode(), getHttpConnection());
+        return String.format("%s[%s]", super.toString(), parser);
     }
 }

jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpSenderOverHTTP.java

@@ -210,6 +210,12 @@ public class HttpSenderOverHTTP extends HttpSender
         getHttpChannel().getHttpConnection().getEndPoint().shutdownOutput();
     }
 
+    @Override
+    public String toString()
+    {
+        return String.format("%s[%s]", super.toString(), generator);
+    }
+
     private class ByteBufferRecyclerCallback implements Callback
     {
         private final Callback callback;

tests/test-webapps/test-jetty-webapp/src/main/webapp/index.html

@@ -26,7 +26,7 @@ It is configured as a jetty base directory in $JETTY_HOME/demo_base.
 <table border=0>
 <tr valign=top><td>
 <ul>
-<li>Servet: <a href="hello/">Hello World</a></li>
+<li>Servlet: <a href="hello/">Hello World</a></li>
 <li>Dump Servlets: <ul>
   <li><a href="dump/info">Request</a></li>
   <li><a href="session/">Session</a></li>