Integrate the latest Tomcat 5 fixes

[glassfishrobot]

Attached is the list of bugs that must be integrated before FCS.

Environment

Operating System: All Platform: All

Affected Versions

[V3]

[glassfishrobot]

• Issue Imported From: https://github.com/javaee/glassfish/issues/6194
• Original Issue Raised By:@glassfishrobot
• Original Issue Assigned To: @shingwaichan
• Original Issue Closed By:@glassfishrobot

[glassfishrobot]

@glassfishrobot Commented jfarcand said: Created an attachment (id=1857) svn commit

[glassfishrobot]

@glassfishrobot Commented jfarcand said: Re-assign to Shing Wai. Fixes are reviewed and Shing Wai, Jan and I.

[glassfishrobot]

@glassfishrobot Commented kumara said: v3 defect tracking

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat change: http://svn.apache.org/viewvc?view=rev&revision=697051 for bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=45441 ("Matching of relevant serlvet filters fails") Sending src/main/java/org/apache/catalina/core/ApplicationDispatcher.java Transmitting file data . Committed revision 22952.

Port Tomcat change: http://svn.apache.org/viewvc?view=rev&revision=697048 for bug https://issues.apache.org/bugzilla/show_bug.cgi?id=45785 ("ClassCastException if directory ending with .jar exist") Sending src/main/java/org/apache/catalina/loader/WebappLoader.java Sending src/main/java/org/apache/catalina/util/ExtensionValidator.java Transmitting file data .. Committed revision 22953.

Port Tomcat change: http://svn.apache.org/viewvc?view=rev&revision=693962 for bug https://issues.apache.org/bugzilla/show_bug.cgi?id=43117 ("Dangeroseness of workDir setting on Context") Sending src/main/java/org/apache/catalina/core/StandardContext.java Transmitting file data . Committed revision 22954.

[glassfishrobot]

@glassfishrobot Commented dhirup said: Will fix for V3 fcs. Excluded for Prelude release

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat changes http://svn.apache.org/viewvc?view=rev&revision=697053, http://svn.apache.org/viewvc?view=rev&revision=696408 for issue https://issues.apache.org/bugzilla/show_bug.cgi?id=45419 ("Return Accept-Ranges from DefaultServlet")

Port Tomcat changes http://svn.apache.org/viewvc?view=rev&revision=696402 ("Add generics to default servlet and fix other Eclipse warnings.")

Sending admin/server-mgmt/src/main/resources/lib/templates/common/default-web.xml Sending distributions/nucleus-base/domains/domain1/config/default-web.xml Sending distributions/nucleus-base/lib/templates/default-web.xml Sending embedded/api/src/main/resources/org/glassfish/embed/default-web.xml Sending web/web-core/src/main/java/org/apache/catalina/servlets/DefaultServlet.java Sending web/web-naming/src/main/java/org/apache/naming/resources/FileDirContext.java Sending web/web-naming/src/main/java/org/apache/naming/resources/ProxyDirContext.java Sending web/web-naming/src/main/java/org/apache/naming/resources/ResourceAttributes.java Transmitting file data ........ Committed revision 23237.

[glassfishrobot]

@glassfishrobot Commented kumara said: Reclassifying as P4 because these issues are not must fix for prelude release. This issue will be scrubbed after prelude release and will be given the right priority for v3 final release.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: This should be resolved in v3. p4->p3

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat fixes:

• http://svn.apache.org/viewvc?view=rev&revision=729526 fix various Eclipse warning
• http://svn.apache.org/viewvc?view=rev&revision=729520 generic changes
• http://svn.apache.org/viewvc?view=rev&revision=721932 correctly handle includes with multi-level contexts
• http://svn.apache.org/viewvc?view=rev&revision=700532 http://svn.apache.org/viewvc?view=rev&revision=700526 genric and cleanup on CGIServlet.java

web-core $ svn commit src/main/java/org/apache/catalina/servlets/CGIServlet.javaSending src/main/java/org/apache/catalina/servlets/CGIServlet.javaTransmitting file data . Committed revision 24252. web-core $ svn commit src/main/java/org/apache/catalina/ssi/SSIMediator.java Sending src/main/java/org/apache/catalina/ssi/SSIMediator.java Transmitting file data . Committed revision 24253. web-core $ svn commit src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java Sending src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java Transmitting file data . Committed revision 24254.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat issues 1. http://svn.apache.org/viewvc?view=rev&revision=729526 clean up Eclipse warnings 2. http://svn.apache.org/viewvc?view=rev&revision=708151 http://svn.apache.org/viewvc?view=rev&revision=700125 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45906 Improve etag handling

