cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/connector Ajp13ConnectorRequest.java
marcsaeg01/06/20 13:52:24 Modified:src/share/org/apache/tomcat/service/connector Tag: tomcat_32 Ajp13ConnectorRequest.java Log: Fixed sign extension problem in doRead(), again. PR: 1673 Submitted by: Richard Evans ([EMAIL PROTECTED]) Revision ChangesPath No revision No revision 1.5.2.8 +4 -4 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.7 retrieving revision 1.5.2.8 diff -u -r1.5.2.7 -r1.5.2.8 --- Ajp13ConnectorRequest.java2001/05/11 22:37:24 1.5.2.7 +++ Ajp13ConnectorRequest.java2001/06/20 20:52:23 1.5.2.8 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorRequest.java,v 1.5.2.7 2001/05/11 22:37:24 marcsaeg Exp $ - * $Revision: 1.5.2.7 $ - * $Date: 2001/05/11 22:37:24 $ + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorRequest.java,v 1.5.2.8 2001/06/20 20:52:23 marcsaeg Exp $ + * $Revision: 1.5.2.8 $ + * $Date: 2001/06/20 20:52:23 $ * * * @@ -253,7 +253,7 @@ return -1; } } -return (char) bodyBuff[pos++]; +return bodyBuff[pos++] 0xFF; // prevent sign extension of byte value } public int doRead(byte[] b, int off, int len) throws IOException
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/connector Ajp13ConnectorRequest.java
danmil 01/02/14 14:19:55 Modified:src/share/org/apache/tomcat/service/connector Tag: tomcat_32 Ajp13ConnectorRequest.java Log: Fixed bug which was causing isSecure() to return true if any environment variables were getting passed over. Bugzilla #313 Contributed by: Heinz Richter ([EMAIL PROTECTED]) Revision ChangesPath No revision No revision 1.5.2.5 +3 -4 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.4 retrieving revision 1.5.2.5 diff -u -r1.5.2.4 -r1.5.2.5 --- Ajp13ConnectorRequest.java2001/01/30 04:17:53 1.5.2.4 +++ Ajp13ConnectorRequest.java2001/02/14 22:19:55 1.5.2.5 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorRequest.java,v 1.5.2.4 2001/01/30 04:17:53 danmil Exp $ - * $Revision: 1.5.2.4 $ - * $Date: 2001/01/30 04:17:53 $ + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorRequest.java,v 1.5.2.5 2001/02/14 22:19:55 danmil Exp $ + * $Revision: 1.5.2.5 $ + * $Date: 2001/02/14 22:19:55 $ * * * @@ -217,7 +217,6 @@ break; case SC_A_REQ_ATTRIBUTE : -isSSL = true; attributes.put(msg.getString(), msg.getString()); break; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/connector Ajp13ConnectorRequest.java
danmil 01/01/29 20:17:53 Modified:src/share/org/apache/tomcat/service/connector Tag: tomcat_32 Ajp13ConnectorRequest.java Log: Fixed (yet another) bug with File Upload. Tomcat was returning signed data to servlets (via ServletInputStream.read()), which was causing servlets to read 0xFF as EOF. Contributed by Keith Wannamaker ([EMAIL PROTECTED]): Revision ChangesPath No revision No revision 1.5.2.4 +4 -4 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.3 retrieving revision 1.5.2.4 diff -u -r1.5.2.3 -r1.5.2.4 --- Ajp13ConnectorRequest.java2001/01/05 03:39:25 1.5.2.3 +++ Ajp13ConnectorRequest.java2001/01/30 04:17:53 1.5.2.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorRequest.java,v 1.5.2.3 2001/01/05 03:39:25 danmil Exp $ - * $Revision: 1.5.2.3 $ - * $Date: 2001/01/05 03:39:25 $ + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorRequest.java,v 1.5.2.4 2001/01/30 04:17:53 danmil Exp $ + * $Revision: 1.5.2.4 $ + * $Date: 2001/01/30 04:17:53 $ * * * @@ -254,7 +254,7 @@ return -1; } } -return bodyBuff[pos++]; +return (char) bodyBuff[pos++]; } public int doRead(byte[] b, int off, int len) throws IOException - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/connector Ajp13ConnectorRequest.java
danmil 01/01/04 19:39:26
Modified:src/native/jk Tag: tomcat_32 jk_ajp13_worker.c
src/share/org/apache/tomcat/service/connector Tag: tomcat_32
Ajp13ConnectorRequest.java
Log:
- Fixed the problems with multipart form encodings. Bug Reports #536 +
#542 and a bunch of others. File upload is now working.
- In doRead(), replaced byte-by-byte copy with System.arraycopy().
- Clarified Ajp13 protocol: if the container tries to read
past the end of the input stream, the server sends an empty packet back.
Revision ChangesPath
No revision
No revision
1.3.2.2 +14 -12jakarta-tomcat/src/native/jk/Attic/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===
RCS file: /home/cvs/jakarta-tomcat/src/native/jk/Attic/jk_ajp13_worker.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- jk_ajp13_worker.c 2000/09/13 23:06:25 1.3.2.1
+++ jk_ajp13_worker.c 2001/01/05 03:39:25 1.3.2.2
@@ -57,7 +57,7 @@
* Description: Experimental bi-directionl protocol. *
* Author: Costin [EMAIL PROTECTED] *
* Author: Gal Shachor [EMAIL PROTECTED] *
- * Version: $Revision: 1.3.2.1 $ *
+ * Version: $Revision: 1.3.2.2 $ *
***/
#include "jk_pool.h"
@@ -267,7 +267,7 @@
read_buf += 4; /* leave some space for the buffer headers */
read_buf += 2; /* leave some space for the read length */
-if(read_fully_from_server(r, read_buf, len) = 0) {
+if(read_fully_from_server(r, read_buf, len) 0) {
jk_log(l, JK_LOG_ERROR,
"read_into_msg_buff: Error - read_fully_from_server failed\n");
return JK_FALSE;
@@ -331,23 +331,25 @@
case JK_AJP13_GET_BODY_CHUNK:
{
- unsigned len = (unsigned)jk_b_get_int(msg);
+ unsigned len = (unsigned)jk_b_get_int(msg);
if(len MAX_SEND_BODY_SZ) {
len = MAX_SEND_BODY_SZ;
}
if(len ep-left_bytes_to_send) {
len = ep-left_bytes_to_send;
-}
-if(len 0) {
-if(read_into_msg_buff(ep, r, msg, l, len)) {
-return JK_AJP13_HAS_RESPONSE;
-}
-
-jk_log(l, JK_LOG_ERROR,
- "Error ajp13_process_callback - read_into_msg_buff
failed\n");
-return JK_INTERNAL_ERROR;
}
+ if(len 0) {
+ len = 0;
+ }
+
+ if(read_into_msg_buff(ep, r, msg, l, len)) {
+ return JK_AJP13_HAS_RESPONSE;
+ }
+
+ jk_log(l, JK_LOG_ERROR,
+"Error ajp13_process_callback - read_into_msg_buff failed\n");
+ return JK_INTERNAL_ERROR;
}
break;
No revision
No revision
1.5.2.3 +38 -17
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.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- Ajp13ConnectorRequest.java2000/12/12 09:41:43 1.5.2.2
+++ Ajp13ConnectorRequest.java2001/01/05 03:39:25 1.5.2.3
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Attic/Ajp13ConnectorRequest.java,v
1.5.2.3 2001/01/05 03:39:25 danmil Exp $
+ * $Revision: 1.5.2.3 $
+ * $Date: 2001/01/05 03:39:25 $
*
*
*
@@ -250,24 +250,43 @@
public int doRead() throws IOException
{
if(pos = blen) {
-refeelReadBuffer();
-}
+ if( ! refillReadBuffer()) {
+ return -1;
+ }
+ }
return bodyBuff[pos++];
}
public int doRead(byte[] b,
Re: TC 3.3: RE: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/connector Ajp13ConnectorRequest.java
Hola a Todos: Asunto: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/connector Ajp13ConnectorRequest.java How about definitely deprecate org.apache.tomcat.service packages?? The package has been refactored and moved to org.apache.tomcat.modules.server. The new code is much better ( IMHO ), but I wanted to keep a backup, in case something goes wrong. I think you are right, it is better to just remove it: +1 from me. So this packages are not used anymore inside tomcat ( everything is an interceptor ) , this can be safely rubbed out.. if nobody disagrees i'll clean this soon.. Well, not everything is an interceptor :-), but the server connector does benefit a lot from beeing an interceptor ( not only because it'll make SSL support easier, but also the "real" server connector will be more powerfull). Costin
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/connector Ajp13ConnectorRequest.java
hgomez 00/11/15 03:40:03
Modified:src/share/org/apache/tomcat/service/connector
Ajp13ConnectorRequest.java
Log:
Submitted by: [EMAIL PROTECTED]
Correct ajp13 bug when posting data more than 8k
Revision ChangesPath
1.16 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java
Index: Ajp13ConnectorRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Ajp13ConnectorRequest.java2000/11/02 21:44:56 1.15
+++ Ajp13ConnectorRequest.java2000/11/15 11:40:03 1.16
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java,v
1.15 2000/11/02 21:44:56 costin Exp $
- * $Revision: 1.15 $
- * $Date: 2000/11/02 21:44:56 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java,v
1.16 2000/11/15 11:40:03 hgomez Exp $
+ * $Revision: 1.16 $
+ * $Date: 2000/11/15 11:40:03 $
*
*
*
@@ -246,7 +246,7 @@
public int doRead() throws IOException
{
-if(pos blen) {
+if(pos = blen) {
refeelReadBuffer();
}
return bodyBuff[pos++];
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/service/connector Ajp13ConnectorRequest.java
hgomez 00/11/15 04:03:00
Modified:src/share/org/apache/tomcat/service/connector Tag: tomcat_32
Ajp13ConnectorRequest.java
Log:
Submitted by: [EMAIL PROTECTED]
Fix the ajp13 bug when post is 8k
Revision ChangesPath
No revision
No revision
1.5.2.1 +4 -4
jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java
Index: Ajp13ConnectorRequest.java
===
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- Ajp13ConnectorRequest.java2000/06/23 10:32:39 1.5
+++ Ajp13ConnectorRequest.java2000/11/15 12:03:00 1.5.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/Ajp13ConnectorRequest.java,v
1.5 2000/06/23 10:32:39 shachor Exp $
- * $Revision: 1.5 $
- * $Date: 2000/06/23 10:32:39 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/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 $
*
*
*
@@ -249,7 +249,7 @@
public int doRead() throws IOException
{
-if(pos blen) {
+if(pos = blen) {
refeelReadBuffer();
}
return bodyBuff[pos++];
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
