- * If {@link #isIssueHandshake()} is {@code false} - * (default) you will need to take care of calling {@link #handshake()} by your own. In most - * situations were {@link SslHandler} is used in 'client mode' you want to issue a handshake once - * the connection was established. if {@link #setIssueHandshake(boolean)} is set to {@code true} - * you don't need to worry about this as the {@link SslHandler} will take care of it. - *
- * - *
- * If {@link #isEnableRenegotiation() enableRenegotiation} is {@code true} - * (default) and the initial handshake has been done successfully, you can call - * {@link #handshake()} to trigger the renegotiation. - *
- * If {@link #isEnableRenegotiation() enableRenegotiation} is {@code false}, - * an attempt to trigger renegotiation will result in the connection closure. - *
- * Please note that TLS renegotiation had a security issue before. If your - * runtime environment did not fix it, please make sure to disable TLS - * renegotiation by calling {@link #setEnableRenegotiation(boolean)} with - * {@code false}. For more information, please refer to the following documents: - *
+ * The handshake will be automaticly issued for you once the {@link Channel} is active and + * {@link SSLEngine#getUseClientMode()} returns {@code true}. + * So no need to bother with it by your self. * *diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedFile.java b/handler/src/main/java/io/netty/handler/stream/ChunkedFile.java index 7b637a9321..334c6550a9 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedFile.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedFile.java @@ -16,6 +16,7 @@ package io.netty.handler.stream; import io.netty.buffer.ByteBuf; +import io.netty.channel.FileRegion; import java.io.File; import java.io.IOException; @@ -47,7 +48,7 @@ public class ChunkedFile implements ChunkedByteInput { * Creates a new instance that fetches data from the specified file. * * @param chunkSize the number of bytes to fetch on each - * {@link #nextChunk()} call + * {@link #readChunk(ByteBuf)} call */ public ChunkedFile(File file, int chunkSize) throws IOException { this(new RandomAccessFile(file, "r"), chunkSize); @@ -64,7 +65,7 @@ public class ChunkedFile implements ChunkedByteInput { * Creates a new instance that fetches data from the specified file. * * @param chunkSize the number of bytes to fetch on each - * {@link #nextChunk()} call + * {@link #readChunk(ByteBuf)} call */ public ChunkedFile(RandomAccessFile file, int chunkSize) throws IOException { this(file, 0, file.length(), chunkSize); @@ -76,7 +77,7 @@ public class ChunkedFile implements ChunkedByteInput { * @param offset the offset of the file where the transfer begins * @param length the number of bytes to transfer * @param chunkSize the number of bytes to fetch on each - * {@link #nextChunk()} call + * {@link #readChunk(ByteBuf)} call */ public ChunkedFile(RandomAccessFile file, long offset, long length, int chunkSize) throws IOException { if (file == null) { diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java b/handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java index aeb2500cc4..d6b177ebd9 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java @@ -16,6 +16,7 @@ package io.netty.handler.stream; import io.netty.buffer.ByteBuf; +import io.netty.channel.FileRegion; import java.io.File; import java.io.FileInputStream; @@ -49,7 +50,7 @@ public class ChunkedNioFile implements ChunkedByteInput { * Creates a new instance that fetches data from the specified file. * * @param chunkSize the number of bytes to fetch on each - * {@link #nextChunk()} call + * {@link #readChunk(ByteBuf)} call */ public ChunkedNioFile(File in, int chunkSize) throws IOException { this(new FileInputStream(in).getChannel(), chunkSize); @@ -66,7 +67,7 @@ public class ChunkedNioFile implements ChunkedByteInput { * Creates a new instance that fetches data from the specified file. * * @param chunkSize the number of bytes to fetch on each - * {@link #nextChunk()} call + * {@link #readChunk(ByteBuf)} call */ public ChunkedNioFile(FileChannel in, int chunkSize) throws IOException { this(in, 0, in.size(), chunkSize); @@ -78,7 +79,7 @@ public class ChunkedNioFile implements ChunkedByteInput { * @param offset the offset of the file where the transfer begins * @param length the number of bytes to transfer * @param chunkSize the number of bytes to fetch on each - * {@link #nextChunk()} call + * {@link #readChunk(ByteBuf)} call */ public ChunkedNioFile(FileChannel in, long offset, long length, int chunkSize) throws IOException { diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java b/handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java index 4a70a0f49d..7b75023a9e 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java @@ -48,7 +48,7 @@ public class ChunkedNioStream implements ChunkedByteInput { * Creates a new instance that fetches data from the specified channel. * * @param chunkSize the number of bytes to fetch on each - * {@link #nextChunk()} call + * {@link #readChunk(ByteBuf)} call */ public ChunkedNioStream(ReadableByteChannel in, int chunkSize) { if (in == null) { diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedStream.java b/handler/src/main/java/io/netty/handler/stream/ChunkedStream.java index d8f36e4b95..3da189711a 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedStream.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedStream.java @@ -49,7 +49,7 @@ public class ChunkedStream implements ChunkedByteInput { * Creates a new instance that fetches data from the specified stream. * * @param chunkSize the number of bytes to fetch on each - * {@link #nextChunk()} call + * {@link #readChunk(ByteBuf)} call */ public ChunkedStream(InputStream in, int chunkSize) { if (in == null) { diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java index fd3fa3f24f..50a4a43662 100644 --- a/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java +++ b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java @@ -60,7 +60,7 @@ import java.util.concurrent.atomic.AtomicInteger; * * Some {@link ChunkedInput} generates a chunk on a certain event or timing. * Such {@link ChunkedInput} implementation often returns {@code null} on - * {@link ChunkedInput#nextChunk()}, resulting in the indefinitely suspended + * {@link ChunkedInput#readChunk(Object)}, resulting in the indefinitely suspended * transfer. To resume the transfer when a new chunk is available, you have to * call {@link #resumeTransfer()}. * @apiviz.landmark