svn commit: r988645 - in /tomcat/trunk: java/org/apache/coyote/http11/Http11NioProcessor.java java/org/apache/coyote/http11/Http11NioProtocol.java web

Author: markt
Date: Sat Jul 24 11:03:00 2010
New Revision: 978845

URL: http://svn.apache.org/viewvc?rev=978845&view=rev
Log:
More tab police

Modified:
    tomcat/trunk/java/org/apache/coyote/RequestInfo.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpMessage.java
   
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
   
tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
    tomcat/trunk/java/org/apache/naming/NamingContextEnumeration.java
    tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java
    tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
   
tomcat/trunk/java/org/apache/naming/resources/DirContextURLConnection.java
    tomcat/trunk/java/org/apache/naming/resources/FileDirContext.java
   
tomcat/trunk/java/org/apache/naming/resources/RecyclableNamingEnumeration.java
    tomcat/trunk/java/org/apache/naming/resources/WARDirContext.java
    tomcat/trunk/java/org/apache/tomcat/InstanceManager.java
    tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/Constants.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassFormatException.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValue.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnclosingMethod.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTypeTable.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeInvisibleAnnotations.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/RuntimeVisibleAnnotations.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
    tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
    tomcat/trunk/java/org/apache/tomcat/util/buf/MessageBytes.java
   
tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
   
tomcat/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java
    tomcat/trunk/java/org/apache/tomcat/util/http/CookieSupport.java
    tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
   
tomcat/trunk/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
    tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
    tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
    tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
    tomcat/trunk/java/org/apache/tomcat/util/net/ServerSocketFactory.java
   
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

Modified: tomcat/trunk/java/org/apache/coyote/RequestInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/t...845&view=diff

Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/SimpleElementValue.java
URL:
http://svn.apache.org/viewvc/tomcat/t...845&view=diff

Author: markt
Date: Tue Jul 27 20:27:56 2010
New Revision: 979853

URL: http://svn.apache.org/viewvc?rev=979853&view=rev
Log:
Fix unit test failure with APR connector. Make sure MBeans are
de-registered when connector stops.

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/t...853&view=diff

Author: markt
Date: Mon Jun 21 11:25:46 2010
New Revision: 956532

URL: http://svn.apache.org/viewvc?rev=956532&view=rev
Log:
Reduce code duplication in connectors: Use AbstractOutputBuffer with
APR/native connector

Modified:
   
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/t...532&view=diff

Author: markt
Date: Thu Jun  3 18:28:58 2010
New Revision: 951101

URL: http://svn.apache.org/viewvc?rev=951101&view=rev
Log:
Remove code duplication by used abstract base class

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/t...101&view=diff

Author: jfclere
Date: Thu Jun 17 09:41:19 2010
New Revision: 955527

URL: http://svn.apache.org/viewvc?rev=955527&view=rev
Log:
Typo in previous fix for 44285

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/t...527&view=diff

Author: markt
Date: Sat Jul 17 20:40:51 2010
New Revision: 965130

URL: http://svn.apache.org/viewvc?rev=965130&view=rev
Log:
Trivial - align comment

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/t...130&view=diff

Author: markt
Date: Thu Jun  3 18:15:47 2010
New Revision: 951094

URL: http://svn.apache.org/viewvc?rev=951094&view=rev
Log:
Started is only used in BIO connector

Modified:
   
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/t...094&view=diff

Author: markt
Date: Mon Jun 21 15:16:33 2010
New Revision: 956617

URL: http://svn.apache.org/viewvc?rev=956617&view=rev
Log:
Reduce code duplication in connectors: Move initializeFilters()to base
class

Modified:
   
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/t...617&view=diff

Author: markt
Date: Wed Jul 28 22:55:08 2010
New Revision: 980260

URL: http://svn.apache.org/viewvc?rev=980260&view=rev
Log:
Fix a failing test with the APR connector. Handle async requests that
timeout.

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/t...260&view=diff

Author: markt
Date: Mon Jun 21 11:27:18 2010
New Revision: 956533

URL: http://svn.apache.org/viewvc?rev=956533&view=rev
Log:
Reduce code duplication in connectors: Move addFilter() and
addInputFilter() to base class

Modified:
   
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/t...533&view=diff

Author: markt
Date: Mon Jun 21 11:25:08 2010
New Revision: 956531

URL: http://svn.apache.org/viewvc?rev=956531&view=rev
Log:
Reduce code duplication in connectors: Use AbstractInputBuffer with
APR/native connector

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/t...531&view=diff

Author: markt
Date: Thu Jun  3 18:28:01 2010
New Revision: 951100

URL: http://svn.apache.org/viewvc?rev=951100&view=rev
Log:
Correct Javadoc
Fix whitespace

Modified:
   
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/t...100&view=diff

Author: jfclere
Date: Tue Jun 29 10:13:54 2010
New Revision: 958911

URL: http://svn.apache.org/viewvc?rev=958911&view=rev
Log:
Arrange filter logic.

Modified:
   
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
   
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/t...911&view=diff

Author: jfclere
Date: Tue Jun 29 14:07:23 2010
New Revision: 958977

URL: http://svn.apache.org/viewvc?rev=958977&view=rev
Log:
Arrange filter logic. Back port of r958911.

Modified:
   
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
   
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
   
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
   
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/t...977&view=diff

Author: jfclere
Date: Wed Jun 30 20:43:36 2010
New Revision: 959428

URL: http://svn.apache.org/viewvc?rev=959428&view=rev
Log:
Arrange filter logic. Back port of r958911.

Modified:
    tomcat/tc5.5.x/trunk/STATUS.txt
   
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
   
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/Http11Processor.java
   
tomcat/tc5.5.x/trunk/connectors/http11/src/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
    tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/t...428&view=diff

Author: markt
Date: Mon Jun 21 11:54:13 2010
New Revision: 956537

URL: http://svn.apache.org/viewvc?rev=956537&view=rev
Log:
Fix Eclipse warnings in this package. No functional change.

Modified:
   
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
   
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
   
tomcat/trunk/java/org/apache/coyote/http11/filters/ChunkedOutputFilter.java
   
tomcat/trunk/java/org/apache/coyote/http11/filters/GzipOutputFilter.java
   
tomcat/trunk/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
   
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidInputFilter.java
   
tomcat/trunk/java/org/apache/coyote/http11/filters/VoidOutputFilter.java

Modified:
tomcat/trunk/java/org/apache/coyote/http11/filters/BufferedInputFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/t...537&view=diff

Author: markt
Date: Thu Jun  3 18:13:47 2010
New Revision: 951093

URL: http://svn.apache.org/viewvc?rev=951093&view=rev
Log:
Extend access logging to requests rejected in the Processors

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
    tomcat/trunk/java/org/apache/coyote/Adapter.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/t...093&view=diff

Author: markt
Date: Sat Jul 17 18:24:01 2010
New Revision: 965123

URL: http://svn.apache.org/viewvc?rev=965123&view=rev
Log:
Expose executor.
Required so Servlet 3 Async implementation can use the container thread
pool when a new thread needs to be dispatched. (e.g. from
AsyncContext.start(Runnable)

Modified:
    tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java

Modified: tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/t...123&view=diff

Author: markt
Date: Sat Jul 17 18:20:11 2010
New Revision: 965122

URL: http://svn.apache.org/viewvc?rev=965122&view=rev
Log:
Clean-up. No functional change.

Modified:
    tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java

Modified: tomcat/trunk/java/org/apache/coyote/ProtocolHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/t...122&view=diff