diff -r 4afdd0091511 -r 08ac7e9e59e6 src/org/eclipse/jetty/server/handler/DebugHandler.java
--- a/src/org/eclipse/jetty/server/handler/DebugHandler.java	Mon Sep 19 19:39:15 2016 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +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.handler; 
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.util.Locale;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Response;
-import org.eclipse.jetty.util.DateCache;
-import org.eclipse.jetty.util.RolloverFileOutputStream;
-
-
-/** 
- * Debug Handler.
- * A lightweight debug handler that can be used in production code.
- * Details of the request and response are written to an output stream
- * and the current thread name is updated with information that will link
- * to the details in that output.
- */
-public class DebugHandler extends HandlerWrapper
-{
-    private DateCache _date=new DateCache("HH:mm:ss", Locale.US);
-    private OutputStream _out;
-    private PrintStream _print;
-    
-    /* ------------------------------------------------------------ */
-    /* 
-     * @see org.eclipse.jetty.server.Handler#handle(java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, int)
-     */
-    @Override
-    public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
-            throws IOException, ServletException
-    {
-        final Response base_response = baseRequest.getResponse();
-        final Thread thread=Thread.currentThread();
-        final String old_name=thread.getName();
-
-        boolean suspend=false;
-        boolean retry=false;
-        String name=(String)request.getAttribute("org.eclipse.jetty.thread.name");
-        if (name==null)
-            name=old_name+":"+baseRequest.getScheme()+"://"+baseRequest.getLocalAddr()+":"+baseRequest.getLocalPort()+baseRequest.getUri();
-        else
-            retry=true;
-        
-        String ex=null;
-        try
-        {
-            final String d=_date.now();
-            final int ms=_date.lastMs();
-            
-            if (retry)
-                _print.println(d+(ms>99?".":(ms>9?".0":".00"))+ms+":"+name+" RETRY");
-            else
-                _print.println(d+(ms>99?".":(ms>9?".0":".00"))+ms+":"+name+" "+baseRequest.getRemoteAddr()+" "+request.getMethod()+" "+baseRequest.getHeader("Cookie")+"; "+baseRequest.getHeader("User-Agent"));
-            thread.setName(name);
-            
-            getHandler().handle(target,baseRequest,request,response);
-        }
-        catch(IOException ioe)
-        {
-            ex=ioe.toString();
-            throw ioe;
-        }
-        catch(ServletException se)
-        {
-            ex=se.toString()+":"+se.getCause();
-            throw se;
-        }
-        catch(RuntimeException rte)
-        {
-            ex=rte.toString();
-            throw rte;
-        }
-        catch(Error e)
-        {
-            ex=e.toString();
-            throw e;
-        }
-        finally
-        {
-            thread.setName(old_name);
-            final String d=_date.now();
-            final int ms=_date.lastMs();
-            suspend=baseRequest.getAsyncContinuation().isSuspended();
-            if (suspend)
-            {
-                request.setAttribute("org.eclipse.jetty.thread.name",name);
-                _print.println(d+(ms>99?".":(ms>9?".0":".00"))+ms+":"+name+" SUSPEND");
-            }
-            else
-                _print.println(d+(ms>99?".":(ms>9?".0":".00"))+ms+":"+name+" "+base_response.getStatus()+
-		        (ex==null?"":("/"+ex))+
-		        " "+base_response.getContentType()+" "+base_response.getContentCount());
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jetty.server.handler.HandlerWrapper#doStart()
-     */
-    @Override
-    protected void doStart() throws Exception
-    {
-        if (_out==null)
-            _out=new RolloverFileOutputStream("./logs/yyyy_mm_dd.debug.log",true);
-        _print=new PrintStream(_out);
-        super.doStart();
-    }
-
-    /* (non-Javadoc)
-     * @see org.eclipse.jetty.server.handler.HandlerWrapper#doStop()
-     */
-    @Override
-    protected void doStop() throws Exception
-    {
-        super.doStop();
-        _print.close();
-    }
-
-    /**
-     * @return the out
-     */
-    public OutputStream getOutputStream()
-    {
-        return _out;
-    }
-
-    /**
-     * @param out the out to set
-     */
-    public void setOutputStream(OutputStream out)
-    {
-        _out = out;
-    }
-}