luehe 2003/06/05 12:47:41 Modified: catalina/src/share/org/apache/catalina Request.java catalina/src/share/org/apache/catalina/connector RequestWrapper.java catalina/src/share/org/apache/coyote/tomcat5 CoyoteRequest.java Log: Undid previous changes Revision Changes Path 1.5 +12 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Request.java Index: Request.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Request.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Request.java 5 Jun 2003 16:43:41 -0000 1.4 +++ Request.java 5 Jun 2003 19:47:41 -0000 1.5 @@ -204,6 +204,14 @@ /** + * Set the Socket (if any) through which this Request was received. + * + * @param socket The socket through which this request was received + */ + public void setSocket(Socket socket); + + + /** * Return the input stream associated with this Request. */ public InputStream getStream(); 1.3 +16 -4 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/RequestWrapper.java Index: RequestWrapper.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/RequestWrapper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- RequestWrapper.java 5 Jun 2003 16:43:41 -0000 1.2 +++ RequestWrapper.java 5 Jun 2003 19:47:41 -0000 1.3 @@ -258,6 +258,18 @@ /** + * Set the Socket (if any) through which this Request was received. + * + * @param socket The socket through which this request was received + */ + public void setSocket(Socket socket) { + + request.setSocket(socket); + + } + + + /** * Return the input stream associated with this Request. */ public InputStream getStream() { 1.7 +18 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java Index: CoyoteRequest.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/coyote/tomcat5/CoyoteRequest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- CoyoteRequest.java 5 Jun 2003 16:43:41 -0000 1.6 +++ CoyoteRequest.java 5 Jun 2003 19:47:41 -0000 1.7 @@ -633,7 +633,20 @@ * an SSLSocket. */ public Socket getSocket() { - return coyoteRequest.getSocket(); + return (socket); + } + + /** + * Set the Socket (if any) through which this Request was received. + * + * @param socket The socket through which this request was received + */ + public void setSocket(Socket socket) { + this.socket = socket; + remoteHost = null; + remoteAddr = null; + remotePort = -1; + localAddr = null; }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]