danmil 01/01/29 20:13:14
Modified: src/share/org/apache/tomcat/modules/server Ajp13.java
Log:
More bug fixes from Keith Wannamaker ([EMAIL PROTECTED]):
- Enabled http status text
- 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.
Revision Changes Path
1.10 +6 -2
jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13.java
Index: Ajp13.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/server/Ajp13.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Ajp13.java 2001/01/28 20:49:54 1.9
+++ Ajp13.java 2001/01/30 04:13:14 1.10
@@ -69,6 +69,7 @@
import org.apache.tomcat.core.Request;
import org.apache.tomcat.util.MimeHeaders;
import org.apache.tomcat.util.MessageBytes;
+import org.apache.tomcat.util.http.HttpMessages;
/**
* Represents a single, persistent connection between the web server and
@@ -84,6 +85,9 @@
* (e.g. doWrite) to the correct packets to send to the web server.
*
* @see Ajp13Interceptor
+ *
+ * @author Dan Milstein [[EMAIL PROTECTED]]
+ * @author Keith Wannamaker [[EMAIL PROTECTED]]
*/
public class Ajp13
{
@@ -389,7 +393,7 @@
return -1;
}
}
- return bodyBuff[pos++];
+ return (char) bodyBuff[pos++];
}
/**
@@ -486,7 +490,7 @@
outBuf.reset();
outBuf.appendByte(JK_AJP13_SEND_HEADERS);
outBuf.appendInt(status);
- outBuf.appendString(""); // Http Status Message -- broken.
+ outBuf.appendString(HttpMessages.getMessage( status ));
int numHeaders = headers.size();
outBuf.appendInt(numHeaders);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
