costin 02/01/26 09:25:21
Modified: jk/java/org/apache/jk/server JkServlet.java
jk/java/org/apache/jk/server/tomcat33 JkRequest33.java
JkResponse33.java Worker33.java
jk/java/org/apache/jk/server/tomcat40 JkConnector.java
JkRequest40.java JkResponse40.java
Log:
Various fixes.
( I don't know what happened with the commits from yesterday,
I did this commit before going to sleep... )
Revision Changes Path
1.5 +6 -8
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkServlet.java
Index: JkServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JkServlet.java 21 Jan 2002 20:11:52 -0000 1.4
+++ JkServlet.java 26 Jan 2002 17:25:20 -0000 1.5
@@ -91,23 +91,21 @@
{
}
- protected Properties servletConfig2properties(ServletConfig conf ) {
- Properties props=new Properties();
+ protected void servletConfig2properties(JkMain jk, ServletConfig conf )
+ {
if( conf==null ) {
- d("No config ");
- return props;
+ d("No servlet config ");
+ return;
}
Enumeration paramNE=conf.getInitParameterNames();
while( paramNE.hasMoreElements() ){
String s=(String)paramNE.nextElement();
String v=conf.getInitParameter(s);
- props.put( s, v );
+ jk.setProperty( s, v );
}
- return props;
}
-
public void init(ServletConfig conf) throws ServletException {
try {
super.init(conf);
@@ -177,7 +175,7 @@
protected void initJkMain(ServletConfig cfg, Worker defaultWorker) {
jkMain=new JkMain();
- jkMain.setProperties( servletConfig2properties( cfg ));
+ servletConfig2properties( jkMain, cfg );
jkMain.setDefaultWorker( defaultWorker );
String jkHome=cfg.getServletContext().getRealPath("/");
1.2 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/JkRequest33.java
Index: JkRequest33.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/JkRequest33.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JkRequest33.java 6 Jan 2002 08:52:38 -0000 1.1
+++ JkRequest33.java 26 Jan 2002 17:25:20 -0000 1.2
@@ -111,7 +111,7 @@
this.ep=ep;
}
- // -------------------- Wrappers for changed method names, and to use the
buffers
+ // -------------------- Wrappers for changed method names
public int getServerPort() {
return ajpReq.getServerPort();
1.2 +4 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/JkResponse33.java
Index: JkResponse33.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/JkResponse33.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JkResponse33.java 6 Jan 2002 08:52:38 -0000 1.1
+++ JkResponse33.java 26 Jan 2002 17:25:20 -0000 1.2
@@ -66,6 +66,7 @@
import org.apache.jk.*;
import org.apache.jk.core.*;
import org.apache.jk.common.*;
+import org.apache.jk.util.*;
import org.apache.tomcat.modules.server.PoolTcpConnector;
import org.apache.tomcat.core.*;
@@ -145,7 +146,7 @@
c2b.convert( hV );
msg.appendBytes( hV );
}
- msg.send( ch, ep );
+ ch.send( msg, ep );
if( dL > 0 ) d("Sending head");
}
@@ -161,7 +162,7 @@
msg.appendByte( HandlerRequest.JK_AJP13_END_RESPONSE );
msg.appendInt( 1 );
- msg.send(ch, ep );
+ ch.send(msg, ep );
if( dL > 0 ) d( "sending end message " );
}
}
@@ -173,7 +174,7 @@
msg.reset();
msg.appendByte( HandlerRequest.JK_AJP13_SEND_BODY_CHUNK);
msg.appendBytes( b, off, len );
- msg.send( ch, ep );
+ ch.send( msg, ep );
if( dL > 0 ) d( "sending block " + len );
}
1.2 +1 -1
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/Worker33.java
Index: Worker33.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat33/Worker33.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Worker33.java 6 Jan 2002 08:52:38 -0000 1.1
+++ Worker33.java 26 Jan 2002 17:25:20 -0000 1.2
@@ -91,7 +91,7 @@
private int reqNote;
- public void init(WorkerEnv we) throws IOException {
+ public void init() throws IOException {
reqNote=we.getNoteId( WorkerEnv.REQUEST_NOTE, "tomcat33Request" );
}
1.3 +5 -17
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat40/JkConnector.java
Index: JkConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat40/JkConnector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JkConnector.java 16 Jan 2002 15:38:29 -0000 1.2
+++ JkConnector.java 26 Jan 2002 17:25:21 -0000 1.3
@@ -92,6 +92,8 @@
private boolean stopped = false;
private Service service = null;
+ JkMain jkMain=new JkMain();
+
// ------------------------------------------------------------- Properties
@@ -135,12 +137,12 @@
this.service = service;
}
- String channelclassname = "org.apache.jk.common.ChannelSocket";
/**
- * Set the <code>channelClassName</code> that will used to connect to httpd.
+ * Set the <code>channelClassName</code> that will used to connect to
+ * httpd.
*/
public void setChannelClassName(String name) {
- channelclassname = name; // Could have stored it in properties?
+ jkMain.setChannelClassName( name );
}
// --------------------------------------------------------- Public Methods
@@ -184,8 +186,6 @@
lifecycle.removeLifecycleListener(listener);
}
- Properties props=new Properties();
-
/**
* Begin processing requests via this Connector.
*
@@ -204,19 +204,7 @@
((ContainerBase)ct).addLifecycleListener(config);
config.loadExisting( ct );
- JkMain jkMain=new JkMain();
- jkMain.setProperties( props );
jkMain.setDefaultWorker( worker );
-
- // Get the Class that will be used to make the connection.
- try {
- Class channelclass = Class.forName(channelclassname);
- // ct.getParentClassLoader().loadClass(channelclassname);
- jkMain.setChannelClass( channelclass );
- } catch( Exception ex ) {
- ex.printStackTrace();
- throw new LifecycleException("Cannot find " + channelclassname);
- }
String catalinaHome=System.getProperty("catalina.home");
File f=new File( catalinaHome );
1.2 +1 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat40/JkRequest40.java
Index: JkRequest40.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat40/JkRequest40.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JkRequest40.java 12 Jan 2002 04:10:14 -0000 1.1
+++ JkRequest40.java 26 Jan 2002 17:25:21 -0000 1.2
@@ -79,6 +79,7 @@
import org.apache.jk.core.*;
import org.apache.jk.common.*;
+import org.apache.jk.util.*;
public class JkRequest40 extends HttpRequestBase {
1.2 +4 -3
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat40/JkResponse40.java
Index: JkResponse40.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/tomcat40/JkResponse40.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JkResponse40.java 12 Jan 2002 04:10:14 -0000 1.1
+++ JkResponse40.java 26 Jan 2002 17:25:21 -0000 1.2
@@ -72,6 +72,7 @@
import org.apache.jk.core.*;
import org.apache.jk.common.*;
+import org.apache.jk.util.*;
import org.apache.tomcat.util.http.MimeHeaders;
public class JkResponse40 extends HttpResponseBase {
@@ -214,7 +215,7 @@
}
}
- msg.send( ch, ep );
+ ch.send( msg, ep );
// The response is now committed
committed = true;
@@ -245,7 +246,7 @@
msg.appendByte( HandlerRequest.JK_AJP13_END_RESPONSE );
msg.appendInt( 1 );
- msg.send(ch, ep );
+ ch.send(msg, ep );
}
}
@@ -256,7 +257,7 @@
msg.reset();
msg.appendByte( HandlerRequest.JK_AJP13_SEND_BODY_CHUNK);
msg.appendBytes( b, off, len );
- msg.send( ch, ep );
+ ch.send( msg, ep );
}
void setEndpoint(Channel ch, Endpoint ep) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
