You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2022/02/08 17:51:00 UTC
[mina] branch 2.0.X updated: backported some checks
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 2.0.X
in repository https://gitbox.apache.org/repos/asf/mina.git
The following commit(s) were added to refs/heads/2.0.X by this push:
new 6ef4753 backported some checks
6ef4753 is described below
commit 6ef475362226bfa04228084367b9cd3e93e11e9c
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Tue Feb 8 18:50:44 2022 +0100
backported some checks
---
.../java/org/apache/mina/proxy/handlers/socks/Socks4LogicHandler.java | 4 ++--
mina-http/src/main/java/org/apache/mina/http/HttpServerDecoder.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mina-core/src/main/java/org/apache/mina/proxy/handlers/socks/Socks4LogicHandler.java b/mina-core/src/main/java/org/apache/mina/proxy/handlers/socks/Socks4LogicHandler.java
index d7ca1e2..74d8a5b 100644
--- a/mina-core/src/main/java/org/apache/mina/proxy/handlers/socks/Socks4LogicHandler.java
+++ b/mina-core/src/main/java/org/apache/mina/proxy/handlers/socks/Socks4LogicHandler.java
@@ -71,8 +71,8 @@ public class Socks4LogicHandler extends AbstractSocksLogicHandler {
protected void writeRequest(final NextFilter nextFilter, final SocksProxyRequest request) {
try {
boolean isV4ARequest = Arrays.equals(request.getIpAddress(), SocksProxyConstants.FAKE_IP);
- byte[] userID = request.getUserName().getBytes("ASCII");
- byte[] host = isV4ARequest ? request.getHost().getBytes("ASCII") : null;
+ byte[] userID = request.getUserName() != null ? request.getUserName().getBytes("ASCII") : null;
+ byte[] host = request.getHost() != null ? request.getHost().getBytes("ASCII") : null;
int len = 9 + userID.length;
diff --git a/mina-http/src/main/java/org/apache/mina/http/HttpServerDecoder.java b/mina-http/src/main/java/org/apache/mina/http/HttpServerDecoder.java
index a686d2e..95665a7 100644
--- a/mina-http/src/main/java/org/apache/mina/http/HttpServerDecoder.java
+++ b/mina-http/src/main/java/org/apache/mina/http/HttpServerDecoder.java
@@ -194,7 +194,7 @@ public class HttpServerDecoder implements ProtocolDecoder {
}
private HttpRequestImpl parseHttpRequestHead(ByteBuffer buffer) {
- String raw = new String(buffer.array(), buffer.position(), buffer.remaining());
+ String raw = new String(buffer.array(), buffer.position(), buffer.remaining());
String[] headersAndBody = RAW_VALUE_PATTERN.split(raw, -1);
if (headersAndBody.length <= 1) {