geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r592536 - in /geronimo/server/trunk: framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/ plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ plugins/jetty/geronimo-jetty6/src/main...
Date Tue, 06 Nov 2007 20:06:35 GMT
Author: pmcmahan
Date: Tue Nov  6 12:06:33 2007
New Revision: 592536

URL: http://svn.apache.org/viewvc?rev=592536&view=rev
Log:
GERONIMO-3523 increase the header buffer size to 8k for jetty connector and make the setting
configurable
for new and existing jetty web connectors

Modified:
    geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebConnector.java
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java
    geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/resources/org/apache/geronimo/jetty/messages.properties
    geronimo/server/trunk/plugins/jetty/jetty6/src/main/plan/plan.xml

Modified: geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebConnector.java?rev=592536&r1=592535&r2=592536&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebConnector.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebConnector.java
Tue Nov  6 12:06:33 2007
@@ -38,6 +38,16 @@
      */
     public void setBufferSizeBytes(int bytes);
     /**
+     * Gets the size of the header buffer used to handle network data for this
+     * connector.
+     */
+    public int getHeaderBufferSizeBytes();
+    /**
+     * Sets the size of the Header buffer used to handle network data for this
+     * connector.
+     */
+    public void setHeaderBufferSizeBytes(int bytes);
+    /**
      * Gets the maximum number of threads used to service connections from
      * this connector.
      */

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java?rev=592536&r1=592535&r2=592536&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
(original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
Tue Nov  6 12:06:33 2007
@@ -384,6 +384,7 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("port", 8080, Messages.getString("JettyManagerImpl.32"),
Integer.class, true)); //$NON-NLS-1$ //$NON-NLS-2$
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxThreads", 10, Messages.getString("JettyManagerImpl.34"),
Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, Messages.getString("JettyManagerImpl.36"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
+        connectorAttributes.add(new ConnectorAttribute<Integer>("headerBufferSizeBytes",
8192, Messages.getString("JettyManagerImpl.57"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, Messages.getString("JettyManagerImpl.38"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
Messages.getString("JettyManagerImpl.40"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
         //connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"If true then setTcpNoDelay(true) is called on accepted sockets.", Boolean.class));

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java?rev=592536&r1=592535&r2=592536&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java
(original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java
Tue Nov  6 12:06:33 2007
@@ -86,6 +86,13 @@
     public void setPort(int port) {
         listener.setPort(port);
     }
+    
+    public int getHeaderBufferSizeBytes() {
+        return listener.getHeaderBufferSize();
+    }
+    public void setHeaderBufferSizeBytes(int size) {
+        listener.setHeaderBufferSize(size);
+    }
 
     public abstract int getDefaultPort();
 
@@ -282,8 +289,8 @@
         // removed 'tcpNoDelay' from persistent String[]
         // added 'protocol' to persistent and manageable String[]
         infoFactory.addInterface(JettyWebConnector.class, 
-                new String[]{"host", "port", "minThreads", "maxThreads", "bufferSizeBytes",
"acceptQueueSize", "lingerMillis", "protocol", "redirectPort", "connectUrl", "maxIdleTimeMs"},
-                new String[]{"host", "port", "minThreads", "maxThreads", "bufferSizeBytes",
"acceptQueueSize", "lingerMillis", "protocol", "redirectPort"});
+                new String[]{"host", "port", "minThreads", "maxThreads", "bufferSizeBytes",
"headerBufferSizeBytes", "acceptQueueSize", "lingerMillis", "protocol", "redirectPort", "connectUrl",
"maxIdleTimeMs"},
+                new String[]{"host", "port", "minThreads", "maxThreads", "bufferSizeBytes",
"headerBufferSizeBytes", "acceptQueueSize", "lingerMillis", "protocol", "redirectPort"});
         infoFactory.setConstructor(new String[]{"JettyContainer", "ThreadPool"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Modified: geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/resources/org/apache/geronimo/jetty/messages.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/resources/org/apache/geronimo/jetty/messages.properties?rev=592536&r1=592535&r2=592536&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/resources/org/apache/geronimo/jetty/messages.properties
(original)
+++ geronimo/server/trunk/plugins/jetty/geronimo-jetty6/src/main/resources/org/apache/geronimo/jetty/messages.properties
Tue Nov  6 12:06:33 2007
@@ -33,3 +33,4 @@
 JettyManagerImpl.50=The keystore containing the trusted certificate entries, including Certification
Authority (CA) certificates
 JettyManagerImpl.53=This should normally be set to TLS, though some (IBM) JVMs don't work
properly with popular browsers unless it is changed to SSL.
 JettyManagerImpl.56=This should normally be set to match the JVM vendor.
+JettyManagerImpl.57=Size in bytes of the header buffer.

Modified: geronimo/server/trunk/plugins/jetty/jetty6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty/jetty6/src/main/plan/plan.xml?rev=592536&r1=592535&r2=592536&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty/jetty6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/jetty/jetty6/src/main/plan/plan.xml Tue Nov  6 12:06:33
2007
@@ -64,6 +64,7 @@
     <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty6.connector.HTTPSelectChannelConnector">
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanHTTPPort}</attribute>
+        <attribute name="headerBufferSizeBytes">8192</attribute>
         <reference name="JettyContainer">
             <name>JettyWebContainer</name>
         </reference>
@@ -112,6 +113,7 @@
     <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty6.connector.HTTPSSelectChannelConnector">
         <attribute name="host">${PlanServerHostname}</attribute>
         <attribute name="port">${PlanHTTPSPort}</attribute>
+        <attribute name="headerBufferSizeBytes">8192</attribute>
         <attribute name="keyStore">geronimo-default</attribute>
         <attribute name="keyAlias">geronimo</attribute>
         <attribute name="trustStore">geronimo-default</attribute>



Mime
View raw message