geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r599705 - in /geronimo/server/branches/2.0: configs/jetty6/src/plan/ modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/ modules/geronimo-management/s...
Date Fri, 30 Nov 2007 06:54:43 GMT
Author: gawor
Date: Thu Nov 29 22:54:41 2007
New Revision: 599705

URL: http://svn.apache.org/viewvc?rev=599705&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/branches/2.0/configs/jetty6/src/plan/plan.xml
    geronimo/server/branches/2.0/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
    geronimo/server/branches/2.0/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java
    geronimo/server/branches/2.0/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebConnector.java

Modified: geronimo/server/branches/2.0/configs/jetty6/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/jetty6/src/plan/plan.xml?rev=599705&r1=599704&r2=599705&view=diff
==============================================================================
--- geronimo/server/branches/2.0/configs/jetty6/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/jetty6/src/plan/plan.xml Thu Nov 29 22:54:41 2007
@@ -65,6 +65,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>
@@ -118,6 +119,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>

Modified: geronimo/server/branches/2.0/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java?rev=599705&r1=599704&r2=599705&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
Thu Nov 29 22:54:41 2007
@@ -86,6 +86,7 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("port", 8080, "The
network port to bind to.", Integer.class, true));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxThreads", 10, "The
maximum number of threads this connector should use to handle incoming requests", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Integer>("headerBufferSizeBytes",
8192, "Size in bytes of the header buffer", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
         //connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));
@@ -98,6 +99,7 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("port", 8443, "The
network port to bind to.", Integer.class, true));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxThreads", 10, "The
maximum number of threads this connector should use to handle incoming requests", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Integer>("headerBufferSizeBytes",
8192, "Size in bytes of the header buffer", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
         //connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));
@@ -117,6 +119,7 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("port", 8080, "The
network port to bind to.", Integer.class, true));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxThreads", 10, "The
maximum number of threads this connector should use to handle incoming requests", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Integer>("headerBufferSizeBytes",
8192, "Size in bytes of the header buffer", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
         //connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));
@@ -129,6 +132,7 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("port", 8443, "The
network port to bind to.", Integer.class, true));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxThreads", 10, "The
maximum number of threads this connector should use to handle incoming requests", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Integer>("headerBufferSizeBytes",
8192, "Size in bytes of the header buffer", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
         //connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));
@@ -148,6 +152,7 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("port", 8080, "The
network port to bind to.", Integer.class, true));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxThreads", 10, "The
maximum number of threads this connector should use to handle incoming requests", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Integer>("headerBufferSizeBytes",
8192, "Size in bytes of the header buffer", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
         //connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));
@@ -160,6 +165,7 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("port", 8009, "The
network port to bind to.", Integer.class, true));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxThreads", 10, "The
maximum number of threads this connector should use to handle incoming requests", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Integer>("headerBufferSizeBytes",
8192, "Size in bytes of the header buffer", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
         //connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));

Modified: geronimo/server/branches/2.0/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java?rev=599705&r1=599704&r2=599705&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/connector/JettyConnector.java
Thu Nov 29 22:54:41 2007
@@ -81,6 +81,14 @@
         listener.setPort(port);
     }
 
+    public int getHeaderBufferSizeBytes() {
+        return listener.getHeaderBufferSize();
+    }
+
+    public void setHeaderBufferSizeBytes(int size) {
+        listener.setHeaderBufferSize(size);
+    }
+
     public abstract int getDefaultPort();
 
     public String getDefaultScheme() {
@@ -219,8 +227,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/branches/2.0/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebConnector.java?rev=599705&r1=599704&r2=599705&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebConnector.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebConnector.java
Thu Nov 29 22:54:41 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.
      */



Mime
View raw message