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/06/19 18:08:43 UTC
svn commit: r786566 - in /geronimo/server/trunk/plugins/jetty7:
geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
jetty7/src/main/plan/plan.xml pom.xml
Author: djencks
Date: Fri Jun 19 16:08:42 2009
New Revision: 786566
URL: http://svn.apache.org/viewvc?rev=786566&view=rev
Log:
GERONIMO-4700 Work around jetty M3 bug, upgrade to Jetty M3 release
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
geronimo/server/trunk/plugins/jetty7/pom.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=786566&r1=786565&r2=786566&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 Fri Jun 19 16:08:42 2009
@@ -87,10 +87,15 @@
}
public int getHeaderBufferSizeBytes() {
- return listener.getHeaderBufferSize();
+ return listener.getRequestHeaderSize();
}
public void setHeaderBufferSizeBytes(int size) {
- listener.setHeaderBufferSize(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);
}
public abstract int getDefaultPort();
@@ -130,13 +135,18 @@
}
public int getBufferSizeBytes() {
- //TODO return the request buffer size, what about the response and header buffer size?
+ //TODO return the request buffer size, what about the response buffer size?
return listener.getRequestBufferSize();
}
public void setBufferSizeBytes(int bytes) {
- //TODO what about the response and header buffer size?
+ //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());
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=786566&r1=786565&r2=786566&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 Fri Jun 19 16:08:42 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">8192</attribute>
+ <!--<attribute name="headerBufferSizeBytes">6000</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>
Modified: geronimo/server/trunk/plugins/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/pom.xml?rev=786566&r1=786565&r2=786566&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty7/pom.xml Fri Jun 19 16:08:42 2009
@@ -37,7 +37,7 @@
</description>
<properties>
- <jettyVersion>7.0.0.M3-SNAPSHOT</jettyVersion>
+ <jettyVersion>7.0.0.M3</jettyVersion>
</properties>
<dependencyManagement>