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 committed to taking the IO out of the generator as well now. This is currently a total work in progress... with a lot of work to do

This commit is contained in:
Greg Wilkins 2012-02-10 17:15:04 +11:00
parent 5c725d4e42
commit 1fa6c998db
4 changed files with 89 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
View File

@ -91,9 +91,9 @@ public class HttpGenerator
protected int _status = 0;
protected HttpVersion _version = HttpVersion.HTTP_1_1;
protected String _reason;
protected String _method;
protected String _uri;
protected byte[] _reason;
protected byte[] _method;
protected byte[] _uri;
protected long _contentWritten = 0;
protected long _contentLength = HttpTokens.UNKNOWN_CONTENT;
@ -159,7 +159,6 @@ public class HttpGenerator
_needCRLF = false;
_needEOC = false;
_bufferChunked=false;
_method=null;
_uri=null;
_noContent=false;
}
@ -297,11 +296,24 @@ public class HttpGenerator
*/
public void setRequest(String method, String uri)
{
_method=method;
_uri=uri;
if (_version==HttpVersion.HTTP_0_9)
_noContent=true;
if (_state != State.HEADER)
throw new IllegalStateException("STATE!=START "+_state);
_method=StringUtil.getBytes(method);
_uri=StringUtil.getUtf8Bytes(uri);
}
/* ------------------------------------------------------------ */
/**
*/
public void setRequest(HttpMethod method, String uri,HttpVersion version)
{
if (_state != State.HEADER)
throw new IllegalStateException("STATE!=START "+_state);
_method=method.toBytes();
_uri=StringUtil.getUtf8Bytes(uri);
setVersion(version);
}
/* ------------------------------------------------------------ */
/**
@ -313,12 +325,16 @@ public class HttpGenerator
if (_state != State.HEADER) throw new IllegalStateException("STATE!=START");
_method=null;
_status = status;
_reason=reason;
if (_reason!=null)
if (reason==null)
_reason=null;
else
{
if (_reason.length()>1024)
_reason=reason.substring(0,1024);
_reason=_reason.replace('\r','?').replace('\n','?');
if (reason.length()>1024)
reason=reason.substring(0,1024);
_reason=StringUtil.getBytes(reason);
for (int i=_reason.length;i-->0;)
if (_reason[i]=='\r' || _reason[i]=='\n')
_reason[i]='?';
}
}
@ -618,6 +634,9 @@ public class HttpGenerator
_last = _last | allContentAdded;
if (isRequest() && _version==HttpVersion.HTTP_0_9)
_noContent=true;
boolean has_server = false;
try
@ -631,7 +650,7 @@ public class HttpGenerator
_contentLength = HttpTokens.NO_CONTENT;
buffer.put(_method);
buffer.put((byte)' ');
buffer.put(_uri.getBytes("UTF-8")); // TODO check
buffer.put(_uri);
buffer.put(HttpTokens.CRLF);
_state = State.FLUSHING;
_noContent=true;
@ -641,7 +660,7 @@ public class HttpGenerator
{
buffer.put(_method);
buffer.put((byte)' ');
buffer.put(_uri.getBytes("UTF-8")); // TODO check
buffer.put(_uri);
buffer.put((byte)' ');
buffer.put((_version==HttpVersion.HTTP_1_0?HttpVersion.HTTP_1_0:HttpVersion.HTTP_1_1).toBytes());
buffer.put(HttpTokens.CRLF);
@ -697,10 +716,6 @@ public class HttpGenerator
if (_status<200 && _status>=100 )
{
_noContent=true;
_content=null;
if (_buffer!=null)
_buffer.clear();
// end the header.
if (_status!=101 )
{
@ -712,9 +727,6 @@ public class HttpGenerator
else if (_status==204 || _status==304)
{
_noContent=true;
_content=null;
if (_buffer!=null)
_buffer.clear();
}
}
}
@ -922,7 +934,7 @@ public class HttpGenerator
else
{
// No idea, so we must assume that a body is coming
_contentLength = (!_persistent || _version < HttpVersion.HTTP_1_1_ORDINAL ) ? HttpTokens.EOF_CONTENT : HttpTokens.CHUNKED_CONTENT;
_contentLength = (!_persistent || _version.ordinal() < HttpVersion.HTTP_1_1.ordinal() ) ? HttpTokens.EOF_CONTENT : HttpTokens.CHUNKED_CONTENT;
if (isRequest() && _contentLength==HttpTokens.EOF_CONTENT)
{
_contentLength=HttpTokens.NO_CONTENT;
@ -952,10 +964,10 @@ public class HttpGenerator
if (_contentLength == HttpTokens.CHUNKED_CONTENT)
{
// try to use user supplied encoding as it may have other values.
if (transfer_encoding != null && HttpHeaderValue.CHUNKED_ORDINAL != transfer_encoding.getValueOrdinal())
if (transfer_encoding != null && !HttpHeaderValue.CHUNKED.toString().equalsIgnoreCase(transfer_encoding.getValue()))
{
String c = transfer_encoding.getValue();
if (c.endsWith(HttpHeaderValue.CHUNKED))
if (c.endsWith(HttpHeaderValue.CHUNKED.toString()))
transfer_encoding.putTo(buffer);
else
throw new IllegalArgumentException("BAD TE");
@ -973,12 +985,13 @@ public class HttpGenerator
if (isResponse())
{
if (!_persistent && (close || _version > HttpVersion.HTTP_1_0_ORDINAL))
if (!_persistent && (close || _version.ordinal() > HttpVersion.HTTP_1_0.ordinal()))
{
buffer.put(CONNECTION_CLOSE);
if (connection!=null)
if (connection==null)
buffer.put(CONNECTION_CLOSE);
else
{
buffer.setPutIndex(buffer.putIndex()-2);
buffer.put(CONNECTION_CLOSE,0,CONNECTION_CLOSE.length-2);
buffer.put((byte)',');
buffer.put(connection.toString().getBytes());
buffer.put(CRLF);
@ -986,10 +999,11 @@ public class HttpGenerator
}
else if (keep_alive)
{
buffer.put(CONNECTION_KEEP_ALIVE);
if (connection!=null)
if (connection==null)
buffer.put(CONNECTION_KEEP_ALIVE);
else
{
buffer.setPutIndex(buffer.putIndex()-2);
buffer.put(CONNECTION_KEEP_ALIVE,0,CONNECTION_CLOSE.length-2);
buffer.put((byte)',');
buffer.put(connection.toString().getBytes());
buffer.put(CRLF);

11
jetty-http/src/main/java/org/eclipse/jetty/http/HttpMethod.java
View File

@ -17,6 +17,7 @@ import java.nio.ByteBuffer;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.StringMap;
import org.eclipse.jetty.util.StringUtil;
/* ------------------------------------------------------------------------------- */
@ -44,13 +45,21 @@ public enum HttpMethod
/* ------------------------------------------------------------ */
private final ByteBuffer _buffer;
private final byte[] _bytes;
/* ------------------------------------------------------------ */
HttpMethod()
{
_buffer=BufferUtil.toBuffer(toString());
_bytes=StringUtil.getBytes(toString());
_buffer=ByteBuffer.wrap(_bytes);
}
/* ------------------------------------------------------------ */
public byte[] toBytes()
{
return _bytes;
}
/* ------------------------------------------------------------ */
public ByteBuffer toBuffer()
{

37
jetty-http/src/test/java/org/eclipse/jetty/http/HttpGeneratorTest.java
View File

@ -24,6 +24,7 @@ import javax.swing.text.View;
import org.eclipse.jetty.io.ByteArrayEndPoint;
import org.eclipse.jetty.io.SimpleBuffers;
import org.eclipse.jetty.util.BufferUtil;
import org.junit.Test;
/**
@ -40,22 +41,40 @@ public class HttpGeneratorTest
@Test
public void testRequest() throws Exception
{
ByteBuffer bb=new ByteArrayBuffer(8096);
ByteBuffer sb=new ByteArrayBuffer(1500);
ByteBuffer header=BufferUtil.allocate(8096);
HttpFields fields = new HttpFields();
ByteArrayEndPoint endp = new ByteArrayEndPoint(new byte[0],4096);
HttpGenerator hg = new HttpGenerator(new SimpleBuffers(sb,bb),endp);
HttpGenerator hg = new HttpGenerator();
fields.add("Host","something");
fields.add("User-Agent","test");
hg.setRequest("GET","/index.html");
hg.setVersion(11);
hg.completeHeader(fields,true);
hg.setRequest(HttpMethod.GET,"/index.html",HttpVersion.HTTP_1_1);
hg.completeHeader(header,fields,true);
hg.complete();
assertTrue(endp.getOut().toString().indexOf("GET /index.html HTTP/1.1")==0);
assertTrue(endp.getOut().toString().indexOf("Content-Length")==-1);
String out = BufferUtil.toString(header);
assertTrue(out.indexOf("GET /index.html HTTP/1.1")==0);
assertTrue(out.indexOf("Content-Length")==-1);
}
@Test
public void testRequestWithContent() throws Exception
{
ByteBuffer header=BufferUtil.allocate(8096);
HttpFields fields = new HttpFields();
HttpGenerator hg = new HttpGenerator();
hg.setRequest("GET","/index.html");
fields.add("Host","something");
fields.add("User-Agent","test");
hg.setVersion(HttpVersion.HTTP_1_1);
hg.completeHeader(header,fields,true);
hg.complete();
String out = BufferUtil.toString(header);
assertTrue(out.indexOf("GET /index.html HTTP/1.1")==0);
assertTrue(out.indexOf("Content-Length")==-1);
}
@Test

5
jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
View File

@ -414,6 +414,11 @@ public class StringUtil
return s.getBytes(__ISO_8859_1_CHARSET);
}
public static byte[] getUtf8Bytes(String s)
{
return s.getBytes(__UTF8_CHARSET);
}
public static byte[] getBytes(String s,String charset)
{
try