billbarker 2005/05/20 20:02:25
Modified: catalina/src/share/org/apache/catalina/connector
Connector.java Response.java
Log:
Reverting previous patch in favor of the better one submitted by JFC
Revision Changes Path
1.20 +1 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java
Index: Connector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Connector.java 20 May 2005 06:14:36 -0000 1.19
+++ Connector.java 21 May 2005 03:02:25 -0000 1.20
@@ -899,10 +899,6 @@
Response response = new Response();
response.setConnector(this);
- if("AJP/1.3".equals(getProtocol())) {
- // we can't shrink it, so set to 2*max-ajp-packet-size
- response.setBufferSize(2*8184);
- }
return (response);
}
1.13 +12 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Response.java
Index: Response.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Response.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Response.java 25 Apr 2005 22:06:30 -0000 1.12
+++ Response.java 21 May 2005 03:02:25 -0000 1.13
@@ -125,6 +125,14 @@
*/
public void setConnector(Connector connector) {
this.connector = connector;
+ if("AJP/1.3".equals(connector.getProtocol())) {
+ // default size to size of one ajp-packet
+ outputBuffer = new OutputBuffer(8184);
+ } else {
+ outputBuffer = new OutputBuffer();
+ }
+ outputStream = new CoyoteOutputStream(outputBuffer);
+ writer = new CoyoteWriter(outputBuffer);
}
@@ -174,20 +182,19 @@
/**
* The associated output buffer.
*/
- protected OutputBuffer outputBuffer = new OutputBuffer();
+ protected OutputBuffer outputBuffer;
/**
* The associated output stream.
*/
- protected CoyoteOutputStream outputStream =
- new CoyoteOutputStream(outputBuffer);
+ protected CoyoteOutputStream outputStream;
/**
* The associated writer.
*/
- protected CoyoteWriter writer = new CoyoteWriter(outputBuffer);
+ protected CoyoteWriter writer;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
