cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp12Interceptor.java

2002-03-08 Thread larryi 

larryi  02/03/08 03:37:21

  Modified:src/share/org/apache/tomcat/modules/server
Ajp12Interceptor.java
  Log:
  Add a check for ajpid12 ContextManager property and if found, use it to
  override the ajpidFile.  This allows the ajpid file to be set with command
  line arguments.
  
  Revision  ChangesPath
  1.19  +13 -0 
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java
  
  Index: Ajp12Interceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Ajp12Interceptor.java 27 Feb 2002 03:36:27 -  1.18
  +++ Ajp12Interceptor.java 8 Mar 2002 11:37:21 -   1.19
  @@ -109,6 +109,19 @@
   ajpidFile=( path==null?null:new File(path));
   }
   
  +public void engineInit( ContextManager cm )
  + throws TomcatException
  +{
  +super.engineInit( cm );
  +String ajpid12 = cm.getProperty(ajpid12);
  +if( ajpid12 != null ) {
  +if( ajpidFile != null ) {
  +log( Overriding ajpidFile with  + ajpid12 );
  +}
  +ajpidFile = new File(ajpid12);
  +}
  +}
  +
   public void engineState(ContextManager cm, int state )
throws TomcatException
   {
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp12Interceptor.java

2002-02-26 Thread billbarker 

billbarker02/02/26 19:36:27

  Modified:src/share/org/apache/tomcat/modules/server
Ajp12Interceptor.java
  Log:
  Remember to set the tomcatAuthentication property of the request.
  
  Fix for bug #6002
  Reported by: Gunther Dörnen [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.18  +1 -0  
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java
  
  Index: Ajp12Interceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Ajp12Interceptor.java 12 Sep 2001 21:40:36 -  1.17
  +++ Ajp12Interceptor.java 27 Feb 2002 03:36:27 -  1.18
  @@ -148,6 +148,7 @@
Object thData[]=new Object[2];
AJP12Request reqA=new AJP12Request();
reqA.setSecret( secret );
  + reqA.setTomcatAuthentication(isTomcatAuthentication());
AJP12Response resA=new AJP12Response();
cm.initRequest( reqA, resA );
thData[0]=reqA;
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp12Interceptor.java Ajp12.java

2001-09-12 Thread nacho 

nacho   01/09/12 14:40:36

  Modified:src/share/org/apache/tomcat/modules/server
Ajp12Interceptor.java Ajp12.java
  Log:
  Defaulting tomcatAuthentication to false for Ajp12 too
  
  Revision  ChangesPath
  1.17  +1 -1  
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java
  
  Index: Ajp12Interceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Ajp12Interceptor.java 2001/08/25 14:19:49 1.16
  +++ Ajp12Interceptor.java 2001/09/12 21:40:36 1.17
  @@ -77,7 +77,7 @@
*/
   public class Ajp12Interceptor extends PoolTcpConnector
   implements  TcpConnectionHandler{
  -private boolean tomcatAuthentication=false;
  +private boolean tomcatAuthentication=true;
   String secret;
   File ajpidFile=null;
   
  
  
  
  1.22  +1 -1  
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java
  
  Index: Ajp12.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Ajp12.java2001/09/08 00:41:29 1.21
  +++ Ajp12.java2001/09/12 21:40:36 1.22
  @@ -76,7 +76,7 @@
   Socket socket;
   InputStream sin;
   BufferedInputStream ajpin;
  -private boolean tomcatAuthentication=false;
  +private boolean tomcatAuthentication=true;
   boolean shutdown=false;
   boolean isPing=false;
   boolean doLog;

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp12Interceptor.java Ajp12.java

2001-08-25 Thread nacho 

nacho   01/08/25 07:19:49

  Modified:src/share/org/apache/tomcat/modules/server
Ajp12Interceptor.java Ajp12.java
  Log:
  Bugzilla#3256
  
  tomcatAuthentication=false does not appear to disable tomcat authentication
  
  Reported by jjv AT windchill.com (Joe Van Demark)
  
  Now TomcatAuthentication defaults to false ( as is was without that hack ) ,
  that is Tomcat relies for basic auth in the HTTPServer used.
  Need to check if TomcatAuthentiication works when the value is true,
  the reporter seems to imply that this not works at all
  
  Revision  ChangesPath
  1.16  +1 -1  
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java
  
  Index: Ajp12Interceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Ajp12Interceptor.java 2001/08/11 03:21:16 1.15
  +++ Ajp12Interceptor.java 2001/08/25 14:19:49 1.16
  @@ -77,7 +77,7 @@
*/
   public class Ajp12Interceptor extends PoolTcpConnector
   implements  TcpConnectionHandler{
  -private boolean tomcatAuthentication=true;
  +private boolean tomcatAuthentication=false;
   String secret;
   File ajpidFile=null;
   
  
  
  
  1.20  +1 -1  
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java
  
  Index: Ajp12.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Ajp12.java2001/08/22 16:53:57 1.19
  +++ Ajp12.java2001/08/25 14:19:49 1.20
  @@ -75,7 +75,7 @@
   Socket socket;
   InputStream sin;
   BufferedInputStream ajpin;
  -private boolean tomcatAuthentication=true;
  +private boolean tomcatAuthentication=false;
   boolean shutdown=false;
   boolean isPing=false;
   boolean doLog;

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/server Ajp12Interceptor.java

2000-11-19 Thread nacho 

nacho   00/11/19 07:54:29

  Modified:src/share/org/apache/tomcat/modules/server
Ajp12Interceptor.java
  Log:
  Need to recycle the internal http10 of AJP12Response
  
  Revision  ChangesPath
  1.5   +9 -3  
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java
  
  Index: Ajp12Interceptor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp12Interceptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Ajp12Interceptor.java 2000/09/29 21:09:46 1.4
  +++ Ajp12Interceptor.java 2000/11/19 15:54:29 1.5
  @@ -119,7 +119,7 @@
   
AJP12Request reqA=null;
AJP12Response resA=null;
  - 
  +
if( thData != null ) {
reqA=(AJP12Request)thData[0];
resA=(AJP12Response)thData[1];
  @@ -163,7 +163,7 @@
   public void readNextRequest() throws IOException {
ajp12.readNextRequest( this );
   }
  -
  +
   public void setSocket( Socket s ) throws IOException {
ajp12.setSocket( s );
   }
  @@ -175,6 +175,7 @@
   public  int doRead( byte b[], int off, int len ) throws IOException {
return ajp12.doRead( b,off,len);
   }
  +
   }
   
   
  @@ -182,10 +183,15 @@
   class AJP12Response extends Response {
   Http10 http=new Http10();
   
  +public void recycle() {
  +super.recycle();
  +http.recycle();
  +}
  +
   public void setSocket( Socket s ) throws IOException {
http.setSocket( s );
   }
  -
  +
   public void endHeaders()  throws IOException {
super.endHeaders();
sendStatus( status, RequestUtil.getMessage( status ));