From 3c4321ce43b4dd7bea3d8d36721d50ae7cf10bd9 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Thu, 31 Jul 2014 17:05:54 -0700 Subject: [PATCH] Use our own URL shortener wherever possible --- .../netty/handler/codec/http/QueryStringDecoder.java | 2 +- .../http/websocketx/WebSocketServerHandshaker13.java | 4 ++-- .../handler/codec/http/websocketx/package-info.java | 10 ++++++---- .../java/io/netty/util/internal/MpscLinkedQueue.java | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java index eabdcfbf8f..3a66633d4e 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java @@ -46,7 +46,7 @@ import java.util.Map; * *

HashDOS vulnerability fix

* - * As a workaround to the HashDOS vulnerability, the decoder + * As a workaround to the HashDOS vulnerability, the decoder * limits the maximum number of decoded key-value parameter pairs, up to {@literal 1024} by * default, and you can configure it when you construct the decoder by passing an additional * integer parameter. diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java index 367c2ff1a6..f1eff741dc 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java @@ -28,8 +28,8 @@ import static io.netty.handler.codec.http.HttpVersion.*; /** *

- * Performs server side opening and closing handshakes for RFC 6455 - * (originally web socket specification draft-ietf-hybi-thewebsocketprotocol-17). + * Performs server side opening and closing handshakes for RFC 6455 + * (originally web socket specification draft-ietf-hybi-thewebsocketprotocol-17). *

*/ public class WebSocketServerHandshaker13 extends WebSocketServerHandshaker { diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java index f913bcf0eb..1425a824d6 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java @@ -21,10 +21,12 @@ * This package supports different web socket specification versions (hence the X suffix). * The specification current supported are: * *

*

diff --git a/common/src/main/java/io/netty/util/internal/MpscLinkedQueue.java b/common/src/main/java/io/netty/util/internal/MpscLinkedQueue.java index 10a7daae90..652bccbcf1 100644 --- a/common/src/main/java/io/netty/util/internal/MpscLinkedQueue.java +++ b/common/src/main/java/io/netty/util/internal/MpscLinkedQueue.java @@ -55,12 +55,12 @@ import java.util.Queue; * * The initial implementation is based on: *

* and adopted padded head node changes from: * * data structure modified to avoid false sharing between head and tail Ref as per implementation of MpscLinkedQueue * on JCTools project.