Sending web-core/src/main/java/org/apache/catalina/servlets/DefaultServlet.java Sending web-core/src/main/java/org/apache/catalina/servlets/WebdavServlet.java Sending web-naming/src/main/java/org/apache/naming/resources/ResourceAttributes.java Transmitting file data ... Committed revision 24277.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat fixes:

• http://svn.apache.org/viewvc?view=rev&revision=729665 fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46408 potential invalid cast in SecurityUtil.java
• http://svn.apache.org/viewvc?view=rev&revision=729527 generic changes in SecurityUtil.java
• http://svn.apache.org/viewvc?view=rev&revision=711600 fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46011 make principal accessible via Subject.getSubject(AccessController.getContext()) when processin filters

Sending web-core/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java Sending web-core/src/main/java/org/apache/catalina/security/SecurityUtil.java Transmitting file data .. Committed revision 24285.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat fixes:

• http://svn.apache.org/viewvc?view=rev&revision=729665 fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46408 potential invalid cast in SecurityUtil.java
• http://svn.apache.org/viewvc?view=rev&revision=729527 generic changes in SecurityUtil.java
• http://svn.apache.org/viewvc?view=rev&revision=711600 fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46011 make principal accessible via Subject.getSubject(AccessController.getContext()) when processin filters

Sending web-core/src/main/java/org/apache/catalina/realm/RealmBase.java Transmitting file data . Committed revision 24286.

Sending web-core/src/main/java/org/apache/catalina/core/ApplicationFilterChain.java Sending web-core/src/main/java/org/apache/catalina/security/SecurityUtil.java Transmitting file data .. Committed revision 24285.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat fix: http://svn.apache.org/viewvc?view=rev&revision=729666 http://svn.apache.org/viewvc?view=rev&revision=729666 checkin fix in grizzly trunk/modules/utils/src/main/java/com/sun/grizzly/util/http $ svn commit ServerCookie.java Sending ServerCookie.java Transmitting file data . Committed revision 2203.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Fix issue https://glassfish.dev.java.net/issues/show_bug.cgi?id=6194 Port Tomcat fixes

• http://svn.apache.org/viewvc?view=rev&revision=719550 make private / remove deprecated methods
• http://svn.apache.org/viewvc?view=rev&revision=719550 http://svn.apache.org/viewvc?view=rev&revision=719550
• http://svn.apache.org/viewvc?view=rev&revision=719117 http://svn.apache.org/viewvc?view=rev&revision=718766 generic
• http://svn.apache.org/viewvc?view=rev&revision=711500 fix string comparison in IntrospectionUtils

