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

Fixes #347137 (Allow SSL renegotiations by default in HttpClient). 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3255 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Simone Bordet 2011-05-25 11:47:26 +00:00
parent 1bb56442a7
commit 922fb70344
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -13,6 +13,7 @@ jetty-7.4.2-SNAPSHOT
+ JETTY-1342 Recreate selector if wakeup throws JVM bug + JETTY-1342 Recreate selector if wakeup throws JVM bug
+ 346614 HttpConnection.handle() spins in case of SSL truncation attacks + 346614 HttpConnection.handle() spins in case of SSL truncation attacks
+ 346764 OrderedGroupBinding deployment binding + 346764 OrderedGroupBinding deployment binding
+ 347137 - Allow SSL renegotiations by default in HttpClient
jetty-7.4.1.v20110513 jetty-7.4.1.v20110513
+ 288563 remove unsupported and deprecated --secure option + 288563 remove unsupported and deprecated --secure option

4
jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
View File

@ -192,7 +192,9 @@ class SelectConnector extends AbstractLifeCycle implements HttpClient.Connector,
else else
{ {
SSLEngine engine=newSslEngine(channel); SSLEngine engine=newSslEngine(channel);
ep = new SslSelectChannelEndPoint(_sslBuffers, channel, selectSet, key, engine, (int)_httpClient.getIdleTimeout()); SslSelectChannelEndPoint sslEp = new SslSelectChannelEndPoint(_sslBuffers, channel, selectSet, key, engine, (int)_httpClient.getIdleTimeout());
sslEp.setAllowRenegotiate(_httpClient.getSslContextFactory().isAllowRenegotiate());
ep = sslEp;
} }
} }
else else