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

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2017-04-12 16:55:50 +10:00
parent b6b451a988 6a10b4272b
commit 3359db09bb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
View File

@ -214,7 +214,7 @@ public class SslConnection extends AbstractConnection
/** /**
* @return The number of renegotions allowed for this connection. When the limit * @return The number of renegotions allowed for this connection. When the limit
* is 0 renegotiation will be denied. If the limit is <0 then no limit is applied. * is 0 renegotiation will be denied. If the limit is less than 0 then no limit is applied.
*/ */
public int getRenegotiationLimit() public int getRenegotiationLimit()
{ {
@ -223,7 +223,7 @@ public class SslConnection extends AbstractConnection
/** /**
* @param renegotiationLimit The number of renegotions allowed for this connection. * @param renegotiationLimit The number of renegotions allowed for this connection.
* When the limit is 0 renegotiation will be denied. If the limit is <0 then no limit is applied. * When the limit is 0 renegotiation will be denied. If the limit is less than 0 then no limit is applied.
* Default -1. * Default -1.
*/ */
public void setRenegotiationLimit(int renegotiationLimit) public void setRenegotiationLimit(int renegotiationLimit)

4
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
View File

@ -914,7 +914,7 @@ public class SslContextFactory extends AbstractLifeCycle implements Dumpable
/** /**
* @return The number of renegotions allowed for this connection. When the limit * @return The number of renegotions allowed for this connection. When the limit
* is 0 renegotiation will be denied. If the limit is <0 then no limit is applied. * is 0 renegotiation will be denied. If the limit is less than 0 then no limit is applied.
*/ */
public int getRenegotiationLimit() public int getRenegotiationLimit()
{ {
@ -923,7 +923,7 @@ public class SslContextFactory extends AbstractLifeCycle implements Dumpable
/** /**
* @param renegotiationLimit The number of renegotions allowed for this connection. * @param renegotiationLimit The number of renegotions allowed for this connection.
* When the limit is 0 renegotiation will be denied. If the limit is <0 then no limit is applied. * When the limit is 0 renegotiation will be denied. If the limit is less than 0 then no limit is applied.
* Default 5. * Default 5.
*/ */
public void setRenegotiationLimit(int renegotiationLimit) public void setRenegotiationLimit(int renegotiationLimit)