Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jetty-9 ResponseTests passing

This commit is contained in:
Greg Wilkins 2012-05-24 15:21:14 +02:00
parent 1e662c6311
commit 4fa4daf369
4 changed files with 216 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
View File

@ -312,6 +312,11 @@ public class MimeTypes
if (state==10)
return StringUtil.normalizeCharset(value,start,i-start);
return null;
}
public static String inferCharsetFromContentType(String value)
{
return __encodings.get(value);
}

2
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
View File

@ -37,7 +37,7 @@ import org.eclipse.jetty.util.log.Logger;
* and {@link #onAllContentConsumed()} that can be implemented so that the
* creator of HttpInput will know when buffers are queued and dequeued.
*/
public abstract class HttpInput extends ServletInputStream
public class HttpInput extends ServletInputStream
{
private static final Logger LOG = Log.getLogger(HttpInput.class);

46
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
View File

@ -15,6 +15,7 @@ package org.eclipse.jetty.server;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.channels.IllegalSelectorException;
import java.util.Collection;
import java.util.Collections;
import java.util.Locale;
@ -94,6 +95,11 @@ public class Response implements HttpServletResponse
_fields=channel.getResponseFields();
}
/* ------------------------------------------------------------ */
public HttpChannel getHttpChannel()
{
return _channel;
}
/* ------------------------------------------------------------ */
/*
@ -138,7 +144,7 @@ public class Response implements HttpServletResponse
if (i>=0)
{
http_only=true;
comment=comment.substring(i,i+HTTP_ONLY_COMMENT.length()).trim();
comment=comment.replace(HTTP_ONLY_COMMENT,"").trim();
if (comment.length()==0)
comment=null;
}
@ -758,6 +764,7 @@ public class Response implements HttpServletResponse
if (encoding==null)
{
encoding=MimeTypes.inferCharsetFromContentType(_contentType);
if (encoding==null)
encoding = StringUtil.__ISO_8859_1;
@ -863,10 +870,10 @@ public class Response implements HttpServletResponse
else
{
// No, so just add this one to the mimetype
_characterEncoding=encoding;
_characterEncoding=StringUtil.normalizeCharset(encoding);
if (_contentType!=null)
{
_contentType=MimeTypes.getContentTypeWithoutCharset(_contentType)+";charset="+encoding;
_contentType=MimeTypes.getContentTypeWithoutCharset(_contentType)+";charset="+_characterEncoding;
_fields.put(HttpHeader.CONTENT_TYPE,_contentType);
}
}
@ -885,6 +892,9 @@ public class Response implements HttpServletResponse
if (contentType==null)
{
if (isWriting() && _characterEncoding!=null)
throw new IllegalSelectorException();
if (_locale==null)
_characterEncoding=null;
_mimeType=null;
@ -895,15 +905,32 @@ public class Response implements HttpServletResponse
{
_contentType=contentType;
_mimeType=MimeTypes.CACHE.get(contentType);
String charset=(_mimeType!=null && _mimeType.getCharset()!=null)?_mimeType.getCharset().toString():null;
String charset;
if (_mimeType!=null && _mimeType.getCharset()!=null)
charset=_mimeType.getCharset().toString();
else
charset=MimeTypes.getCharsetFromContentType(contentType);
if (charset!=null)
_characterEncoding=charset;
else if (_characterEncoding!=null)
if (charset==null)
{
if (_characterEncoding!=null)
{
_contentType=contentType+";charset="+_characterEncoding;
_mimeType=null;
}
}
else if (isWriting() && !charset.equals(_characterEncoding))
{
// too late to change the character encoding;
_mimeType=null;
_contentType=MimeTypes.getContentTypeWithoutCharset(_contentType);
if (_characterEncoding!=null)
_contentType=_contentType+";charset="+_characterEncoding;
}
else
{
_characterEncoding=charset;
}
_fields.put(HttpHeader.CONTENT_TYPE,_contentType);
}
@ -916,7 +943,7 @@ public class Response implements HttpServletResponse
@Override
public void setBufferSize(int size)
{
if (isCommitted())
if (isCommitted() || getContentCount()>0 )
throw new IllegalStateException("Committed or content written");
_channel.increaseContentBufferSize(size);
}
@ -1113,8 +1140,7 @@ public class Response implements HttpServletResponse
/* ------------------------------------------------------------ */
public long getContentCount()
{
// TODO
return -1;
return _channel.getOutputStream().getWritten();
}
/* ------------------------------------------------------------ */

342
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
View File

@ -23,28 +23,35 @@ import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.io.PrintWriter;
import java.net.Socket;
import java.nio.ByteBuffer;
import java.util.Enumeration;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.Timer;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionContext;
import org.eclipse.jetty.http.HttpGenerator.ResponseInfo;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.io.AbstractAsyncConnection;
import org.eclipse.jetty.io.AsyncByteArrayEndPoint;
import org.eclipse.jetty.io.AsyncConnection;
import org.eclipse.jetty.io.ByteArrayEndPoint;
import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.session.AbstractSession;
import org.eclipse.jetty.server.session.AbstractSessionManager;
import org.eclipse.jetty.server.session.HashSessionIdManager;
import org.eclipse.jetty.server.session.HashSessionManager;
import org.eclipse.jetty.server.session.HashedSession;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@ -54,31 +61,121 @@ import org.junit.Test;
*/
public class ResponseTest
{
private Server server;
private LocalHttpConnector connector;
private Server _server;
private LocalHttpConnector _connector;
private HttpChannel _channel;
@Before
public void init() throws Exception
{
server = new Server();
connector = new LocalHttpConnector();
server.addConnector(connector);
server.setHandler(new DumpHandler());
server.start();
_server = new Server();
_connector = new LocalHttpConnector();
_server.addConnector(_connector);
_server.setHandler(new DumpHandler());
_server.start();
AsyncByteArrayEndPoint endp = new AsyncByteArrayEndPoint();
HttpInput input = new HttpInput();
AsyncConnection connection = new AbstractAsyncConnection(endp,null)
{
@Override
public void onReadable()
{
}
};
_channel = new HttpChannel(_server,connection,input)
{
@Override
protected int write(ByteBuffer content) throws IOException
{
int length=content.remaining();
content.clear();
return length;
}
@Override
protected void resetBuffer()
{
// TODO Auto-generated method stub
}
@Override
protected void increaseContentBufferSize(int size)
{
// TODO Auto-generated method stub
}
@Override
public Timer getTimer()
{
// TODO Auto-generated method stub
return null;
}
@Override
public HttpConnector getHttpConnector()
{
// TODO Auto-generated method stub
return null;
}
@Override
protected int getContentBufferSize()
{
// TODO Auto-generated method stub
return 0;
}
@Override
protected void flushResponse() throws IOException
{
// TODO Auto-generated method stub
}
@Override
protected void execute(Runnable task)
{
// TODO Auto-generated method stub
}
@Override
protected void completed()
{
// TODO Auto-generated method stub
}
@Override
protected void completeResponse() throws IOException
{
// TODO Auto-generated method stub
}
@Override
protected void commit(ResponseInfo info, ByteBuffer content) throws IOException
{
// TODO Auto-generated method stub
}
};
}
@After
public void destroy() throws Exception
{
server.stop();
server.join();
_server.stop();
_server.join();
}
@Test
public void testContentType() throws Exception
{
TestHttpChannel connection = new TestHttpChannel(connector,new ByteArrayEndPoint(), connector.getServer());
Response response = connection.getResponse();
Response response = newResponse();
assertEquals(null,response.getContentType());
@ -131,14 +228,12 @@ public class ResponseTest
@Test
public void testLocale() throws Exception
{
Response response = newResponse();
TestHttpChannel connection = new TestHttpChannel(connector,new ByteArrayEndPoint(), connector.getServer());
Request request = connection.getRequest();
Response response = connection.getResponse();
ContextHandler context = new ContextHandler();
context.addLocaleEncoding(Locale.ENGLISH.toString(),"ISO-8859-1");
context.addLocaleEncoding(Locale.ITALIAN.toString(),"ISO-8859-2");
request.setContext(context.getServletContext());
response.getHttpChannel().getRequest().setContext(context.getServletContext());
response.setLocale(java.util.Locale.ITALIAN);
assertEquals(null,response.getContentType());
@ -156,20 +251,17 @@ public class ResponseTest
@Test
public void testContentTypeCharacterEncoding() throws Exception
{
TestHttpChannel connection = new TestHttpChannel(connector,new ByteArrayEndPoint(), connector.getServer());
Response response = connection.getResponse();
Response response = newResponse();
response.setContentType("foo/bar");
response.setCharacterEncoding("utf-8");
assertEquals("foo/bar;charset=utf-8",response.getContentType());
assertEquals("foo/bar;charset=UTF-8",response.getContentType());
response.getWriter();
assertEquals("foo/bar;charset=utf-8",response.getContentType());
assertEquals("foo/bar;charset=UTF-8",response.getContentType());
response.setContentType("foo2/bar2");
assertEquals("foo2/bar2;charset=utf-8",response.getContentType());
assertEquals("foo2/bar2;charset=UTF-8",response.getContentType());
response.setCharacterEncoding("ISO-8859-1");
assertEquals("foo2/bar2;charset=utf-8",response.getContentType());
assertEquals("foo2/bar2;charset=UTF-8",response.getContentType());
response.recycle();
@ -188,17 +280,16 @@ public class ResponseTest
@Test
public void testCharacterEncodingContentType() throws Exception
{
Response response = new Response(new TestHttpChannel(connector,new ByteArrayEndPoint(), connector.getServer()));
Response response = newResponse();
response.setCharacterEncoding("utf-8");
response.setContentType("foo/bar");
assertEquals("foo/bar;charset=utf-8",response.getContentType());
assertEquals("foo/bar;charset=UTF-8",response.getContentType());
response.getWriter();
assertEquals("foo/bar;charset=utf-8",response.getContentType());
assertEquals("foo/bar;charset=UTF-8",response.getContentType());
response.setContentType("foo2/bar2");
assertEquals("foo2/bar2;charset=utf-8",response.getContentType());
assertEquals("foo2/bar2;charset=UTF-8",response.getContentType());
response.setCharacterEncoding("ISO-8859-1");
assertEquals("foo2/bar2;charset=utf-8",response.getContentType());
assertEquals("foo2/bar2;charset=UTF-8",response.getContentType());
response.recycle();
@ -217,7 +308,7 @@ public class ResponseTest
@Test
public void testContentTypeWithCharacterEncoding() throws Exception
{
Response response = new Response(new TestHttpChannel(connector,new ByteArrayEndPoint(), connector.getServer()));
Response response = newResponse();
response.setCharacterEncoding("utf16");
response.setContentType("foo/bar; charset=utf-8");
@ -225,17 +316,17 @@ public class ResponseTest
response.getWriter();
assertEquals("foo/bar; charset=utf-8",response.getContentType());
response.setContentType("foo2/bar2");
assertEquals("foo2/bar2;charset=utf-8",response.getContentType());
assertEquals("foo2/bar2;charset=UTF-8",response.getContentType());
response.setCharacterEncoding("ISO-8859-1");
assertEquals("foo2/bar2;charset=utf-8",response.getContentType());
assertEquals("foo2/bar2;charset=UTF-8",response.getContentType());
response.recycle();
response.setCharacterEncoding("utf16");
response.setContentType("text/html; charset=utf-8");
assertEquals("text/html;charset=UTF-8",response.getContentType());
assertEquals("text/html; charset=utf-8",response.getContentType());
response.getWriter();
assertEquals("text/html;charset=UTF-8",response.getContentType());
assertEquals("text/html; charset=utf-8",response.getContentType());
response.setContentType("text/xml");
assertEquals("text/xml;charset=UTF-8",response.getContentType());
response.setCharacterEncoding("iso-8859-1");
@ -246,7 +337,7 @@ public class ResponseTest
@Test
public void testContentTypeWithOther() throws Exception
{
Response response = new Response(new TestHttpChannel(connector,new ByteArrayEndPoint(), connector.getServer()));
Response response = newResponse();
response.setContentType("foo/bar; other=xyz");
assertEquals("foo/bar; other=xyz",response.getContentType());
@ -259,9 +350,9 @@ public class ResponseTest
response.setCharacterEncoding("utf-8");
response.setContentType("text/html; other=xyz");
assertEquals("text/html; other=xyz;charset=utf-8",response.getContentType());
assertEquals("text/html; other=xyz;charset=UTF-8",response.getContentType());
response.getWriter();
assertEquals("text/html; other=xyz;charset=utf-8",response.getContentType());
assertEquals("text/html; other=xyz;charset=UTF-8",response.getContentType());
response.setContentType("text/xml");
assertEquals("text/xml;charset=UTF-8",response.getContentType());
}
@ -269,7 +360,7 @@ public class ResponseTest
@Test
public void testContentTypeWithCharacterEncodingAndOther() throws Exception
{
Response response = new Response(new TestHttpChannel(connector,new ByteArrayEndPoint(), connector.getServer()));
Response response = newResponse();
response.setCharacterEncoding("utf16");
response.setContentType("foo/bar; charset=utf-8 other=xyz");
@ -281,17 +372,17 @@ public class ResponseTest
response.setCharacterEncoding("utf16");
response.setContentType("text/html; other=xyz charset=utf-8");
assertEquals("text/html; other=xyz charset=utf-8",response.getContentType());
assertEquals("text/html; other=xyz charset=utf-8;charset=UTF-16",response.getContentType());
response.getWriter();
assertEquals("text/html; other=xyz charset=utf-8",response.getContentType());
assertEquals("text/html; other=xyz charset=utf-8;charset=UTF-16",response.getContentType());
response.recycle();
response.setCharacterEncoding("utf16");
response.setContentType("foo/bar; other=pq charset=utf-8 other=xyz");
assertEquals("foo/bar; other=pq charset=utf-8 other=xyz",response.getContentType());
assertEquals("foo/bar; other=pq charset=utf-8 other=xyz;charset=UTF-16",response.getContentType());
response.getWriter();
assertEquals("foo/bar; other=pq charset=utf-8 other=xyz",response.getContentType());
assertEquals("foo/bar; other=pq charset=utf-8 other=xyz;charset=UTF-16",response.getContentType());
}
@ -329,9 +420,8 @@ public class ResponseTest
public void testEncodeRedirect()
throws Exception
{
TestHttpChannel connection=new TestHttpChannel(connector,new ByteArrayEndPoint(), connector.getServer());
Response response = new Response(connection);
Request request = connection.getRequest();
Response response=newResponse();
Request request = response.getHttpChannel().getRequest();
request.setServerName("myhost");
request.setServerPort(8888);
request.setContextPath("/path");
@ -340,7 +430,7 @@ public class ResponseTest
request.setRequestedSessionId("12345");
request.setRequestedSessionIdFromCookie(false);
AbstractSessionManager manager=new HashSessionManager();
HashSessionManager manager=new HashSessionManager();
manager.setSessionIdManager(new HashSessionIdManager());
request.setSessionManager(manager);
request.setSession(new TestSession(manager,"12345"));
@ -393,17 +483,16 @@ public class ResponseTest
for (int i=1;i<tests.length;i++)
{
ByteArrayEndPoint out=new ByteArrayEndPoint(new byte[]{},4096);
TestHttpChannel connection=new TestHttpChannel(connector,out, connector.getServer());
Response response = new Response(connection);
Request request = connection.getRequest();
Response response=newResponse();
Request request = response.getHttpChannel().getRequest();
request.setServerName("myhost");
request.setServerPort(8888);
request.setUri(new HttpURI("/path/info;param;jsessionid=12345?query=0&more=1#target"));
request.setContextPath("/path");
request.setRequestedSessionId("12345");
request.setRequestedSessionIdFromCookie(i>0);
AbstractSessionManager manager=new HashSessionManager();
HashSessionManager manager=new HashSessionManager();
manager.setSessionIdManager(new HashSessionIdManager());
request.setSessionManager(manager);
request.setSession(new TestSession(manager,"12345"));
@ -411,10 +500,7 @@ public class ResponseTest
response.sendRedirect(tests[i][0]);
String location = out.getOutput().toString();
int l=location.indexOf("Location: ");
int e=location.indexOf('\n',l);
location=location.substring(l+10,e).trim();
String location = response.getHeader("Location");
assertEquals(tests[i][0],tests[i][1],location);
}
}
@ -422,7 +508,7 @@ public class ResponseTest
@Test
public void testSetBufferSize () throws Exception
{
Response response = new Response(new TestHttpChannel(connector,new ByteArrayEndPoint(), connector.getServer()));
Response response=newResponse();
response.setBufferSize(20*1024);
response.getWriter().print("hello");
try
@ -439,12 +525,9 @@ public class ResponseTest
@Test
public void testHead() throws Exception
{
Server server = new Server();
Server server = new Server(0);
try
{
SocketConnector socketConnector = new SocketConnector();
socketConnector.setPort(0);
server.addConnector(socketConnector);
server.setHandler(new AbstractHandler()
{
public void handle(String string, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
@ -456,26 +539,36 @@ public class ResponseTest
w.println("Geht");
w.flush();
w.println("Doch");
w.flush();
((Request) request).setHandled(true);
}
});
server.start();
Socket socket = new Socket("localhost",socketConnector.getLocalPort());
Socket socket = new Socket("localhost",((Connector.NetConnector)server.getConnectors()[0]).getLocalPort());
socket.getOutputStream().write("HEAD / HTTP/1.1\r\nHost: localhost\r\n\r\n".getBytes());
socket.getOutputStream().write("GET / HTTP/1.1\r\nHost: localhost\r\nConnection: close\r\n\r\n".getBytes());
socket.getOutputStream().flush();
LineNumberReader reader = new LineNumberReader(new InputStreamReader(socket.getInputStream()));
String line = reader.readLine();
assertTrue(line!=null && line.startsWith("HTTP/1.1 200 OK"));
// look for blank line
while (line!=null && line.length()>0)
line = reader.readLine();
while (line!=null && line.length()==0)
// Read the first line of the GET
line = reader.readLine();
assertTrue(line!=null && line.startsWith("HTTP/1.1 200 OK"));
String last=null;
while (line!=null)
{
last=line;
line = reader.readLine();
}
assertEquals("Doch",last);
}
finally
{
@ -486,7 +579,7 @@ public class ResponseTest
@Test
public void testAddCookie() throws Exception
{
Response response = new Response(new TestHttpChannel(connector,new ByteArrayEndPoint(), connector.getServer()));
Response response = newResponse();
Cookie cookie=new Cookie("name","value");
cookie.setDomain("domain");
@ -498,130 +591,21 @@ public class ResponseTest
String set = response.getHttpFields().getStringField("Set-Cookie");
assertEquals("name=value;Path=/path;Domain=domain;Secure;HttpOnly",set);
assertEquals("name=value;Path=/path;Domain=domain;Secure;HttpOnly;Comment=comment",set);
}
private Response newResponse()
{
ByteArrayEndPoint endPoint = new ByteArrayEndPoint();
endPoint.setOutput(new ByteArrayBuffer(1024));
endPoint.setGrowOutput(true);
TestHttpChannel connection=new TestHttpChannel(connector, endPoint, connector.getServer());
connection.getGenerator().reset();
TestHttpChannel.setCurrentHttpChannel(connection);
Response response = connection.getResponse();
connection.getRequest().setRequestURI("/test");
Response response = new Response(_channel);
return response;
}
private class TestSession extends AbstractSession
private static class TestSession extends HashedSession
{
public TestSession(AbstractSessionManager abstractSessionManager, String id)
protected TestSession(HashSessionManager hashSessionManager, String id)
{
super(abstractSessionManager, System.currentTimeMillis(),System.currentTimeMillis(), id);
}
public Object getAttribute(String name)
{
return null;
}
public Enumeration getAttributeNames()
{
return null;
}
public long getCreationTime()
{
return 0;
}
public String getId()
{
return "12345";
}
public long getLastAccessedTime()
{
return 0;
}
public int getMaxInactiveInterval()
{
return 0;
}
public ServletContext getServletContext()
{
return null;
}
public HttpSessionContext getSessionContext()
{
return null;
}
public Object getValue(String name)
{
return null;
}
public String[] getValueNames()
{
return null;
}
public void invalidate()
{
}
public boolean isNew()
{
return false;
}
public void putValue(String name, Object value)
{
}
public void removeAttribute(String name)
{
}
public void removeValue(String name)
{
}
public void setAttribute(String name, Object value)
{
}
public void setMaxInactiveInterval(int interval)
{
}
protected Map newAttributeMap()
{
return null;
super(hashSessionManager,0L,0L,id);
}
}
static class TestHttpChannel extends HttpChannel
{
public TestHttpChannel(Connector connector, EndPoint endpoint, Server server)
{
super(server,null,null);
super(connector,endpoint,server);
}
public TestHttpChannel(Connector connector, EndPoint endpoint, Server server, Parser parser, Generator generator, Request request)
{
super(connector,endpoint,server,parser,generator,request);
}
}
}