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

This reverts commit db61fc2a473c98d75a30aac7fba306c62677d960.

jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java

@@ -87,7 +87,10 @@ public abstract class AbstractConnection implements Connection
         // TODO always dispatch failure ?
         try
         {
-            getExecutor().execute(() ->
+            getExecutor().execute(new Runnable()
+            {
+                @Override
+                public void run()
                 {
                     try
                     {
@@ -97,6 +100,7 @@ public abstract class AbstractConnection implements Connection
                     {
                         LOG.warn(e);
                     }
+                }
             });
         }
         catch(RejectedExecutionException e)
@@ -230,9 +234,10 @@ public abstract class AbstractConnection implements Connection
     @Override
     public String toString()
     {
-        return String.format("%s@%x[%s]",
+        return String.format("%s@%x[%s,%s]",
                 getClass().getSimpleName(),
                 hashCode(),
+                _state.get(),
                 _endPoint);
     }
 
@@ -255,5 +260,5 @@ public abstract class AbstractConnection implements Connection
         {
             return String.format("AC.ReadCB@%x{%s}", AbstractConnection.this.hashCode(),AbstractConnection.this);
         }
-    }
+    };
 }

jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java

@@ -554,7 +554,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
                 _requests,
                 _committed.get(),
                 _state.getState(),
-                _request.getHttpURI());
+                _uri);
     }
 
     public void onRequest(MetaData.Request request)

jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java

@@ -558,12 +558,12 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
     @Override
     public String toString()
     {
-        return String.format("%s[p=%s,g=%s,c=%s][b=%s]",
+        return String.format("%s[p=%s,g=%s,c=%s]",
                 super.toString(),
                 _parser,
                 _generator,
-                _channel,
+                _channel);
-                BufferUtil.toDetailString(_requestBuffer));
+        return super.toString()+"<--"+BufferUtil.toDetailString(_requestBuffer);
     }
 
     private class Content extends HttpInput.Content

jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java

@@ -637,11 +637,13 @@ public class HttpInput extends ServletInputStream implements Runnable
     @Override
     public String toString()
     {
-        return String.format("%s@%x[c=%d,s=%s]",
+        return String.format("%s@%x[r=%d,s=%s,e=%s,f=%s]",
                 getClass().getSimpleName(),
                 hashCode(),
-                _contentConsumed,
+                _contentRead,
-                _state);
+                _contentState,
+                _eofState,
+                _onError);
     }
 
     public static class PoisonPillContent extends Content

jetty-server/src/main/java/org/eclipse/jetty/server/Request.java

@@ -2171,7 +2171,7 @@ public class Request implements HttpServletRequest
      */
     public void setAuthority(String host,int port)
     {
-        _metadata.getURI().setAuthority(host,port);
+        _metadata.getURI().setAuthority(host,port);;
     }
 
     /* ------------------------------------------------------------ */
@@ -2254,7 +2254,7 @@ public class Request implements HttpServletRequest
                 getClass().getSimpleName(),
                 _handled ? "[" : "(",
                 getMethod(),
-                getHttpURI(),
+                _uri,
                 _handled ? "]" : ")",
                 hashCode());
     }
@@ -2327,7 +2327,7 @@ public class Request implements HttpServletRequest
                         IO.copy(is, os);
                         String content=new String(os.toByteArray(),charset==null?StandardCharsets.UTF_8:Charset.forName(charset));
                         if (_contentParameters == null)
-                            _contentParameters = params == null ? new MultiMap<>() : params;
+                            _contentParameters = params == null ? new MultiMap<String>() : params;
                         _contentParameters.add(mp.getName(), content);
                     }
                     os.reset();