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

409545 Change HttpChannel contract 

Ensure HttpParser always calls sequential callbacks by avoiding |=
This commit is contained in:
Greg Wilkins 2013-05-31 10:03:35 +10:00
parent 8dc84b97e4
commit 8a09c4c787
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
View File

@ -488,7 +488,7 @@ public class HttpParser
} }
else if (ch < HttpTokens.SPACE && ch>=0) else if (ch < HttpTokens.SPACE && ch>=0)
{ {
return_from_parse|=_responseHandler.startResponse(_version, _responseStatus, null); return_from_parse=_responseHandler.startResponse(_version, _responseStatus, null)||return_from_parse;
setState(State.HEADER); setState(State.HEADER);
} }
else else
@ -506,11 +506,11 @@ public class HttpParser
{ {
// HTTP/0.9 // HTTP/0.9
_uri.flip(); _uri.flip();
return_from_parse|=_requestHandler.startRequest(_method,_methodString,_uri,null); return_from_parse=_requestHandler.startRequest(_method,_methodString,_uri,null)||return_from_parse;
setState(State.END); setState(State.END);
BufferUtil.clear(buffer); BufferUtil.clear(buffer);
return_from_parse|=_handler.headerComplete(); return_from_parse=_handler.headerComplete()||return_from_parse;
return_from_parse|=_handler.messageComplete(); return_from_parse=_handler.messageComplete()||return_from_parse;
} }
else else
{ {
@ -571,18 +571,18 @@ public class HttpParser
{ {
if (_responseHandler!=null) if (_responseHandler!=null)
{ {
return_from_parse|=_responseHandler.startResponse(_version, _responseStatus, null); return_from_parse=_responseHandler.startResponse(_version, _responseStatus, null)||return_from_parse;
setState(State.HEADER); setState(State.HEADER);
} }
else else
{ {
// HTTP/0.9 // HTTP/0.9
_uri.flip(); _uri.flip();
return_from_parse|=_requestHandler.startRequest(_method,_methodString,_uri, null); return_from_parse=_requestHandler.startRequest(_method,_methodString,_uri, null)||return_from_parse;
setState(State.END); setState(State.END);
BufferUtil.clear(buffer); BufferUtil.clear(buffer);
return_from_parse|=_handler.headerComplete(); return_from_parse=_handler.headerComplete()||return_from_parse;
return_from_parse|=_handler.messageComplete(); return_from_parse=_handler.messageComplete()||return_from_parse;
} }
} }
break; break;
@ -607,7 +607,7 @@ public class HttpParser
setState(State.HEADER); setState(State.HEADER);
_uri.flip(); _uri.flip();
return_from_parse|=_requestHandler.startRequest(_method,_methodString,_uri, _version); return_from_parse=_requestHandler.startRequest(_method,_methodString,_uri, _version)||return_from_parse;
continue; continue;
} }
else else
@ -621,7 +621,7 @@ public class HttpParser
String reason=takeLengthString(); String reason=takeLengthString();
setState(State.HEADER); setState(State.HEADER);
return_from_parse|=_responseHandler.startResponse(_version, _responseStatus, reason); return_from_parse=_responseHandler.startResponse(_version, _responseStatus, reason)||return_from_parse;
continue; continue;
} }
else else
@ -818,7 +818,7 @@ public class HttpParser
_field=null; _field=null;
return true; return true;
} }
return_from_parse|=_handler.parsedHeader(_field!=null?_field:new HttpField(_header,_headerString,_valueString)); return_from_parse=_handler.parsedHeader(_field!=null?_field:new HttpField(_header,_headerString,_valueString))||return_from_parse;
} }
_headerString=_valueString=null; _headerString=_valueString=null;
_header=null; _header=null;
@ -862,23 +862,23 @@ public class HttpParser
{ {
case EOF_CONTENT: case EOF_CONTENT:
setState(State.EOF_CONTENT); setState(State.EOF_CONTENT);
return_from_parse|=_handler.headerComplete(); return_from_parse=_handler.headerComplete()||return_from_parse;
break; break;
case CHUNKED_CONTENT: case CHUNKED_CONTENT:
setState(State.CHUNKED_CONTENT); setState(State.CHUNKED_CONTENT);
return_from_parse|=_handler.headerComplete(); return_from_parse=_handler.headerComplete()||return_from_parse;
break; break;
case NO_CONTENT: case NO_CONTENT:
return_from_parse|=_handler.headerComplete(); return_from_parse=_handler.headerComplete()||return_from_parse;
setState(State.END); setState(State.END);
return_from_parse|=_handler.messageComplete(); return_from_parse=_handler.messageComplete()||return_from_parse;
break; break;
default: default:
setState(State.CONTENT); setState(State.CONTENT);
return_from_parse|=_handler.headerComplete(); return_from_parse=_handler.headerComplete()||return_from_parse;
break; break;
} }
} }
@ -1467,8 +1467,11 @@ public class HttpParser
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
/* Event Handler interface /* Event Handler interface
* These methods return true if they want parsing to return to * These methods return true if the caller should process the events
* the caller. * so far received (eg return from parseNext and call HttpChannel.handle).
* If multiple callbacks are called in sequence (eg
* headerComplete then messageComplete) from the same point in the parsing
* then it is sufficient for the caller to process the events only once.
*/ */
public interface HttpHandler<T> public interface HttpHandler<T>
{ {