check fix in Grizzly trunk/modules/utils/src/main/java/com/sun/grizzly $ svn commit Sending grizzly/tcp/Request.java Sending grizzly/tcp/http11/GrizzlyRequest.java Sending grizzly/util/IntrospectionUtils.java Sending grizzly/util/buf/StringCache.java Sending grizzly/util/http/AcceptLanguage.java Sending grizzly/util/http/Enumerator.java Sending grizzly/util/http/HttpRequestURIDecoder.java Sending grizzly/util/http/MimeHeaders.java Sending grizzly/util/http/MimeMap.java Sending grizzly/util/http/Parameters.java Sending grizzly/util/http/mapper/Mapper.java Transmitting file data ........... Committed revision 2204.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat fix http://svn.apache.org/viewvc?view=rev&revision=691282 for issue https://issues.apache.org/bugzilla/show_bug.cgi?id=45628 ("Jars that declare no deps should return that deps are satisfied") Sending web-core/src/main/java/org/apache/catalina/util/ManifestResource.java Transmitting file data . Committed revision 24392.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat fix: http://svn.apache.org/viewvc?view=rev&revision=719835 ("removed deprecated code") Sending web/web-ajp/src/main/java/org/apache/jk/common/ChannelNioSocket.java Sending web/web-ajp/src/main/java/org/apache/jk/common/ChannelSocket.java Sending web/web-ajp/src/main/java/org/apache/jk/common/ChannelUn.java Sending web/web-ajp/src/main/java/org/apache/jk/common/JniHandler.java Sending web/web-ajp/src/main/java/org/apache/jk/common/ModJkMX.java Sending web/web-ajp/src/main/java/org/apache/jk/core/JkHandler.java Sending web/web-ajp/src/main/java/org/apache/jk/server/JkCoyoteHandler.java Sending web/web-ajp/src/main/java/org/apache/jk/server/JkMain.java Sending web/web-ajp/src/main/java/org/apache/tomcat/util/threads/ThreadPool.java Sending web/web-core/src/main/java/com/sun/enterprise/web/connector/grizzly/GrizzlyConnectorLauncher.java Sending web/web-core/src/main/java/org/apache/catalina/connector/Connector.java Sending web/web-core/src/main/java/org/apache/catalina/connector/MapperListener.java Sending web/web-core/src/main/java/org/apache/catalina/core/ContainerBase.java Sending web/web-core/src/main/java/org/apache/catalina/core/StandardContext.java Sending web/web-core/src/main/java/org/apache/catalina/core/StandardDefaultContext.java Sending web/web-core/src/main/java/org/apache/catalina/core/StandardEngine.java Sending web/web-core/src/main/java/org/apache/catalina/core/StandardHost.java Sending web/web-core/src/main/java/org/apache/catalina/core/StandardHostDeployer.java Sending web/web-core/src/main/java/org/apache/catalina/core/StandardPipeline.java Sending web/web-core/src/main/java/org/apache/catalina/core/StandardServer.java Sending web/web-core/src/main/java/org/apache/catalina/core/StandardService.java Sending web/web-core/src/main/java/org/apache/catalina/core/StandardWrapper.java Sending web/web-core/src/main/java/org/apache/catalina/loader/WebappLoader.java Sending web/web-core/src/main/java/org/apache/catalina/logger/LoggerBase.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/ClassNameMBean.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/ContextResourceMBean.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/DefaultContextMBean.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/MBeanFactory.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/MBeanUtils.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/NamingResourcesMBean.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/StandardContextMBean.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/StandardEngineMBean.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/StandardHostMBean.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/StandardServerMBean.java Sending web/web-core/src/main/java/org/apache/catalina/mbeans/StandardServiceMBean.java Sending web/web-core/src/main/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Sending web/web-core/src/main/java/org/apache/catalina/realm/MemoryRealm.java Sending web/web-core/src/main/java/org/apache/catalina/realm/MemoryRuleSet.java Sending web/web-core/src/main/java/org/apache/catalina/realm/RealmBase.java Sending web/web-core/src/main/java/org/apache/catalina/session/ManagerBase.java Sending web/web-core/src/main/java/org/apache/catalina/startup/Catalina.java Sending web/web-core/src/main/java/org/apache/catalina/startup/ContextConfig.java Sending web/web-core/src/main/java/org/apache/catalina/startup/ContextRuleSet.java Sending web/web-core/src/main/java/org/apache/catalina/startup/CopyParentClassLoaderRule.java Sending web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java Sending web/web-core/src/main/java/org/apache/catalina/startup/EngineRuleSet.java Sending web/web-core/src/main/java/org/apache/catalina/startup/HostRuleSet.java Sending web/web-core/src/main/java/org/apache/catalina/startup/LifecycleListenerRule.java Sending web/web-core/src/main/java/org/apache/catalina/startup/NamingRuleSet.java Sending web/web-core/src/main/java/org/apache/catalina/startup/SetAllPropertiesRule.java Sending web/web-core/src/main/java/org/apache/catalina/startup/SetContextPropertiesRule.java Sending web/web-core/src/main/java/org/apache/catalina/startup/SetDocBaseRule.java Sending web/web-core/src/main/java/org/apache/catalina/startup/TldConfig.java Sending web/web-core/src/main/java/org/apache/catalina/startup/TldRuleSet.java Sending web/web-core/src/main/java/org/apache/catalina/startup/WebRuleSet.java Sending web/web-core/src/main/java/org/apache/catalina/util/CatalinaDigester.java Sending web/web-core/src/main/java/org/apache/catalina/util/SchemaResolver.java Sending web/web-core/src/main/java/org/apache/catalina/valves/ValveBase.java Deleting web/web-core/src/main/java/org/apache/commons Adding web/web-core/src/main/java/org/apache/tomcat/util/digester Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/AbstractRulesImpl.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/ArrayStack.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/CallMethodRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/CallParamRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/Digester.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/FactoryCreateRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/GenericParser.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/NodeCreateRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/ObjectCreateRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/ObjectCreationFactory.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/ObjectParamRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/ParserFeatureSetterFactory.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/PathCallParamRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/Rule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/RuleSet.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/RuleSetBase.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/Rules.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/RulesBase.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/SetNextRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertiesRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/SetPropertyRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/SetRootRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/SetTopRule.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java Sending web/web-core/src/main/java/org/apache/tomcat/util/digester/XercesParser.java Adding web/web-core/src/main/java/org/apache/tomcat/util/modeler Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/AttributeInfo.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/ConstructorInfo.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/FeatureInfo.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/FieldInfo.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/ManagedBean.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/NotificationInfo.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/OperationInfo.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/ParameterInfo.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/Registry.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/RegistryMBean.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/modules/MbeansSourceMBean.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/modules/ModelerSource.java Sending web/web-core/src/main/java/org/apache/tomcat/util/modeler/util/DomUtil.java Sending web/web-glue/src/main/java/com/sun/enterprise/web/WebConnector.java Transmitting file data .............................................................................................................. Committed revision 24416.

