You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2018/11/11 11:57:54 UTC
[cxf] branch 3.2.x-fixes updated (449e695 -> 11b653b)
This is an automated email from the ASF dual-hosted git repository.
deki pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 449e695 CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Fixing jax_rs/sse_tomcat
new 26c07f8 Fix newRemoteAddr is never assigned
new 11b653b Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 2 ++
.../main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
[cxf] 01/02: Fix newRemoteAddr is never assigned
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 26c07f8e5212bff59f1dd21e5548f9003b248d23
Author: mo7ty <mo...@users.noreply.github.com>
AuthorDate: Sat Nov 10 01:12:32 2018 +0000
Fix newRemoteAddr is never assigned
* Using the wrong variable for not null validation before HttpServletRequestXForwardedFilter.newRemoteAddr assignment.
(cherry picked from commit 82b24f6db4537623370ebfc7a229562253a16197)
---
.../main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
index 3a3ea9d..0363876 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/AbstractHTTPServlet.java
@@ -480,7 +480,7 @@ public abstract class AbstractHTTPServlet extends HttpServlet implements Filter
String originalPort) {
super(request);
this.newProtocol = originalProto;
- if (newRemoteAddr != null) {
+ if (originalRemoteAddr != null) {
newRemoteAddr = (originalRemoteAddr.split(",")[0]).trim();
}
newRequestUri = calculateNewRequestUri(request, originalPrefix);
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 11b653b78c3f06f09c366828d0a8b1e848613677
Author: Dennis Kieselhorst <ma...@dekies.de>
AuthorDate: Sun Nov 11 12:57:17 2018 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c672ab3..09fb505 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -6,6 +6,7 @@ B 057f4dc521f02227d7b36bbb508835a9edb69e15
B 07251d65ed30455dd982fdbe694aab419d2fbfcb
B 0ce4b232981790ca52bd7b636b4d1ceb5fc31d8a
B 0e616a5ecc32c8a4edb3272e8c6b18b527131133
+B 0eae855da254e9571de7187e016d408aca8f5c81
B 143145643b3bb2f0a7ba97ec216bc59de754fd94
B 16077ac65e46710865a883d1c60d87bcd422bb33
B 19f212a3f770250bcaae87bb52c19e6f5d02fa7a
@@ -33,6 +34,7 @@ B 4da42032f95e667a402b113d6daf4bd0514c6d60
B 525adf09d4f2813822b0171bb7652003e4a16c61
B 55afdc9373257d8c111468926c7278b4e9b28a61
B 58e72337226f4e963abfc6f1a65625d86b7003b5
+B 58e9812a84a1a98d1f0699b59a86a147c847cb2f
B 64dd999db1c712cd54f003a76abe1d221a1e3295
B 68af13530379662fc99a716d635d4aab7c5fb027
B 74ab648ebd678e5d23365507a78f1429540f63fd