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.4.x' into jetty-10.0.x

This commit is contained in:
Lachlan Roberts 2020-09-10 10:53:36 +10:00
parent 609f0b2159 1256261cda
commit 5d1d7c9c26
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-websocket/websocket-jetty-api/src/main/java/org/eclipse/jetty/websocket/api/RemoteEndpoint.java
View File

@ -164,7 +164,7 @@ public interface RemoteEndpoint
void setBatchMode(BatchMode mode); void setBatchMode(BatchMode mode);
/** /**
* Get the maximum number of frames which allowed to be waiting to be sent at any one time. * Get the maximum number of data frames allowed to be waiting to be sent at any one time.
* The default value is -1, this indicates there is no limit on how many frames can be * The default value is -1, this indicates there is no limit on how many frames can be
* queued to be sent by the implementation. If the limit is exceeded, subsequent frames * queued to be sent by the implementation. If the limit is exceeded, subsequent frames
* sent are failed with a {@link java.nio.channels.WritePendingException} but * sent are failed with a {@link java.nio.channels.WritePendingException} but
@ -175,7 +175,7 @@ public interface RemoteEndpoint
int getMaxOutgoingFrames(); int getMaxOutgoingFrames();
/** /**
* Set the maximum number of frames which allowed to be waiting to be sent at any one time. * Set the maximum number of data frames allowed to be waiting to be sent at any one time.
* The default value is -1, this indicates there is no limit on how many frames can be * The default value is -1, this indicates there is no limit on how many frames can be
* queued to be sent by the implementation. If the limit is exceeded, subsequent frames * queued to be sent by the implementation. If the limit is exceeded, subsequent frames
* sent are failed with a {@link java.nio.channels.WritePendingException} but * sent are failed with a {@link java.nio.channels.WritePendingException} but

18
jetty-websocket/websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/MaxOutgoingFramesTest.java
View File

@ -1,18 +1,18 @@
// //
// ======================================================================== // ========================================================================
// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others. // Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
// //
// The Eclipse Public License is available at // This program and the accompanying materials are made available under
// http://www.eclipse.org/legal/epl-v10.html // the terms of the Eclipse Public License 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0
// //
// The Apache License v2.0 is available at // This Source Code may also be made available under the following
// http://www.opensource.org/licenses/apache2.0.php // Secondary Licenses when the conditions for such availability set
// forth in the Eclipse Public License, v. 2.0 are satisfied:
// the Apache License v2.0 which is available at
// https://www.apache.org/licenses/LICENSE-2.0
// //
// You may elect to redistribute this code under either of these licenses. // SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ======================================================================== // ========================================================================
// //