hgomez 00/12/12 01:41:45
Modified: src/share/org/apache/tomcat/service/connector Tag: tomcat_32
Ajp13ConnectionHandler.java
Ajp13ConnectorRequest.java
Ajp13ConnectorResponse.java
JNIConnectionHandler.java MsgBuffer.java
MsgConnector.java TcpConnector.java
Log:
Fix the multiple cookies bug with ajp13, PR 371
Revision Changes Path
No revision
No revision
1.4.2.1 +3 -3
jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectionHandler.java
Index: Ajp13ConnectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectionHandler.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Ajp13ConnectionHandler.java 2000/06/15 10:14:44 1.4
+++ Ajp13ConnectionHandler.java 2000/12/12 09:41:43 1.4.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectionHandler.java,v
1.4 2000/06/15 10:14:44 shachor Exp $
- * $Revision: 1.4 $
- * $Date: 2000/06/15 10:14:44 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectionHandler.java,v
1.4.2.1 2000/12/12 09:41:43 hgomez Exp $
+ * $Revision: 1.4.2.1 $
+ * $Date: 2000/12/12 09:41:43 $
*
* ====================================================================
*
1.5.2.2 +3 -3
jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorRequest.java
Index: Ajp13ConnectorRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorRequest.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- Ajp13ConnectorRequest.java 2000/11/15 12:03:00 1.5.2.1
+++ Ajp13ConnectorRequest.java 2000/12/12 09:41:43 1.5.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorRequest.java,v
1.5.2.1 2000/11/15 12:03:00 hgomez Exp $
- * $Revision: 1.5.2.1 $
- * $Date: 2000/11/15 12:03:00 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorRequest.java,v
1.5.2.2 2000/12/12 09:41:43 hgomez Exp $
+ * $Revision: 1.5.2.2 $
+ * $Date: 2000/12/12 09:41:43 $
*
* ====================================================================
*
1.4.2.3 +8 -8
jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorResponse.java
Index: Ajp13ConnectorResponse.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorResponse.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- Ajp13ConnectorResponse.java 2000/11/28 21:36:51 1.4.2.2
+++ Ajp13ConnectorResponse.java 2000/12/12 09:41:44 1.4.2.3
@@ -1,8 +1,8 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorResponse.java,v
1.4.2.2 2000/11/28 21:36:51 craigmcc Exp $
- * $Revision: 1.4.2.2 $
- * $Date: 2000/11/28 21:36:51 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorResponse.java,v
1.4.2.3 2000/12/12 09:41:44 hgomez Exp $
+ * $Revision: 1.4.2.3 $
+ * $Date: 2000/12/12 09:41:44 $
*
* ====================================================================
*
@@ -130,18 +130,18 @@
headers.removeHeader("Status");
headers.removeHeader("Servlet-Engine");
- msg.appendInt(headers.size());
+ int numHeaders = headers.size();
+ msg.appendInt(numHeaders);
- Enumeration e = headers.names();
- while(e.hasMoreElements()) {
- String headerName = (String)e.nextElement();
+ for( int i=0 ; i < numHeaders ; i++ ) {
+ String headerName = headers.getHeaderName(i);
int sc = headerNameToSc(headerName);
if(-1 != sc) {
msg.appendInt(sc);
} else {
msg.appendString(headerName);
}
- msg.appendString(headers.getHeader(headerName));
+ msg.appendString(headers.getHeader(i));
}
msg.end();
1.9.2.2 +3 -3
jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/JNIConnectionHandler.java
Index: JNIConnectionHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/JNIConnectionHandler.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -r1.9.2.1 -r1.9.2.2
--- JNIConnectionHandler.java 2000/11/10 06:42:52 1.9.2.1
+++ JNIConnectionHandler.java 2000/12/12 09:41:44 1.9.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/JNIConnectionHandler.java,v
1.9.2.1 2000/11/10 06:42:52 craigmcc Exp $
- * $Revision: 1.9.2.1 $
- * $Date: 2000/11/10 06:42:52 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/JNIConnectionHandler.java,v
1.9.2.2 2000/12/12 09:41:44 hgomez Exp $
+ * $Revision: 1.9.2.2 $
+ * $Date: 2000/12/12 09:41:44 $
*
* ====================================================================
*
1.7.2.1 +3 -3
jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/MsgBuffer.java
Index: MsgBuffer.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/MsgBuffer.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- MsgBuffer.java 2000/05/23 16:56:55 1.7
+++ MsgBuffer.java 2000/12/12 09:41:44 1.7.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/MsgBuffer.java,v
1.7 2000/05/23 16:56:55 costin Exp $
- * $Revision: 1.7 $
- * $Date: 2000/05/23 16:56:55 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/MsgBuffer.java,v
1.7.2.1 2000/12/12 09:41:44 hgomez Exp $
+ * $Revision: 1.7.2.1 $
+ * $Date: 2000/12/12 09:41:44 $
*
* ====================================================================
*
1.5.2.1 +3 -3
jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/MsgConnector.java
Index: MsgConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/MsgConnector.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- MsgConnector.java 2000/06/12 09:45:22 1.5
+++ MsgConnector.java 2000/12/12 09:41:44 1.5.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/MsgConnector.java,v
1.5 2000/06/12 09:45:22 shachor Exp $
- * $Revision: 1.5 $
- * $Date: 2000/06/12 09:45:22 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/MsgConnector.java,v
1.5.2.1 2000/12/12 09:41:44 hgomez Exp $
+ * $Revision: 1.5.2.1 $
+ * $Date: 2000/12/12 09:41:44 $
*
* ====================================================================
*
1.2.2.2 +3 -3
jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/TcpConnector.java
Index: TcpConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/TcpConnector.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- TcpConnector.java 2000/11/04 20:08:07 1.2.2.1
+++ TcpConnector.java 2000/12/12 09:41:44 1.2.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/TcpConnector.java,v
1.2.2.1 2000/11/04 20:08:07 craigmcc Exp $
- * $Revision: 1.2.2.1 $
- * $Date: 2000/11/04 20:08:07 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/TcpConnector.java,v
1.2.2.2 2000/12/12 09:41:44 hgomez Exp $
+ * $Revision: 1.2.2.2 $
+ * $Date: 2000/12/12 09:41:44 $
*
* ====================================================================
*
