Author: markt
Date: Fri Aug 12 07:46:28 2016
New Revision: 1756092
URL: http://svn.apache.org/viewvc?rev=1756092&view=rev
Log:
First step of aligning request attribute support
Modified:
tomcat/trunk/java/org/apache/coyote/Request.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/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1756092&r1=1756091&r2=1756092&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Fri Aug 12 07:46:28 2016
@@ -575,8 +575,11 @@ public final class Request {
headers.recycle();
serverNameMB.recycle();
serverPort=-1;
+ localAddrMB.recycle();
localNameMB.recycle();
localPort = -1;
+ remoteAddrMB.recycle();
+ remoteHostMB.recycle();
remotePort = -1;
available = 0;
sendfile = true;
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=1756092&r1=1756091&r2=1756092&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:46:28 2016
@@ -716,49 +716,37 @@ public class Http11Processor extends Abs
// Request attribute support
case REQ_HOST_ADDR_ATTRIBUTE: {
- if (socketWrapper == null) {
- request.remoteAddr().recycle();
- } else {
+ if (socketWrapper != null) {
request.remoteAddr().setString(socketWrapper.getRemoteAddr());
}
break;
}
case REQ_HOST_ATTRIBUTE: {
- if (socketWrapper == null) {
- request.remoteHost().recycle();
- } else {
+ if (socketWrapper != null) {
request.remoteHost().setString(socketWrapper.getRemoteHost());
}
break;
}
case REQ_LOCALPORT_ATTRIBUTE: {
- if (socketWrapper == null) {
- request.setLocalPort(0);
- } else {
+ if (socketWrapper != null) {
request.setLocalPort(socketWrapper.getLocalPort());
}
break;
}
case REQ_LOCAL_ADDR_ATTRIBUTE: {
- if (socketWrapper == null) {
- request.localAddr().recycle();
- } else {
+ if (socketWrapper != null) {
request.localAddr().setString(socketWrapper.getLocalAddr());
}
break;
}
case REQ_LOCAL_NAME_ATTRIBUTE: {
- if (socketWrapper == null) {
- request.localName().recycle();
- } else {
+ if (socketWrapper != null) {
request.localName().setString(socketWrapper.getLocalName());
}
break;
}
case REQ_REMOTEPORT_ATTRIBUTE: {
- if (socketWrapper == null) {
- request.setRemotePort(0);
- } else {
+ if (socketWrapper != null) {
request.setRemotePort(socketWrapper.getRemotePort());
}
break;
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=1756092&r1=1756091&r2=1756092&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:46:28 2016
@@ -170,27 +170,39 @@ public class StreamProcessor extends Abs
// Request attribute support
case REQ_HOST_ADDR_ATTRIBUTE: {
- request.remoteAddr().setString(socketWrapper.getRemoteAddr());
+ if (socketWrapper != null) {
+ request.remoteAddr().setString(socketWrapper.getRemoteAddr());
+ }
break;
}
case REQ_HOST_ATTRIBUTE: {
- request.remoteHost().setString(socketWrapper.getRemoteHost());
+ if (socketWrapper != null) {
+ request.remoteHost().setString(socketWrapper.getRemoteHost());
+ }
break;
}
case REQ_LOCALPORT_ATTRIBUTE: {
- request.setLocalPort(socketWrapper.getLocalPort());
+ if (socketWrapper != null) {
+ request.setLocalPort(socketWrapper.getLocalPort());
+ }
break;
}
case REQ_LOCAL_ADDR_ATTRIBUTE: {
- request.localAddr().setString(socketWrapper.getLocalAddr());
+ if (socketWrapper != null) {
+ request.localAddr().setString(socketWrapper.getLocalAddr());
+ }
break;
}
case REQ_LOCAL_NAME_ATTRIBUTE: {
- request.localName().setString(socketWrapper.getLocalName());
+ if (socketWrapper != null) {
+ request.localName().setString(socketWrapper.getLocalName());
+ }
break;
}
case REQ_REMOTEPORT_ATTRIBUTE: {
- request.setRemotePort(socketWrapper.getRemotePort());
+ if (socketWrapper != null) {
+ request.setRemotePort(socketWrapper.getRemotePort());
+ }
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
