--- a/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Sun Oct 16 21:01:26 2016 -0600
+++ b/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Sun Oct 16 21:10:25 2016 -0600
@@ -177,7 +177,7 @@
 		}
 
 		if (_in == null)
-			_in = new HttpInput(AbstractHttpConnection.this);
+			_in = new HttpInput();
 		return _in;
 	}
 
@@ -226,11 +226,6 @@
 		return _printWriter;
 	}
 
-	public final boolean isEarlyEOF()
-	{
-		return _earlyEOF;
-	}
-
 	protected void reset()
 	{
 		_parser.reset();
@@ -772,13 +767,11 @@
 			writer.print(s);
 		}
 
-		/* ------------------------------------------------------------ */
 		public void sendResponse(Buffer response) throws IOException
 		{
 			((HttpGenerator)super._generator).sendResponse(response);
 		}
 
-		/* ------------------------------------------------------------ */
 		public void sendContent(Object content) throws IOException
 		{
 			Resource resource=null;
@@ -835,8 +828,44 @@
 			}
 			else
 				throw new IllegalArgumentException("unknown content type?");
+		}
+	}
 
 
+	private final class HttpInput extends ServletInputStream
+	{
+		/* ------------------------------------------------------------ */
+		/*
+		 * @see java.io.InputStream#read()
+		 */
+		@Override
+		public int read() throws IOException
+		{
+			byte[] bytes = new byte[1];
+			int read = read(bytes, 0, 1);
+			return read < 0 ? -1 : 0xff & bytes[0];
+		}
+		
+		/* ------------------------------------------------------------ */
+		/* 
+		 * @see java.io.InputStream#read(byte[], int, int)
+		 */
+		@Override
+		public int read(byte[] b, int off, int len) throws IOException
+		{
+			int l = -1;
+			Buffer content = _parser.blockForContent(getMaxIdleTime());
+			if (content!=null)
+				l = content.get(b, off, len);
+			else if (_earlyEOF)
+				throw new EofException("early EOF");
+			return l;
+		}
+	
+		@Override
+		public int available() throws IOException
+		{
+			return _parser.available();
 		}
 	}
 

--- a/src/org/eclipse/jetty/server/HttpInput.java	Sun Oct 16 21:01:26 2016 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
-//  ------------------------------------------------------------------------
-//  All rights reserved. This program and the accompanying materials
-//  are made available under the terms of the Eclipse Public License v1.0
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package org.eclipse.jetty.server;
-
-import java.io.IOException;
-
-import javax.servlet.ServletInputStream;
-
-import org.eclipse.jetty.http.HttpParser;
-import org.eclipse.jetty.io.Buffer;
-import org.eclipse.jetty.io.EofException;
-
-public final class HttpInput extends ServletInputStream
-{
-	protected final AbstractHttpConnection _connection;
-	protected final HttpParser _parser;
-
-	public HttpInput(AbstractHttpConnection connection)
-	{
-		_connection = connection;
-		_parser = connection._parser;
-	}
-	
-	/* ------------------------------------------------------------ */
-	/*
-	 * @see java.io.InputStream#read()
-	 */
-	@Override
-	public int read() throws IOException
-	{
-		byte[] bytes = new byte[1];
-		int read = read(bytes, 0, 1);
-		return read < 0 ? -1 : 0xff & bytes[0];
-	}
-	
-	/* ------------------------------------------------------------ */
-	/* 
-	 * @see java.io.InputStream#read(byte[], int, int)
-	 */
-	@Override
-	public int read(byte[] b, int off, int len) throws IOException
-	{
-		int l = -1;
-		Buffer content = _parser.blockForContent(_connection.getMaxIdleTime());
-		if (content!=null)
-			l = content.get(b, off, len);
-		else if (_connection.isEarlyEOF())
-			throw new EofException("early EOF");
-		return l;
-	}
-
-	@Override
-	public int available() throws IOException
-	{
-		return _parser.available();
-	}
-}