In Grizzly workspace, Sending src/main/java/com/sun/grizzly/util/http/ServerCookie.java Transmitting file data . Committed revision 2311.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat fix http://svn.apache.org/viewvc?view=rev&revision=701358 for bug https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 Sending web/web-naming/src/main/java/org/apache/naming/resources/FileDirContext.java Transmitting file data . Committed revision 24457

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat changes http://svn.apache.org/viewvc?view=rev&revision=729523 generic changes and clean up Sending web/web-core/src/main/java/org/apache/catalina/session/FileStore.java Sending web/web-core/src/main/java/org/apache/catalina/session/JDBCStore.java Sending web/web-core/src/main/java/org/apache/catalina/session/ManagerBase.java Sending web/web-core/src/main/java/org/apache/catalina/session/PersistentManagerBase.java Sending web/web-core/src/main/java/org/apache/catalina/session/StandardManager.java Sending web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java Sending web/web-core/src/main/java/org/apache/catalina/session/StandardSessionFacade.java Sending web/web-core/src/main/java/org/apache/catalina/session/StoreBase.java Sending web/web-core/src/main/java/org/apache/catalina/util/Enumerator.java Transmitting file data ......... Committed revision 24458.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat changes http://svn.apache.org/viewvc?view=rev&revision=729634 Sending war-util/src/main/java/org/glassfish/web/loader/ResourceEntry.java Sending war-util/src/main/java/org/glassfish/web/loader/WebappClassLoader.java Sending web-core/src/main/java/org/apache/catalina/loader/WebappLoader.java Transmitting file data ... Committed revision 24474.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat change http://svn.apache.org/viewvc?view=rev&revision=709821 fix the issue that line separator should be platform dependent Sending web/web-core/src/main/java/org/apache/catalina/connector/CoyoteWriter.java Transmitting file data . Committed revision 24534.

(In Grizzly) Sending modules/utils/src/main/java/com/sun/grizzly/tcp/http11/GrizzlyWriter.java Transmitting file data . Committed revision 2378.

Port Tomcat change http://svn.apache.org/viewvc?view=rev&revision=729825 use doPrivileged (in Grizzly) Sending modules/http/src/main/java/com/sun/grizzly/http/DefaultProcessorTask.java Transmitting file data . Committed revision 2379.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat changes http://svn.apache.org/viewvc?view=rev&revision=719549 replace deprecated method calls v3/web/web-core/src/main/java/org/apache/catalina/connector $ svn commit Request.java Sending Request.java Transmitting file data . Committed revision 24572.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Fix https://issues.apache.org/bugzilla/attachment.cgi?id=23066 1. Port Tomcat change http://svn.apache.org/viewvc?view=rev&revision=730735 2. Add additional fixes

v3/web/war-util $ svn commit src/main/java/org/glassfish/web/loader/WebappClassLoader.java Sending src/main/java/org/glassfish/web/loader/WebappClassLoader.java Transmitting file data . Committed revision 24579.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: Port Tomcat change http://svn.apache.org/viewvc?view=rev&revision=709811 Change the exception if headers are too big to force a 400 status code rather than the current 200 Sending utils/src/main/java/com/sun/grizzly/tcp/http11/InternalInputBuffer.java Transmitting file data . Committed revision 2427.

[glassfishrobot]

@glassfishrobot Commented @shingwaichan said: The required Tomcat bug fixes has been ported to v3.

[glassfishrobot]

@glassfishrobot Commented File: tomcat_fixes_20080922.txt Attached By: jfarcand

[glassfishrobot]

@glassfishrobot Commented This issue was imported from java.net JIRA GLASSFISH-6194

[glassfishrobot]

@glassfishrobot Commented Reported by jfarcand

[glassfishrobot]

@glassfishrobot Commented Marked as fixed on Monday, November 30th 2009, 6:10:01 am