pier 00/12/13 19:38:40
Modified: catalina/src/share/org/apache/catalina/connector/warp
WarpConnectionHandler.java
Log:
Construct the host with appropriate host and port information.
Revision Changes Path
1.10 +5 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnectionHandler.java
Index: WarpConnectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnectionHandler.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- WarpConnectionHandler.java 2000/12/14 01:25:57 1.9
+++ WarpConnectionHandler.java 2000/12/14 03:38:40 1.10
@@ -64,7 +64,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Pier Fumagalli</a>
* @author Copyright © 1999, 2000 <a href="http://www.apache.org">The
* Apache Software Foundation.
- * @version CVS $Id: WarpConnectionHandler.java,v 1.9 2000/12/14 01:25:57 pier Exp $
+ * @version CVS $Id: WarpConnectionHandler.java,v 1.10 2000/12/14 03:38:40 pier Exp
$
*/
public class WarpConnectionHandler extends WarpHandler {
/** The WarpReader associated with this WarpConnectionHandler. */
@@ -99,10 +99,11 @@
try {
switch (type) {
case WarpConstants.TYP_CONINIT_HST: {
- String name=reader.readString()+"."+reader.readShort();
+ String name=reader.readString();
+ int port=reader.readShort();
// Retrieve this host id
- WarpHost host=engine.setupChild(name);
+ WarpHost host=engine.setupChild(name,port);
if (host==null) {
this.log("Cannot retrieve host instance");
this.send(WarpConstants.TYP_CONINIT_ERR,this.packet);
@@ -188,6 +189,7 @@
h.request.setRequestedApplicationID(aid);
h.request.setWarpRequestHandler(h);
h.response.setWarpRequestHandler(h);
+ h.request.setScheme("http");
// Start the request handler
try {