You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2015/11/27 13:38:19 UTC
[38/38] portals-pluto git commit: bug fix to allow any header to be
set during the resource phase
bug fix to allow any header to be set during the resource phase
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/875769b8
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/875769b8
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/875769b8
Branch: refs/heads/V3Prototype
Commit: 875769b8de2b07e8f2cd3f345986cd52f3eef771
Parents: d442480
Author: Scott Nicklous <ms...@apache.org>
Authored: Fri Nov 27 13:19:31 2015 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Fri Nov 27 13:19:31 2015 +0100
----------------------------------------------------------------------
.../services/container/PortletResponseContextImpl.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/875769b8/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletResponseContextImpl.java
----------------------------------------------------------------------
diff --git a/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletResponseContextImpl.java b/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletResponseContextImpl.java
index c59784b..3898fda 100644
--- a/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletResponseContextImpl.java
+++ b/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletResponseContextImpl.java
@@ -175,8 +175,9 @@ public abstract class PortletResponseContextImpl implements PortletResponseConte
txt.append(", value: ").append(value);
LOG.warn(txt.toString());
} else {
- // header names are case insensitive
- if (disallowedHeaders.contains(key.toUpperCase())) {
+ // header names are case insensitive. allow setting all headers
+ // during the resource phase.
+ if (!lifecycle.matches(RESOURCE_PHASE) && disallowedHeaders.contains(key.toUpperCase())) {
StringBuilder txt = new StringBuilder(128);
txt.append("Ignoring disallowed HTTP header: ").append(key);
txt.append(" with value: ").append(value);
@@ -241,8 +242,9 @@ public abstract class PortletResponseContextImpl implements PortletResponseConte
txt.append(", value: ").append(value);
LOG.warn(txt.toString());
} else {
- // header names are case insensitive
- if (disallowedHeaders.contains(key.toUpperCase())) {
+ // header names are case insensitive. allow setting all headers
+ // during the resource phase.
+ if (!lifecycle.matches(RESOURCE_PHASE) && disallowedHeaders.contains(key.toUpperCase())) {
StringBuilder txt = new StringBuilder(128);
txt.append("Ignoring disallowed HTTP header: ").append(key);
txt.append(" with value: ").append(value);