You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2009/07/26 00:06:44 UTC
svn commit: r797848 - in /geronimo/server/trunk/plugins/jetty7:
geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
jetty7/src/main/plan/plan.xml
Author: djencks
Date: Sat Jul 25 22:06:43 2009
New Revision: 797848
URL: http://svn.apache.org/viewvc?rev=797848&view=rev
Log:
GERONIMO-4700 remove workaround for now-fixed jetty bug
Modified:
geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
geronimo/server/trunk/plugins/jetty7/jetty7/src/main/plan/plan.xml
Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java?rev=797848&r1=797847&r2=797848&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java (original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java Sat Jul 25 22:06:43 2009
@@ -87,15 +87,10 @@
}
public int getHeaderBufferSizeBytes() {
- return listener.getRequestHeaderSize();
+ return listener.getHeaderBufferSize();
}
public void setHeaderBufferSizeBytes(int size) {
-
- //TODO see https://bugs.eclipse.org/bugs/show_bug.cgi?id=280843
- if (size == listener.getRequestBufferSize()) throw new IllegalArgumentException("Do not set the header buffer size to the same as the request buffer size: " + listener.getRequestBufferSize());
- if (size == listener.getResponseBufferSize()) throw new IllegalArgumentException("Do not set the header buffer size to the same as the response buffer size: " + listener.getResponseBufferSize());
- listener.setRequestHeaderSize(size);
- listener.setResponseHeaderSize(size);
+ listener.setHeaderBufferSize(size);
}
public abstract int getDefaultPort();
@@ -135,18 +130,13 @@
}
public int getBufferSizeBytes() {
- //TODO return the request buffer size, what about the response buffer size?
+ //TODO return the request buffer size, what about the response and header buffer size?
return listener.getRequestBufferSize();
}
public void setBufferSizeBytes(int bytes) {
- //TODO what about the response buffer size?
-
- //TODO see https://bugs.eclipse.org/bugs/show_bug.cgi?id=280843
- if (bytes == listener.getRequestHeaderSize()) throw new IllegalArgumentException("Do not set the buffer size to the same as the header request buffer size: " + listener.getRequestBufferSize());
- if (bytes == listener.getResponseHeaderSize()) throw new IllegalArgumentException("Do not set the buffer size to the same as the header response buffer size: " + listener.getResponseBufferSize());
+ //TODO what about the response and header buffer size?
listener.setRequestBufferSize(bytes);
- listener.setResponseBufferSize(bytes);
}
public int getAcceptQueueSize() {
Modified: geronimo/server/trunk/plugins/jetty7/jetty7/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/jetty7/src/main/plan/plan.xml?rev=797848&r1=797847&r2=797848&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/jetty7/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/jetty7/src/main/plan/plan.xml Sat Jul 25 22:06:43 2009
@@ -64,7 +64,7 @@
<gbean name="JettyWebConnector" class="org.apache.geronimo.jetty7.connector.HTTPSelectChannelConnector">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanHTTPPort}</attribute>
- <!--<attribute name="headerBufferSizeBytes">6000</attribute>-->
+ <attribute name="headerBufferSizeBytes">8192</attribute>
<reference name="JettyContainer">
<name>JettyWebContainer</name>
</reference>
@@ -113,7 +113,7 @@
<gbean name="JettySSLConnector" class="org.apache.geronimo.jetty7.connector.HTTPSSelectChannelConnector">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanHTTPSPort}</attribute>
- <!--<attribute name="headerBufferSizeBytes">8192</attribute>-->
+ <attribute name="headerBufferSizeBytes">8192</attribute>
<attribute name="keyStore">geronimo-default</attribute>
<attribute name="keyAlias">geronimo</attribute>
<attribute name="trustStore">geronimo-default</attribute>