You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/08/12 07:47:39 UTC
svn commit: r1756107 - in /tomcat/trunk/java/org/apache/coyote:
AbstractProcessor.java http11/Http11Processor.java http2/StreamProcessor.java
Author: markt
Date: Fri Aug 12 07:47:39 2016
New Revision: 1756107
URL: http://svn.apache.org/viewvc?rev=1756107&view=rev
Log:
Add default implementation to reduce duplication
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1756107&r1=1756106&r2=1756107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Fri Aug 12 07:47:39 2016
@@ -571,7 +571,16 @@ public abstract class AbstractProcessor
protected abstract void disableSwallowRequest();
- protected abstract boolean getPopulateRequestAttributesFromSocket();
+ /**
+ * Processors that populate request attributes directly (e.g. AJP) should
+ * over-ride this method and return {@code false}.
+ *
+ * @return {@code true} if the SocketWrapper should be used to populate the
+ * request attributes, otherwise {@code false}.
+ */
+ protected boolean getPopulateRequestAttributesFromSocket() {
+ return true;
+ }
protected abstract void populateRequestAttributeRemoteHost();
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1756107&r1=1756106&r2=1756107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Fri Aug 12 07:47:39 2016
@@ -1538,12 +1538,6 @@ public class Http11Processor extends Abs
@Override
- protected final boolean getPopulateRequestAttributesFromSocket() {
- return true;
- }
-
-
- @Override
protected final void populateRequestAttributeRemoteHost() {
if (getPopulateRequestAttributesFromSocket() && socketWrapper != null) {
request.remoteHost().setString(socketWrapper.getRemoteHost());
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1756107&r1=1756106&r2=1756107&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Fri Aug 12 07:47:39 2016
@@ -156,12 +156,6 @@ public class StreamProcessor extends Abs
@Override
- protected final boolean getPopulateRequestAttributesFromSocket() {
- return true;
- }
-
-
- @Override
protected final void populateRequestAttributeRemoteHost() {
if (getPopulateRequestAttributesFromSocket() && socketWrapper != null) {
request.remoteHost().setString(socketWrapper.getRemoteHost());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org