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

Fixes 310467 (Allow SocketConnector to create generic Connection objects). 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1561 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Simone Bordet 2010-04-26 15:09:17 +00:00
parent fd9b4b8ae9
commit 53b2e8d6c1
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VERSION.txt
View File

@ -1,5 +1,4 @@
jetty-7.1.0-SNAPSHOT
jetty-7.1-SNAPSHOT
+ 294563 Websocket client connection + 294563 Websocket client connection
+ 297104 Improve handling of CONNECT method + 297104 Improve handling of CONNECT method
+ 306349 ProxyServlet does not work unless deployed at / + 306349 ProxyServlet does not work unless deployed at /
@ -18,6 +17,7 @@ jetty-7.1-SNAPSHOT
+ JETTY-1202 Use platform default algorithm for SecureRandom + JETTY-1202 Use platform default algorithm for SecureRandom
+ Fix jetty-plus.xml reference to addLifeCycle + Fix jetty-plus.xml reference to addLifeCycle
+ Add AnnotationConfiguration to jetty-plus.xml + Add AnnotationConfiguration to jetty-plus.xml
+ 310467 Allow SocketConnector to create generic Connection objects
jetty-7.0.2.v20100331 31 March 2010 jetty-7.0.2.v20100331 31 March 2010
+ 297552 Don't call Continuation timeouts from acceptor tick + 297552 Don't call Continuation timeouts from acceptor tick

4
jetty-server/src/main/java/org/eclipse/jetty/server/bio/SocketConnector.java
View File

@ -109,7 +109,7 @@ public class SocketConnector extends AbstractConnector
/** /**
* Allows subclass to override Conection if required. * Allows subclass to override Conection if required.
*/ */
protected HttpConnection newHttpConnection(EndPoint endpoint) protected Connection newConnection(EndPoint endpoint)
{ {
return new HttpConnection(this, endpoint, getServer()); return new HttpConnection(this, endpoint, getServer());
} }
@ -179,7 +179,7 @@ public class SocketConnector extends AbstractConnector
public ConnectorEndPoint(Socket socket) throws IOException public ConnectorEndPoint(Socket socket) throws IOException
{ {
super(socket); super(socket);
_connection = newHttpConnection(this); _connection = newConnection(this);
_sotimeout=socket.getSoTimeout(); _sotimeout=socket.getSoTimeout();
_socket=socket; _socket=socket;
} }