Bug report for Tomcat 8 [2015/10/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing | |51497|New|Enh|2011-07-11|Use canonical IPv6 text representation in logs| |53737|Opn|Enh|2012-08-18|Use ServletContext.getJspConfigDescriptor() in Jas| |53930|New|Enh|2012-09-24|allow capture of catalina stdout/stderr to a comma| |54503|New|Enh|2013-01-29|SAML2 based single sign on| |54700|New|Enh|2013-03-15|Improvement: Add support for system property to sp| |54741|New|Enh|2013-03-22|Add org.apache.catalina.startup.Tomcat#addWebapp(S| |55006|New|Enh|2013-05-22|Add http proxy support for ClientEndpoint using sy| |55243|New|Enh|2013-07-11|Add special search string for nested roles| |55252|New|Enh|2013-07-12|Separate Ant and command-line wrappers for JspC | |55383|New|Enh|2013-08-07|Improve markup and design of Tomcat's HTML pages | |55479|New|Enh|2013-08-24|JSR 196 (JASPIC) support in Tomcat| |9|New|Enh|2013-09-14|UserDatabaseRealm enhacement: may use local JNDI | |55675|New|Enh|2013-10-18|Checking and handling invalid configuration option| |55770|New|Enh|2013-11-12|Allow the crlFile to be reloaded | |55788|New|Enh|2013-11-16|TagPlugins should key on tag QName rather than imp| |55969|New|Enh|2014-01-07|Security-related enhancements to the Windows Insta| |56166|New|Enh|2014-02-20|Suggestions for exception handling (avoid potentia| |56361|New|Enh|2014-04-08|org.apache.tomcat.websocket.WsWebSocketContainer#b| |56398|New|Enh|2014-04-11|Support Arquillian-based unit testing | |56399|New|Enh|2014-04-11|Re-factor request/response recycling so Coyote and| |56402|New|Enh|2014-04-11|Add support for HTTP Upgrade to AJP components| |56448|New|Enh|2014-04-23|Implement a robust solution for client initiated S| |56546|New|Enh|2014-05-19|Improve thread trace logging in WebappClassLoader.| |56676|New|Enh|2014-06-26|Normalize access to native library| |56713|New|Enh|2014-07-12|Limit time that incoming request waits while webap| |56724|New|Enh|2014-07-15|Restart Container background thread if it died une| |56838|Opn|Enh|2014-08-11|Performance drop when repeatedly calling WebappCla| |56890|Inf|Maj|2014-08-26|getRealPath returns null | |56917|New|Enh|2014-09-05|Create a configuration to write relative 302 respo| |56966|New|Enh|2014-09-11|AccessLogValve's elapsed time has 15ms precision o| |57130|New|Enh|2014-10-22|Allow digest.sh to accept password from a file or | |57287|New|Enh|2014-11-29|Sort files listed by DefaultServlet | |57345|New|Enh|2014-12-12|APR/Native HTTPS Connector Should Support All Open| |57421|New|Enh|2015-01-07|Farming default directories | |57486|New|Enh|2015-01-23|Improve reuse of ProtectedFunctionMapper instances| |57665|New|Enh|2015-03-05|support x-forwarded-host | |57701|New|Enh|2015-03-13|Implement "[Redeploy]" button for a web applicatio| |57799|Inf|Nor|2015-04-08|MessageCreationException: Couldn't create SOAP mes| |57809|New|Enh|2015-04-13|Don't store merged web.xml| |57830|New|Enh|2015-04-18|Add support for ProxyProtocol | |58052|Opn|Enh|2015-06-19|RewriteValve: Implement additional RewriteRule dir| |58072|New|Enh|2015-06-23|ECDH curve selection | |58111|New|Enh|2015-07-07|Update to Eclipse ECJ 4.5 | |58143|Opn|Enh|2015-07-15|The WebppClassLoader doesn't call transformers on | |58283|New|Enh|2015-08-25|Change Base Path to use (user.home) instead of abs| |58431|New|Enh|2015-09-20|AccessLogValve default values for prefix and suffi| |58433|New|Enh|2015-09-21|RemoteIpValve not activated on redirect from mappi| |58486|New|Min|2015-10-07|JreMemoryLeakPreventionListener: initialize two fu| |58518|New|Cri|2015-10-22|SSL connection failed (Time out) | +-+---+---+--+--+ | Total
Bug report for Tomcat Modules [2015/10/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers | |48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite | |48861|New|Nor|2010-03-04|Files without AL headers | |49685|New|Nor|2010-08-02|Unsafe synchronization in class ManagedBean | |49686|New|Nor|2010-08-02|Using an instance lock to protect static shared da| |50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen| |51595|Inf|Nor|2011-08-01|org.apache.tomcat.jdbc.pool.jmx.ConnectionPool sho| |51879|Inf|Enh|2011-09-22|Improve access to Native Connection Methods | |52024|Inf|Enh|2011-10-13|Custom interceptor to support automatic failover o| |53199|Inf|Enh|2012-05-07|Refactor ConnectionPool to use ScheduledExecutorSe| |54437|New|Enh|2013-01-16|Update PoolProperties javadoc for ConnectState int| |54929|Inf|Nor|2013-05-05|jdbc-pool cannot be used with Java 1.5, "java.lang| |55078|New|Nor|2013-06-07|Configuring a DataSource Resource with dataSourceJ| |56046|New|Enh|2014-01-21|org.apache.tomcat.jdbc.pool.XADataSource InitSQL p| |56088|New|Maj|2014-01-29|AbstractQueryReport$StatementProxy throws exceptio| |56310|Inf|Maj|2014-03-25|PooledConnection and XAConnection not handled corr| |56586|New|Nor|2014-06-02|initSQL should be committed if defaultAutoCommit =| |56775|New|Nor|2014-07-28|PoolCleanerTime schedule issue| |56779|New|Nor|2014-07-28|Allow multiple connection initialization statement| |56790|New|Nor|2014-07-29|Resizing pool.maxActive to a higher value at runti| |56798|New|Nor|2014-07-31|Idle eviction strategy could perform better (and i| |56804|New|Nor|2014-08-02|Use a default validationQueryTimeout other than "f| |56805|New|Nor|2014-08-02|datasource.getConnection() may be unnecessarily bl| |56837|New|Nor|2014-08-11|if validationQuery have error with timeBetweenEvic| |56970|New|Nor|2014-09-11|MaxActive vs. MaxTotal for commons-dbcp and tomcat| |56974|New|Nor|2014-09-12|jdbc-pool validation query defaultAutoCommit statu| |57460|New|Nor|2015-01-19|[DB2]Connection broken after few hours but not rem| |57729|New|Enh|2015-03-20|Add QueryExecutionReportInterceptor to log query e| +-+---+---+--+--+ | Total 28 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 6 [2015/10/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat| |43400|New|Enh|2007-09-14|enum support for tag libs | |43742|New|Enh|2007-10-30|.tag compiles performed one at a time -- extremel| |43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output | |44199|New|Enh|2008-01-10|expose current backlog queue size | |44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f| |44294|New|Enh|2008-01-25|Support for EL functions with varargs | |44312|Opn|Enh|2008-01-28|Warn when overwritting docBase of the default Host| |44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam| |44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt| |45014|New|Enh|2008-05-15|Request and Response classes should have wrappers | |45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks| |45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or | |45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE| |45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output| |46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c| |46263|Opn|Enh|2008-11-21|Tomcat reloading of context.xml does not update do| |46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl| |46350|New|Enh|2008-12-05|Maven repository should contain source bundles| |46558|Opn|Enh|2009-01-19|Shutdown port with address binding| |47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho| |47242|New|Enh|2009-05-22|request for AJP command line client | |47281|New|Enh|2009-05-28|Efficiency of the JDBCStore | |47407|New|Enh|2009-06-23|HttpSessionListener doesn't operate in the session| |47467|New|Enh|2009-07-02|Deployment of the war file by URL when contextpath| |47834|New|Enh|2009-09-14|TldConfig throws Exception when exploring unpacked| |48358|Opn|Enh|2009-12-09|JSP-unloading reloaded| |48543|New|Enh|2010-01-14|[Patch] More flexibility in specifying -Dcatalina.| |48672|New|Enh|2010-02-03|Tomcat Virtual Host Manager (/host-manager) have b| |48674|New|Enh|2010-02-03|Tomcat Virtual Host Manager application doesn't pe| |48743|New|Enh|2010-02-15|Make the SLEEP variable in catalina.sh settable fr| |48922|New|Enh|2010-03-16|org.apache.catalina.connector.Request clone static| |48928|New|Enh|2010-03-17|An alternative solution to preloading classes when| |49176|Opn|Enh|2010-04-23|Jasper in Dev Mode Is Memory Inefficient | |49464|New|Enh|2010-06-18|DefaultServlet and CharacterEncoding | |49531|New|Enh|2010-06-30|singlesignon failover not working on DeltaManager/| |49804|New|Enh|2010-08-23|Allow Embedded.redirectStreams value to be configu| |49943|New|Enh|2010-09-16|Logging (via juli) does not reread configuration c| |50285|New|Enh|2010-11-17|Standard HTTP and AJP connectors silently ignore a| |50288|New|Enh|2010-11-17|Uploading a war file that already exists should au| |50677|Opn|Enh|2011-01-27|Allow system property variables in catalina.proper| |50692|New|Enh|2011-01-31|Improve log message in ThreadPool.logFull | |51142|New|Enh|2011-05-03|Offer possible resolution of StringIndexOutOfBound| |51513|New|Enh|2011-07-15|GzipInterceptor: Do not compress small packages | |52791|New|Enh|2012-02-28|[PATCH] read windows installer default values from| |52924|New|Enh|2012-03-15|Add support for per-application JSP compile config| |53011|New|Enh|2012-03-31|Ant Jasper task fails after one error | |53031|New|Enh|2012-04-03|Ant Jasper task should support Fork option| |53677|New|Nor|2012-08-07|ArrayIndexOutOfBoundsException when response heade| |54007|New|Nor|2012-10-15|Improve handling of failed web application deploym| |56607|New|Enh|2014-06-09|shutdown.bat exits before shutdown| |56653|
Bug report for Tomcat Native [2015/10/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48655|Inf|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown| |49038|Inf|Nor|2010-04-02|Crash in tcnative | |52319|Inf|Maj|2011-12-12|Tomcat 6 crashes with [libapr-1.so.0+0x196da] sig| |52627|New|Min|2012-02-08|Segmentation fault in org.apache.tomcat.jni.File.i| |53605|Inf|Nor|2012-07-26|use tcnative-1.1.24 Tomcat shutdown still crash | |53847|Inf|Nor|2012-09-10|High CPU usage in tomcat native 1.22+ | |53940|New|Enh|2012-09-27|Added support for new CRL loading after expiration| |54085|New|Nor|2012-11-01|ssl_socket_recv sometimes loops infinitely with no| |54664|New|Reg|2013-03-11|[1.1.27 branch] Poll.remove incorrectly reports AP| |55087|New|Cri|2013-06-10|tomcat crashes in tcnative-1.dll with OCSP when OC| |55113|Inf|Nor|2013-06-18|FIPS-compatible OpenSSL fails fingerprint test in | |55114|New|Nor|2013-06-18|BUILDING file in win32 source package contains UNI| |55706|New|Nor|2013-10-25|broken apr version check in native v1.1.29 build; | |55771|New|Maj|2013-11-12|Memory leak and then crash in org.apache.tomcat.jn| |55797|Inf|Nor|2013-11-19|Tomcat 7.0.47 crashes using server jvm.dll and APR| |55938|New|Nor|2013-12-29|clang-analyzer report for 1.1.31 | |56027|Opn|Nor|2014-01-17|Unable to use TCN on RHEL6 boxes if box is booted | |56108|New|Cri|2014-02-04|Allow user-defined Diffie-Hellman parameters (secu| |56378|New|Nor|2014-04-09|Cert load fails if cert is located in path with no| |56415|New|Maj|2014-04-16|EXCEPTION_ACCESS_VIOLATION (0xc005) in tcnativ| |56878|New|Trv|2014-08-21|Checking whether unsigned int is less than zero is| |57140|New|Cri|2014-10-24|tcnative-1.dll 1.1.31 indicated in fatal error| |57521|New|Cri|2015-02-02|Tomcat randomly crashes with [libtcnative-1.so.0.1| |57815|New|Enh|2015-04-15|Improve error message when OpenSSL does not suppor| |58058|New|Nor|2015-06-19|Library _instance needs to be volatile| |58081|New|Nor|2015-06-29|Incorrect Java version in README | |58082|New|Nor|2015-06-29|Old version of JUnit specified| |58194|New|Maj|2015-07-30|Tomcat crash EXCEPTION_ACCESS_VIOLATION in tcnativ| |58244|Inf|Nor|2015-08-14|two way SSL loses client certificate after a few r| |58263|New|Nor|2015-08-19|APR SSL connector crashes | |58404|New|Nor|2015-09-13|Duplicate property definitions compile.[source|tar| |58434|New|Nor|2015-09-21|Make Fails Against LibreSSL | +-+---+---+--+--+ | Total 32 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Taglibs [2015/10/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field | |38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)| |42413|New|Enh|2007-05-14|[PATCH] Log Taglib enhancements | |46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l| |48333|New|Enh|2009-12-02|TLD generator | |57434|New|Nor|2015-01-11|Race condition in EL1.0 validation| |57548|New|Min|2015-02-08|Auto-generate the value for org.apache.taglibs.sta| |57684|New|Min|2015-03-10|Version info should be taken from project version | +-+---+---+--+--+ | Total8 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 9 [2015/10/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |57505|New|Enh|2015-01-27|Add integration tests for JspC| |57661|New|Enh|2015-03-04|Delay sending of 100 continue response until appli| |57767|New|Enh|2015-03-27|Websocket client proprietary configuration| |58242|New|Enh|2015-08-13|Scanning jars in classpath to get annotations in p| |58530|New|Enh|2015-10-23|Proposal for new Manager HTML GUI | +-+---+---+--+--+ | Total5 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Connectors [2015/10/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName| |43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn| |45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff| |45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so| |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47327|New|Enh|2009-06-07|Return tomcat authenticated user back to mod_jk (A| |47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_| |47714|Opn|Cri|2009-08-20|Response mixed between users | |47750|New|Maj|2009-08-27|ISAPI: Loss of worker settings when changing via j| |47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit| |48490|Inf|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert| |48513|New|Enh|2010-01-09|IIS Quick setup instructions | |48564|New|Enh|2010-01-18|Allow to turn off retries for LB worker | |48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv| |49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work| |49135|New|Enh|2010-04-16|SPDY Connector for The Tomcat | |49732|Inf|Nor|2010-08-10|reply_timeout can't wait forever. | |49822|New|Enh|2010-08-25|Add hash lb worker method | |49903|New|Enh|2010-09-09|Make workers file reloadable | |52483|New|Enh|2012-01-18|Print JkOptions's options in log file and jkstatus| |53883|New|Maj|2012-09-17|isapi_redirect v 1.2.37 crashes w3wp.exe on the p| |53977|New|Maj|2012-10-07|32bits isapi connector cannot work in wow64 mode | |54027|New|Cri|2012-10-18|isapi send request to outside address instead of i| |54117|New|Maj|2012-11-08|access violation exception in isapi_redirect.dll | |54596|Opn|Nor|2013-02-22|Relative path functionality truncates last charact| |54621|New|Nor|2013-02-28|[PATCH] custom mod_jk availability checks | |54923|New|Nor|2013-05-03|nsapi_redirect.so does not work with iPlanet on So| |56489|New|Enh|2014-05-05|Include a directory for configuration files | |56576|New|Enh|2014-05-29|Websocket support | |57066|New|Cri|2014-10-08|isapi_redirect.dll is crashing intermittently when| |57402|New|Enh|2014-12-30|Provide correlation ID between mod_jk log and acce| |57403|New|Enh|2014-12-30|Persist configuration changes made via status work| |57407|New|Enh|2014-12-31|Make session_cookie, session_path and session_cook| |57485|New|Nor|2015-01-23|mod_jk passed the incomplete chunked transferred r| |57790|New|Enh|2015-04-03|Check worker names for typos | |57946|New|Nor|2015-05-23|Configuration example for mod_jk should be updated| |58249|New|Nor|2015-08-17|Documentation regarding max_packet_size parameter | |58287|New|Nor|2015-08-26|Questionable use of "Global" objects on Windows | |58425|New|Nor|2015-09-17|validate::jk_ajp12_worker.c always returns JK_FALS| |58481|New|Nor|2015-10-05|JAX WS Request fails with "Premature end of file" | |58504|New|Nor|2015-10-19|Maintenance process skipped occasionally | +-+---+---+--+--+ | Total 41 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 7 [2015/10/25]
+---+
| Bugzilla Bug ID |
| +-+
| | Status: UNC=Unconfirmed NEW=New ASS=Assigned|
| | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) |
| | +-+
| | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major |
| | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial |
| | | +-+
| | | | Date Posted |
| | | | +--+
| | | | | Description |
| | | | | |
|18500|New|Enh|2003-03-30|Host aliases to match by regular expression |
|41007|Opn|Enh|2006-11-20|Can't define customized 503 error page|
|43866|New|Enh|2007-11-14|add support for session attribute propagation with|
|49395|New|Enh|2010-06-06|manager.findLeaks : display the date when the leak|
|49589|New|Enh|2010-07-12|Tag handlers with constant attribute values are al|
|49821|New|Enh|2010-08-25|Tomcat CLI [PATCH/Contribution] |
|50019|New|Enh|2010-09-28|Adding JNDI "lookup-name" support In XML and Resou|
|50175|New|Enh|2010-10-28|Enhance memory leak detection by selectively apply|
|50234|New|Enh|2010-11-08|JspC use servlet 3.0 features |
|50670|New|Enh|2011-01-27|Tribes | RpcChannel | Add option to specify extern|
|50944|Ver|Blk|2011-03-18|JSF: java.lang.NullPointerException at com.sun.fac|
|51195|New|Enh|2011-05-13|"Find leaks" reports a false positive memory/class|
|51423|Inf|Enh|2011-06-23|[Patch] to add a path and a version parameters to |
|51463|New|Enh|2011-07-01|Tomcat.setBaseDir (package org.apache.catalina.st|
|51496|New|Enh|2011-07-11|NSIS - Warn that duplicate service name will resul|
|51587|New|Enh|2011-07-29|Implement status and uptime commands |
|51953|New|Enh|2011-10-04|Proposal: netmask filtering valve and filter [PATC|
|52235|New|Enh|2011-11-23|Please do a bit of SEO tuning for the web site|
|52381|New|Enh|2011-12-22|Please add OSGi metadata |
|52448|New|Enh|2012-01-11|Cache jar indexes in WebappClassLoader to speed up|
|52489|New|Enh|2012-01-19|Enhancement request for code signing of war files |
|52688|New|Enh|2012-02-16|Add ability to remove old access log files [PATCHE|
|52952|New|Enh|2012-03-20|Improve ExtensionValidator handling for embedded s|
|53085|New|Enh|2012-04-16|[perf] [concurrency] DefaultInstanceManager.annota|
|53387|New|Enh|2012-06-08|SSI: Allow to use $1 to get result of regular expr|
|53411|Opn|Enh|2012-06-13|NullPointerException in org.apache.tomcat.util.buf|
|53492|New|Enh|2012-07-01|Make JspC shell multithreaded |
|53553|New|Enh|2012-07-16|[PATCH] Deploy uploaded WAR with context.xml from |
|53620|New|Enh|2012-07-30|[juli] delay opening a file until something gets l|
|54330|New|Enh|2012-12-19|Patch with some refactoring of Member.java [PATCH |
|54499|New|Enh|2013-01-29|Implementation of Extensible EL Interpreter |
|54802|New|Enh|2013-04-04|Provide location information for exceptions thrown|
|55104|New|Enh|2013-06-16|Allow passing arguments with spaces to Commons Dae|
|55470|New|Enh|2013-08-23|Help users for ClassNotFoundExceptions during star|
|55477|New|Enh|2013-08-23|Add a solution to map an realm name to a security |
|55662|New|Enh|2013-10-17|Add a way to set an instance of java.sql.Driver di|
|56148|New|Enh|2014-02-17|support (multiple) ocsp stapling |
|56181|New|Enh|2014-02-23|RemoteIpValve & RemoteIpFilter: HttpServletRequest|
|56300|New|Enh|2014-03-22|[Tribes] No useful examples, lack of documentation|
|56438|New|Enh|2014-04-21|If jar scan does not find context config or TLD co|
|56614|New|Enh|2014-06-12|Add a switch to ignore annotations detection on ta|
|56777|Opn|Enh|2014-07-28|Allow configuration resources to be loaded from pl|
|56787|New|Enh|2014-07-29|Simplified jndi name parsing |
|57136|Opn|Nor|2014-10-24|EL Parser escaping dollar sign not ${ or ${...} |
|57367|New|Enh|2014-12-18|If JAR scan experiences a stack overflow, give the|
|57705|New|Enh|2015-03-14|RemoteAddrValve: no log message no explanation whe|
|57827|New|Enh|2015-04-17|Enable adding/removing of members via jmx in a sta|
|57870|New|Enh|2015-04-29|backport GzipOutputFilter #doWrite to Tomcat 7 to |
|57872|New|Enh|2015-04-29|Do not auto-switch session cookie to version=1 due|
|57892|New|Enh|2015-05-05|Log once a warning if a symbolic link is ignored (|
|57906|New|Min|2015-05-08|Message about failure to load ApplicationContextFa|
|57937|
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 46 mins 42 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151025-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20151025/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151025.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151025-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true - Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20151025/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/outpu
Re: [ANN] New committer: Ognjen Blagojevic
Am 24.10.2015 um 15:58 schrieb Mark Thomas: On behalf of the Tomcat committers I am pleased to announce that Ognjen Blagojevic (ognjen) has been voted in as a new Tomcat committer. Please join me in welcoming him. Congrats! Felix Regards, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710441 - /tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Author: markt
Date: Sun Oct 25 13:31:48 2015
New Revision: 1710441
URL: http://svn.apache.org/viewvc?rev=1710441&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58486
Protect against two further possible memory leaks associated with XML
parsing
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1710441&r1=1710440&r2=1710441&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Sun Oct 25 13:31:48 2015
@@ -27,6 +27,7 @@ import java.sql.DriverManager;
import java.util.StringTokenizer;
import javax.imageio.ImageIO;
+import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -38,6 +39,8 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.compat.JreVendor;
import org.apache.tomcat.util.res.StringManager;
+import org.w3c.dom.Document;
+import org.w3c.dom.ls.DOMImplementationLS;
/**
* Provide a workaround for known places where the Java Runtime environment can
@@ -423,15 +426,27 @@ public class JreMemoryLeakPreventionList
}
/*
- * Haven't got to the root of what is going on with this leak
- * but if a web app is the first to make the calls below the
web
- * application class loader will be pinned in memory.
+ * Various leaks related to the use of XML parsing.
*/
if (xmlParsingProtection) {
-DocumentBuilderFactory factory =
-DocumentBuilderFactory.newInstance();
+/*
+ * Haven't got to the root of what is going on with this
+ * leak but if a web app is the first to make the following
+ * two calls the web application class loader will be
pinned
+ * in memory.
+ */
+DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
try {
-factory.newDocumentBuilder();
+DocumentBuilder documentBuilder =
factory.newDocumentBuilder();
+// Bug 58486 identified two additional memory leaks.
+// The first is in DOMSerializerImpl.abort
+Document document = documentBuilder.newDocument();
+document.createElement("dummy");
+DOMImplementationLS implementation =
+
(DOMImplementationLS)document.getImplementation();
+
implementation.createLSSerializer().writeToString(document);
+// The second leak is in DOMNormalizer
+document.normalize();
} catch (ParserConfigurationException e) {
log.error(sm.getString("jreLeakListener.xmlParseFail"),
e);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710442 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml
Author: markt Date: Sun Oct 25 13:35:35 2015 New Revision: 1710442 URL: http://svn.apache.org/viewvc?rev=1710442&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58486 Protect against two further possible memory leaks associated with XML parsing Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 25 13:35:35 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1 37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577 2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290
svn commit: r1710443 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml
Author: markt Date: Sun Oct 25 13:37:41 2015 New Revision: 1710443 URL: http://svn.apache.org/viewvc?rev=1710443&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58486 Protect against two further possible memory leaks associated with XML parsing Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 25 13:37:41 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345
[Bug 58486] JreMemoryLeakPreventionListener: initialize two further JRE classes
https://bz.apache.org/bugzilla/show_bug.cgi?id=58486 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Mark Thomas --- Fixed in trunk, 8.0.x (for 8.0.29) and 7.0.x (for 7.0.66). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Adding request/session valve to Tomcat
Hello, There are some default valves available with Tomcat. None of these expose the request to later phases in the request cycle. Is it an idea to add a valve that does this? And make this available through a callback in the jaas loginModule. Just like WebLogic and Websphere do it. Or just use a static threadlocal variable in the valve with a static getter. Why? If the jaas login module needs to communicate anything to the filter or other request phases this is needed. When the request is available this info can (for example) be added to the session. Or when someone wants to use request info for jaas authentication this could also be used. Thanks for any ideas or comments. MAG, Milo van der Zee - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710445 - /tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
Author: markt
Date: Sun Oct 25 13:40:52 2015
New Revision: 1710445
URL: http://svn.apache.org/viewvc?rev=1710445&view=rev
Log:
https://bz.apache.org/bugzilla/show_bug.cgi?id=58518
Fix a regression in BZ 56777 (that added support for URIs in config file
locations)
File paths on Windows could previously be specified with \ or / as the
separator. BZ 56777 broke that. This commit restores that behaviour.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java?rev=1710445&r1=1710444&r2=1710445&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java Sun Oct
25 13:40:52 2015
@@ -30,11 +30,12 @@ import java.net.URL;
*/
public class ConfigFileLoader {
+private static final File CATALINA_BASE_FILE;
private static final URI CATALINA_BASE_URI;
static {
-File catalinaBase = new File(System.getProperty("catalina.base"));
-CATALINA_BASE_URI = catalinaBase.toURI();
+CATALINA_BASE_FILE = new File(System.getProperty("catalina.base"));
+CATALINA_BASE_URI = CATALINA_BASE_FILE.toURI();
}
private ConfigFileLoader() {
@@ -59,17 +60,30 @@ public class ConfigFileLoader {
// Absolute URIs will be left alone
// Relative files will be resolved relative to catalina base
// Absolute files will be converted to URIs
-URI uri;
-if (location != null &&
-(location.length() > 2 && ":\\".equals(location.substring(1,
3)) ||
-location.startsWith(""))) {
-// This is an absolute file path in Windows or a UNC path
-File f = new File(location);
-uri =f.getAbsoluteFile().toURI();
-} else {
-// URL, relative path or an absolute path on a non-Windows
platforms
+
+URI uri = null;
+
+// Location was originally always a file before URI support was added
so
+// try file first.
+
+// First guess, an absolute file path
+File f = new File(location);
+if (!f.isFile()) {
+// Second guess, a file path relative to CATALINA_BASE
+if (!f.isAbsolute()) {
+f = new File(CATALINA_BASE_FILE, location);
+}
+}
+if (f.isFile()) {
+uri = f.getAbsoluteFile().toURI();
+}
+
+if (uri == null) {
+// Third and final guess, a URI
uri = CATALINA_BASE_URI.resolve(location);
}
+
+// Obtain the input stream we need
URL url = uri.toURL();
return url.openConnection().getInputStream();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710447 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/file/ConfigFileLoader.java webapps/docs/changelog.xml
Author: markt Date: Sun Oct 25 13:45:28 2015 New Revision: 1710447 URL: http://svn.apache.org/viewvc?rev=1710447&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58518 Fix a regression in BZ 56777 (that added support for URIs in config file locations) File paths on Windows could previously be specified with \ or / as the separator. BZ 56777 broke that. This commit restores that behaviour. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 25 13:45:28 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1 37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577 2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,
[Bug 58518] SSL connection failed (Time out)
https://bz.apache.org/bugzilla/show_bug.cgi?id=58518 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED OS||All --- Comment #1 from Mark Thomas --- This was a regression in bug 56777. This has been fixed in trunk and 8.0.x for 8.0.29. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710448 - in /tomcat/tc8.0.x/trunk: java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml
Author: markt Date: Sun Oct 25 13:50:02 2015 New Revision: 1710448 URL: http://svn.apache.org/viewvc?rev=1710448&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58497 Make AbstractHttp11Processor easy to extend Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1710448&r1=1710447&r2=1710448&view=diff == --- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Sun Oct 25 13:50:02 2015 @@ -927,7 +927,7 @@ public abstract class AbstractHttp11Proc } } -abstract void actionInternal(ActionCode actionCode, Object param); +protected abstract void actionInternal(ActionCode actionCode, Object param); /** @@ -1585,7 +1585,7 @@ public abstract class AbstractHttp11Proc return connection.equals(Constants.CLOSE); } -abstract boolean prepareSendfile(OutputFilter[] outputFilters); +protected abstract boolean prepareSendfile(OutputFilter[] outputFilters); /** * Parse host. Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1710448&r1=1710447&r2=1710448&view=diff == --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Sun Oct 25 13:50:02 2015 @@ -56,6 +56,10 @@ javax.servlet.ServletContainerInitializer in case the web application is not extracted. (violetagg) + +58497: Make AbstractHttp11Processor easy to +extend. (markt) + 58508: Escape role names when generating associated MBeans in case the role name contains characters not permitted in an MBean name. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710449 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml
Author: markt Date: Sun Oct 25 13:52:14 2015 New Revision: 1710449 URL: http://svn.apache.org/viewvc?rev=1710449&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58497 Make AbstractHttp11Processor easy to extend Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 25 13:52:14 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442 +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448 /tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,117559
[Bug 58497] Unable to have a custom implementation of AbstractHttp11Processor due to package private methods
https://bz.apache.org/bugzilla/show_bug.cgi?id=58497 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #3 from Mark Thomas --- Tomcat's connectors were originally designed with this sort of use in mind although it is likely that over time some changes have crept in that are unhelpful in this regard. Ideally, you should be able to do this by extending existing abstract base classes / overriding existing implementations depending on how close the current code is to what you need. If you spot changes (splitting up methods, changing visibility, adding accessors, etc.) that would make this easier we are happy to consider them. (Please open additional BZ issue for such requests.) I have made the methods in question protected in 8.0.x and 7.0.x. The connectors were refactored further in 8.0.x and significantly so in 9.0.x. It is worth you taking a look at 9.0.x as that is still in development and any changes you might need so enable a future upgrade to 9.0.x will be much easier to make sooner rather than later. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710450 - /tomcat/tc7.0.x/trunk/test/tld/
Author: kkolinko Date: Sun Oct 25 13:54:21 2015 New Revision: 1710450 URL: http://svn.apache.org/viewvc?rev=1710450&view=rev Log: Remove empty directory added in r1704294 Removed: tomcat/tc7.0.x/trunk/test/tld/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] New committer: Ognjen Blagojevic
2015-10-24 16:58 GMT+03:00 Mark Thomas : > On behalf of the Tomcat committers I am pleased to announce that > Ognjen Blagojevic (ognjen) has been voted in as a new Tomcat committer. > > Please join me in welcoming him. > Welcome, Ognjen! Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1710445 - /tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
2015-10-25 16:40 GMT+03:00 :
> Author: markt
> Date: Sun Oct 25 13:40:52 2015
> New Revision: 1710445
>
> URL: http://svn.apache.org/viewvc?rev=1710445&view=rev
> Log:
> https://bz.apache.org/bugzilla/show_bug.cgi?id=58518
> Fix a regression in BZ 56777 (that added support for URIs in config file
> locations)
> File paths on Windows could previously be specified with \ or / as the
> separator. BZ 56777 broke that. This commit restores that behaviour.
>
> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
>
> Modified: tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java?rev=1710445&r1=1710444&r2=1710445&view=diff
> ==
> --- tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
> (original)
> +++ tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java Sun
> Oct 25 13:40:52 2015
> @@ -30,11 +30,12 @@ import java.net.URL;
> */
> public class ConfigFileLoader {
>
> +private static final File CATALINA_BASE_FILE;
> private static final URI CATALINA_BASE_URI;
>
> static {
> -File catalinaBase = new File(System.getProperty("catalina.base"));
> -CATALINA_BASE_URI = catalinaBase.toURI();
> +CATALINA_BASE_FILE = new File(System.getProperty("catalina.base"));
> +CATALINA_BASE_URI = CATALINA_BASE_FILE.toURI();
> }
>
> private ConfigFileLoader() {
> @@ -59,17 +60,30 @@ public class ConfigFileLoader {
> // Absolute URIs will be left alone
> // Relative files will be resolved relative to catalina base
> // Absolute files will be converted to URIs
> -URI uri;
> -if (location != null &&
> -(location.length() > 2 && ":\\".equals(location.substring(1,
> 3)) ||
> -location.startsWith(""))) {
> -// This is an absolute file path in Windows or a UNC path
> -File f = new File(location);
> -uri =f.getAbsoluteFile().toURI();
> -} else {
> -// URL, relative path or an absolute path on a non-Windows
> platforms
> +
> +URI uri = null;
> +
> +// Location was originally always a file before URI support was
> added so
> +// try file first.
> +
> +// First guess, an absolute file path
> +File f = new File(location);
> +if (!f.isFile()) {
> +// Second guess, a file path relative to CATALINA_BASE
> +if (!f.isAbsolute()) {
> +f = new File(CATALINA_BASE_FILE, location);
> +}
> +}
> +if (f.isFile()) {
> +uri = f.getAbsoluteFile().toURI();
> +}
> +
> +if (uri == null) {
> +// Third and final guess, a URI
> uri = CATALINA_BASE_URI.resolve(location);
> }
> +
> +// Obtain the input stream we need
> URL url = uri.toURL();
> return url.openConnection().getInputStream();
> }
This implementation is OK, but performs a bit more work than necessary.
1) Calling isFile() twice -> accessing hard drive twice
2) Conversion File -> URI -> URL -> parsing a file: URL -> ... just
to open an InputStream for a known File.
Maybe add some debug logging to print out what location for the config
file was actually used.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] New committer: Ognjen Blagojevic
Congratulations, Ognjen!
buildbot success in ASF Buildbot on tomcat-8-trunk
The Buildbot has detected a restored build on builder tomcat-8-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-8-trunk/builds/194 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' triggered this build Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1710442 Blamelist: markt Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710456 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Sun Oct 25 15:51:23 2015 New Revision: 1710456 URL: http://svn.apache.org/viewvc?rev=1710456&view=rev Log: Amend changelog for 7.0.62. Mention that the PRESERVE_COOKIE_HEADER setting added by r1675821 is also controlled by STRICT_SERVLET_COMPLIANCE property. Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1710456&r1=1710455&r2=1710456&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Oct 25 15:51:23 2015 @@ -692,6 +692,7 @@ unescaping double quotes in a cookie value does not corrupt original value of "cookie" header. This is an opt-in feature, enabled by org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER +or org.apache.catalina.STRICT_SERVLET_COMPLIANCE system property. (kkolinko) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
RE: [ANN] New committer: Ognjen Blagojevic
> -Original Message- > From: Mark Thomas [mailto:ma...@apache.org] > Sent: Saturday, October 24, 2015 3:59 PM > > On behalf of the Tomcat committers I am pleased to announce that > Ognjen Blagojevic (ognjen) has been voted in as a new Tomcat committer. > > Please join me in welcoming him. Welcome! Regards, Konstantin Preißer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710457 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/http/Cookies.java webapps/docs/changelog.xml webapps/docs/config/systemprops.xml
Author: kkolinko
Date: Sun Oct 25 16:02:03 2015
New Revision: 1710457
URL: http://svn.apache.org/viewvc?rev=1710457&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57896
Backport org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER option
This is backport of r1675821 and r1678180 from Tomcat 7.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1710457&r1=1710456&r2=1710457&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Oct 25 16:02:03 2015
@@ -28,22 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57896
- Backport org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER
option
-
- Like in Tomcat 7, the fix is to be applied to the call to
- Cookies.processCookieHeader(byte[], int, int)
-
- In Tomcat 6 there is also a call to Cookies.processCookieHeader(String) when
- header value is already a String, but that call does not need this fix, as
- String is immutable, and that method does not perform decoding of embedded
'\"'.
- It only strips surrounding '"'s in a value.
-
- http://svn.apache.org/r1675821 (fix)
- http://svn.apache.org/r1678180 (documentation)
- +1: kkolinko, markt, remm
- -1:
-
* Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57943
Prevent the same socket being added to the cache twice. Patch based on
analysis by Ian Luo / Sun Qi.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java?rev=1710457&r1=1710456&r2=1710457&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/Cookies.java Sun Oct
25 16:02:03 2015
@@ -52,6 +52,12 @@ public final class Cookies { // extends
*/
public static final boolean ALLOW_EQUALS_IN_VALUE;
+/**
+ * If set to true, the cookie header will be preserved. In most cases
+ * except debugging, this is not useful.
+ */
+public static final boolean PRESERVE_COOKIE_HEADER;
+
/*
List of Separator Characters (see isSeparator())
Excluding the '/' char violates the RFC, but
@@ -75,6 +81,15 @@ public final class Cookies { // extends
ALLOW_EQUALS_IN_VALUE = Boolean.valueOf(System.getProperty(
"org.apache.tomcat.util.http.ServerCookie.ALLOW_EQUALS_IN_VALUE",
"false")).booleanValue();
+
+String preserveCookieHeader = System.getProperty(
+
"org.apache.tomcat.util.http.ServerCookie.PRESERVE_COOKIE_HEADER");
+if (preserveCookieHeader == null) {
+PRESERVE_COOKIE_HEADER = ServerCookie.STRICT_SERVLET_COMPLIANCE;
+} else {
+PRESERVE_COOKIE_HEADER =
+Boolean.valueOf(preserveCookieHeader).booleanValue();
+}
}
/**
@@ -201,10 +216,18 @@ public final class Cookies { // extends
// Uncomment to test the new parsing code
if( cookieValue.getType() == MessageBytes.T_BYTES ) {
if( dbg>0 ) log( "Parsing b[]: " + cookieValue.toString());
-ByteChunk bc=cookieValue.getByteChunk();
-processCookieHeader( bc.getBytes(),
- bc.getOffset(),
- bc.getLength());
+ByteChunk bc = cookieValue.getByteChunk();
+if (PRESERVE_COOKIE_HEADER) {
+int len = bc.getLength();
+if (len > 0) {
+byte[] buf = new byte[len];
+System.arraycopy(bc.getBytes(), bc.getOffset(), buf,
0, len);
+processCookieHeader(buf, 0, len);
+}
+} else {
+processCookieHeader(bc.getBytes(), bc.getOffset(),
+bc.getLength());
+}
} else {
if( dbg>0 ) log( "Parsing S: " + cookieValue.toString());
processCookieHeader( cookieValue.toString() );
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1710457&r1=1710456&r2=1710457&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (
[Bug 57896] Option to preserve original cookie header when unquoting cookie value
https://bz.apache.org/bugzilla/show_bug.cgi?id=57896 Konstantin Kolinko changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #2 from Konstantin Kolinko --- Implemented in Tomcat 6 by r1710457 and will be in 6.0.45. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] New committer: Ognjen Blagojevic
2015-10-24 16:58 GMT+03:00 Mark Thomas : > > On behalf of the Tomcat committers I am pleased to announce that > Ognjen Blagojevic (ognjen) has been voted in as a new Tomcat committer. > > Please join me in welcoming him. Welcome! Regards, Violeta > Regards, > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
svn propchange: r1688911 - svn:log
Author: kkolinko Revision: 1688911 Modified property: svn:log Modified: svn:log at Sun Oct 25 16:24:22 2015 -- --- svn:log (original) +++ svn:log Sun Oct 25 16:24:22 2015 @@ -0,0 +1 @@ +Followup to r1688909 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710463 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Oct 25 16:25:02 2015 New Revision: 1710463 URL: http://svn.apache.org/viewvc?rev=1710463&view=rev Log: vote Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1710463&r1=1710462&r2=1710463&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Oct 25 16:25:02 2015 @@ -33,7 +33,7 @@ PATCHES PROPOSED TO BACKPORT: analysis by Ian Luo / Sun Qi. http://svn.apache.org/r1688909 http://svn.apache.org/r1688911 - +1: markt, remm + +1: markt, remm, kkolinko -1: * Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710464 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Oct 25 16:48:15 2015 New Revision: 1710464 URL: http://svn.apache.org/viewvc?rev=1710464&view=rev Log: Add a note Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1710464&r1=1710463&r2=1710464&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Oct 25 16:48:15 2015 @@ -35,6 +35,8 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/r1688911 +1: markt, remm, kkolinko -1: + kkolinko: Technically, this also includes http://svn.apache.org/r1646468 + (adding return value to cancelledKey() method, the rest is superseded by r1688909) * Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58031 Provide a mechanism to enable a 413 response if maxPostSize is exceeded while - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1710445 - /tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
2015-10-25 16:09 GMT+02:00 Konstantin Kolinko :
>
> 2015-10-25 16:40 GMT+03:00 :
> > Author: markt
> > Date: Sun Oct 25 13:40:52 2015
> > New Revision: 1710445
> >
> > URL: http://svn.apache.org/viewvc?rev=1710445&view=rev
> > Log:
> > https://bz.apache.org/bugzilla/show_bug.cgi?id=58518
> > Fix a regression in BZ 56777 (that added support for URIs in config file
> > locations)
> > File paths on Windows could previously be specified with \ or / as the
> > separator. BZ 56777 broke that. This commit restores that behaviour.
> >
> > Modified:
> > tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
> >
> > Modified:
tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
> > URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java?rev=1710445&r1=1710444&r2=1710445&view=diff
> >
==
> > --- tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
(original)
> > +++ tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
Sun Oct 25 13:40:52 2015
> > @@ -30,11 +30,12 @@ import java.net.URL;
> > */
> > public class ConfigFileLoader {
> >
> > +private static final File CATALINA_BASE_FILE;
> > private static final URI CATALINA_BASE_URI;
> >
> > static {
> > -File catalinaBase = new
File(System.getProperty("catalina.base"));
> > -CATALINA_BASE_URI = catalinaBase.toURI();
> > +CATALINA_BASE_FILE = new
File(System.getProperty("catalina.base"));
> > +CATALINA_BASE_URI = CATALINA_BASE_FILE.toURI();
> > }
> >
> > private ConfigFileLoader() {
> > @@ -59,17 +60,30 @@ public class ConfigFileLoader {
> > // Absolute URIs will be left alone
> > // Relative files will be resolved relative to catalina base
> > // Absolute files will be converted to URIs
> > -URI uri;
> > -if (location != null &&
> > -(location.length() > 2 &&
":\\".equals(location.substring(1, 3)) ||
> > -location.startsWith(""))) {
> > -// This is an absolute file path in Windows or a UNC path
> > -File f = new File(location);
> > -uri =f.getAbsoluteFile().toURI();
> > -} else {
> > -// URL, relative path or an absolute path on a non-Windows
platforms
> > +
> > +URI uri = null;
> > +
> > +// Location was originally always a file before URI support
was added so
> > +// try file first.
> > +
> > +// First guess, an absolute file path
> > +File f = new File(location);
> > +if (!f.isFile()) {
> > +// Second guess, a file path relative to CATALINA_BASE
> > +if (!f.isAbsolute()) {
> > +f = new File(CATALINA_BASE_FILE, location);
> > +}
> > +}
> > +if (f.isFile()) {
> > +uri = f.getAbsoluteFile().toURI();
> > +}
> > +
> > +if (uri == null) {
> > +// Third and final guess, a URI
> > uri = CATALINA_BASE_URI.resolve(location);
> > }
> > +
> > +// Obtain the input stream we need
> > URL url = uri.toURL();
> > return url.openConnection().getInputStream();
> > }
>
>
> This implementation is OK, but performs a bit more work than necessary.
>
> 1) Calling isFile() twice -> accessing hard drive twice
> 2) Conversion File -> URI -> URL -> parsing a file: URL -> ... just
> to open an InputStream for a known File.
I also have problems with spaces in the path
java.lang.IllegalArgumentException: Illegal character in path at index 12:
c:/...
at java.net.URI.create(URI.java:859)
at java.net.URI.resolve(URI.java:1043)
at
org.apache.tomcat.util.file.ConfigFileLoader.getInputStream(ConfigFileLoader.java:83)
> Maybe add some debug logging to print out what location for the config
> file was actually used.
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
svn commit: r1710466 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: kkolinko
Date: Sun Oct 25 17:32:49 2015
New Revision: 1710466
URL: http://svn.apache.org/viewvc?rev=1710466&view=rev
Log:
CTR. Apply auto-formatting to try/catch blocks to simplify comparison with
Tomcat 7 code. No functional change.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1710466&r1=1710465&r2=1710466&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun
Oct 25 17:32:49 2015
@@ -1555,9 +1555,24 @@ public class NioEndpoint extends Abstrac
key.attach(null);
if (ka!=null) handler.release(ka.getChannel());
if (key.isValid()) key.cancel();
-if (key.channel().isOpen()) try {key.channel().close();}catch
(Exception ignore){}
-try {if (ka!=null) ka.channel.close(true);}catch (Exception
ignore){}
-try {if (ka!=null && ka.getSendfileData()!=null &&
ka.getSendfileData().fchannel!=null && ka.getSendfileData().fchannel.isOpen())
ka.getSendfileData().fchannel.close();}catch (Exception ignore){}
+if (key.channel().isOpen()) {
+try {
+key.channel().close();
+} catch (Exception ignore) {
+}
+}
+try {
+if (ka != null)
+ka.channel.close(true);
+} catch (Exception ignore) {
+}
+try {
+if (ka != null && ka.getSendfileData() != null
+&& ka.getSendfileData().fchannel != null
+&& ka.getSendfileData().fchannel.isOpen())
+ka.getSendfileData().fchannel.close();
+} catch (Exception ignore) {
+}
if (ka!=null) ka.reset();
} catch (Throwable e) {
if ( log.isDebugEnabled() ) log.error("",e);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710467 - /tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Author: kkolinko
Date: Sun Oct 25 17:50:03 2015
New Revision: 1710467
URL: http://svn.apache.org/viewvc?rev=1710467&view=rev
Log:
Simplify. Followup to r1688909.
The private close() method called here already has try/catch(Exception) around
all the code.
This change was part of original r1688904 in Tomcat 8, but was missed during
backport.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1710467&r1=1710466&r2=1710467&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun
Oct 25 17:50:03 2015
@@ -1758,11 +1758,7 @@ public class NioEndpoint extends Abstrac
}
if (state == SocketState.CLOSED) {
// Close socket and pool
-try {
-close(ka, socket, key, SocketStatus.ERROR);
-} catch ( Exception x ) {
-log.error("",x);
-}
+close(ka, socket, key, SocketStatus.ERROR);
}
} else if (handshake == -1 ) {
close(ka, socket, key, SocketStatus.DISCONNECT);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710473 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml
Author: kkolinko
Date: Sun Oct 25 18:26:23 2015
New Revision: 1710473
URL: http://svn.apache.org/viewvc?rev=1710473&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57943
Prevent the same socket being added to the cache twice. Patch based on
analysis by Ian Luo / Sun Qi.
http://svn.apache.org/r1688909
http://svn.apache.org/r1688911
CTR: The backport also includes changes from the following commits:
http://svn.apache.org/r1302839
- Adding (attachment == null) check in processSocket().
This suppresses a log message described in BZ 52926.
A trivial fix. As the whole method is wrapped by try/catch(Throwable) the only
effect from this is to skip logging a message.
http://svn.apache.org/r1646466
http://svn.apache.org/r1646468
- Changing cancelledKey() method to return KeyAttachment if cancelling was
successful and null if not (e.g. canceled by another thread)
http://svn.apache.org/r1710467
- Trivial followup to r1688909 removing unneeded code. This was part of
original fix in Tomcat 8.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1710473&r1=1710472&r2=1710473&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Oct 25 18:26:23 2015
@@ -28,16 +28,6 @@ None
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57943
- Prevent the same socket being added to the cache twice. Patch based on
- analysis by Ian Luo / Sun Qi.
- http://svn.apache.org/r1688909
- http://svn.apache.org/r1688911
- +1: markt, remm, kkolinko
- -1:
- kkolinko: Technically, this also includes http://svn.apache.org/r1646468
- (adding return value to cancelledKey() method, the rest is superseded by
r1688909)
-
* Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58031
Provide a mechanism to enable a 413 response if maxPostSize is exceeded while
processing parameters
Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1710473&r1=1710472&r2=1710473&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Sun
Oct 25 18:26:23 2015
@@ -1269,6 +1269,9 @@ public class NioEndpoint extends Abstrac
protected boolean processSocket(NioChannel socket, SocketStatus status,
boolean dispatch) {
try {
KeyAttachment attachment =
(KeyAttachment)socket.getAttachment(false);
+if (attachment == null) {
+return false;
+}
attachment.setCometNotify(false); //will get reset upon next reg
if (executor == null) {
getWorkerThread().assign(socket, status);
@@ -1536,23 +1539,25 @@ public class NioEndpoint extends Abstrac
else r.reset(socket,ka,OP_REGISTER);
addEvent(r);
}
-public void cancelledKey(SelectionKey key, SocketStatus status,
boolean dispatch) {
+public KeyAttachment cancelledKey(SelectionKey key, SocketStatus
status, boolean dispatch) {
+KeyAttachment ka = null;
try {
-if ( key == null ) return;//nothing to do
-KeyAttachment ka = (KeyAttachment) key.attachment();
+if ( key == null ) return null;//nothing to do
+ka = (KeyAttachment) key.attachment();
if (ka != null && ka.getComet() && status != null) {
//the comet event takes care of clean up
//processSocket(ka.getChannel(), status, dispatch);
ka.setComet(false);//to avoid a loop
if (status == SocketStatus.TIMEOUT ) {
-processSocket(ka.getChannel(), status, true);
-return; // don't close on comet timeout
+if (processSocket(ka.getChannel(), status, true)) {
+return null; // don't close on comet timeout
+}
} else {
-processSocket(ka.getChannel(), status, false); //don't
dispatch if the lines below are cancelling the key
+// Don't dispatch if the lines below are cancelling
the key
+processSocket(ka.getChannel(), status, false);
}
}
-
-key.attach(null);
+ka = (KeyAttachment) ke
[Bug 52926] NPE in processSocket
https://bz.apache.org/bugzilla/show_bug.cgi?id=52926 --- Comment #2 from Konstantin Kolinko --- This fix (r1302839) was backported to Tomcat 6 in r1710473 and will be in 6.0.45 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57943] NioEndpoint, one poller thread died
https://bz.apache.org/bugzilla/show_bug.cgi?id=57943 Konstantin Kolinko changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #7 from Konstantin Kolinko --- Fixed in Tomcat 6 in r1710473 and will be in 6.0.45 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57340] NioConnector caches get corrupted on concurrent comet close
https://bz.apache.org/bugzilla/show_bug.cgi?id=57340 --- Comment #14 from Konstantin Kolinko --- (In reply to Mark Thomas from comment #10) > Fix applied to 8.0.x for 8.0.16 onwards and to 7.0.x for 7.0.58 onwards. Fixed in Tomcat 6 as part of bug 57943 and will be in 6.0.45 onwards. (r1710473) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58533] New: DelegatingConnection should propagate SQLException (not return null)
https://bz.apache.org/bugzilla/show_bug.cgi?id=58533
Bug ID: 58533
Summary: DelegatingConnection should propagate SQLException
(not return null)
Product: Tomcat 8
Version: trunk
Hardware: PC
OS: Mac OS X 10.1
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: anth...@whitford.com
I noticed code in org.apache.tomcat.dbcp.dbcp2.DelegatingConnection like:
@Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
checkOpen();
try {
DelegatingPreparedStatement dps = new DelegatingPreparedStatement(
this, _conn.prepareStatement(sql));
initializeStatement(dps);
return dps;
}
catch (SQLException e) {
handleException(e);
return null;
}
}
If there is a SQLException, I would expect that that gets propagated (just like
the signature suggests), not get a null. I think this violates the spec.
This issue exists for 2 prepareStatement and 2 prepareCall implementations.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58533] DelegatingConnection should propagate SQLException (not return null)
https://bz.apache.org/bugzilla/show_bug.cgi?id=58533 Konstantin Kolinko changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Konstantin Kolinko --- 1. These classes are copied from Apache Commons DBCP project. If there is a bug in them, it needs to be reported (and fixed) in that project first. http://tomcat.apache.org/bugreport.html#Third_party_components 2. The handleException(e); method called in that fragment of code rethrows the exception. So the behaviour is already as you are expecting it. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710478 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Oct 25 19:13:13 2015 New Revision: 1710478 URL: http://svn.apache.org/viewvc?rev=1710478&view=rev Log: votes Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1710478&r1=1710477&r2=1710478&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Oct 25 19:13:13 2015 @@ -40,7 +40,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/r1700872 http://svn.apache.org/r1701095 Not required for async but still required because of Comet - +1: markt, remm + +1: markt, remm, kkolinko -1: * Ensure LogFactoryImpl is excluded from extras/tomcat-juli-adapters jar. @@ -54,7 +54,7 @@ PATCHES PROPOSED TO BACKPORT: * Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58508 http://svn.apache.org/viewvc?rev=1710353&view=rev Escape role name for MBeans - +1: markt + +1: markt, kkolinko -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58534] New: Repeated Conditional Test
https://bz.apache.org/bugzilla/show_bug.cgi?id=58534
Bug ID: 58534
Summary: Repeated Conditional Test
Product: Tomcat 8
Version: trunk
Hardware: Macintosh
OS: Mac OS X 10.1
Status: NEW
Severity: trivial
Priority: P2
Component: WebSocket
Assignee: dev@tomcat.apache.org
Reporter: anth...@whitford.com
In org.apache.tomcat.websocket.pojo.PojoMethodMapping, there are cases like
this:
if (currentClazz == clazzPojo ||
(currentClazz != clazzPojo && !isMethodOverride(open, method))) {
The clause 'currentClazz != clazzPojo' is redundant since we know 'currentClazz
== clazzPojo' is false.
This is repeated several times.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58534] Repeated Conditional Test
https://bz.apache.org/bugzilla/show_bug.cgi?id=58534 --- Comment #1 from Anthony Whitford --- Created attachment 33208 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33208&action=edit Patch to remove repeated conditional tests -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58534] Repeated Conditional Test
https://bz.apache.org/bugzilla/show_bug.cgi?id=58534 --- Comment #2 from Anthony Whitford --- Created attachment 33209 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33209&action=edit Patch for similar problem for AprEndpoint I discovered the same problem with org.apache.tomcat.util.net.AprEndpoint, so please see the second patch too. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] New committer: Ognjen Blagojevic
Am 24.10.2015 um 15:58 schrieb Mark Thomas: On behalf of the Tomcat committers I am pleased to announce that Ognjen Blagojevic (ognjen) has been voted in as a new Tomcat committer. Please join me in welcoming him. Congratulations and welcome to the team! Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58535] New: ReverseComparator unsafely negates result
https://bz.apache.org/bugzilla/show_bug.cgi?id=58535
Bug ID: 58535
Summary: ReverseComparator unsafely negates result
Product: Tomcat 8
Version: trunk
Hardware: PC
OS: Mac OS X 10.1
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: anth...@whitford.com
Created attachment 33210
--> https://bz.apache.org/bugzilla/attachment.cgi?id=33210&action=edit
Patch to avoid negation risk
Consider the code:
@Override
public int compare(Session o1, Session o2) {
int returnValue = comparator.compare(o1, o2);
return (- returnValue);
}
This code negates the return value of the compare method. This is a
questionable or bad programming practice, since if the return value is
Integer.MIN_VALUE, negating the return value won't negate the sign of the
result. You can achieve the same intended result by reversing the order of the
operands rather than by negating the results.
See
http://findbugs.sourceforge.net/bugDescriptions.html#RV_NEGATING_RESULT_OF_COMPARETO
Recommend the following:
@Override
public int compare(Session o1, Session o2) {
// Note that comparing o2 with o1 to get reverse result...
return comparator.compare(o2, o1);
}
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-nio2 (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-nio2 : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-nio2/gump_work/build_tomcat-trunk_tomcat-trunk-test-nio2.html Work Name: build_tomcat-trunk_tomcat-trunk-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 50 mins 43 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151025-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151025.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151025-native-src.tar.gz -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl -master/dest-20151025/bin/openssl -Dexecute.test.apr=false -Dtest.excludePerformance=true -Dexecute.test.nio2=true -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/out
Re: svn commit: r1710445 - /tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
On 25/10/2015 09:50, Violeta Georgieva wrote:
> 2015-10-25 16:09 GMT+02:00 Konstantin Kolinko :
>>
>> 2015-10-25 16:40 GMT+03:00 :
>>> Author: markt
>>> Date: Sun Oct 25 13:40:52 2015
>>> New Revision: 1710445
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1710445&view=rev
>>> Log:
>>> https://bz.apache.org/bugzilla/show_bug.cgi?id=58518
>>> Fix a regression in BZ 56777 (that added support for URIs in config file
>>> locations)
>>> File paths on Windows could previously be specified with \ or / as the
>>> separator. BZ 56777 broke that. This commit restores that behaviour.
>>>
>>> Modified:
>>> tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
>>>
>>> Modified:
> tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
>>> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java?rev=1710445&r1=1710444&r2=1710445&view=diff
>>>
> ==
>>> --- tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
> (original)
>>> +++ tomcat/trunk/java/org/apache/tomcat/util/file/ConfigFileLoader.java
> Sun Oct 25 13:40:52 2015
>>> @@ -30,11 +30,12 @@ import java.net.URL;
>>> */
>>> public class ConfigFileLoader {
>>>
>>> +private static final File CATALINA_BASE_FILE;
>>> private static final URI CATALINA_BASE_URI;
>>>
>>> static {
>>> -File catalinaBase = new
> File(System.getProperty("catalina.base"));
>>> -CATALINA_BASE_URI = catalinaBase.toURI();
>>> +CATALINA_BASE_FILE = new
> File(System.getProperty("catalina.base"));
>>> +CATALINA_BASE_URI = CATALINA_BASE_FILE.toURI();
>>> }
>>>
>>> private ConfigFileLoader() {
>>> @@ -59,17 +60,30 @@ public class ConfigFileLoader {
>>> // Absolute URIs will be left alone
>>> // Relative files will be resolved relative to catalina base
>>> // Absolute files will be converted to URIs
>>> -URI uri;
>>> -if (location != null &&
>>> -(location.length() > 2 &&
> ":\\".equals(location.substring(1, 3)) ||
>>> -location.startsWith(""))) {
>>> -// This is an absolute file path in Windows or a UNC path
>>> -File f = new File(location);
>>> -uri =f.getAbsoluteFile().toURI();
>>> -} else {
>>> -// URL, relative path or an absolute path on a non-Windows
> platforms
>>> +
>>> +URI uri = null;
>>> +
>>> +// Location was originally always a file before URI support
> was added so
>>> +// try file first.
>>> +
>>> +// First guess, an absolute file path
>>> +File f = new File(location);
>>> +if (!f.isFile()) {
>>> +// Second guess, a file path relative to CATALINA_BASE
>>> +if (!f.isAbsolute()) {
>>> +f = new File(CATALINA_BASE_FILE, location);
>>> +}
>>> +}
>>> +if (f.isFile()) {
>>> +uri = f.getAbsoluteFile().toURI();
>>> +}
>>> +
>>> +if (uri == null) {
>>> +// Third and final guess, a URI
>>> uri = CATALINA_BASE_URI.resolve(location);
>>> }
>>> +
>>> +// Obtain the input stream we need
>>> URL url = uri.toURL();
>>> return url.openConnection().getInputStream();
>>> }
>>
>>
>> This implementation is OK, but performs a bit more work than necessary.
>>
>> 1) Calling isFile() twice -> accessing hard drive twice
>> 2) Conversion File -> URI -> URL -> parsing a file: URL -> ... just
>> to open an InputStream for a known File.
Noted. All fair points. I'll take another look at this in the next few days.
> I also have problems with spaces in the path
> java.lang.IllegalArgumentException: Illegal character in path at index 12:
> c:/...
> at java.net.URI.create(URI.java:859)
> at java.net.URI.resolve(URI.java:1043)
> at
> org.apache.tomcat.util.file.ConfigFileLoader.getInputStream(ConfigFileLoader.java:83)
I haven't been testing with spaces. I'll do that too.
>> Maybe add some debug logging to print out what location for the config
>> file was actually used.
Good idea. Will do.
Thanks,
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58537] ExtendedAccessLogValve inner AccessLogElement classes can be static
https://bz.apache.org/bugzilla/show_bug.cgi?id=58537 Anthony Whitford changed: What|Removed |Added Severity|normal |minor -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58537] New: ExtendedAccessLogValve inner AccessLogElement classes can be static
https://bz.apache.org/bugzilla/show_bug.cgi?id=58537 Bug ID: 58537 Summary: ExtendedAccessLogValve inner AccessLogElement classes can be static Product: Tomcat 8 Version: trunk Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: anth...@whitford.com Created attachment 33211 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33211&action=edit Add the static keyword to the inner AccessLogElement classes There are several inner classes defined that subclass AccessLogElement that are not defined as static. Since the inner classes do not use its embedded reference to the object which created it, the class may be made static to avoid keeping the reference to the creator object alive longer than necessary, and keeping the class instances lean. See http://findbugs.sourceforge.net/bugDescriptions.html#SIC_INNER_SHOULD_BE_STATIC -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 56 mins 48 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151025-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20151025/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151025.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151025-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true - Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20151025/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/outpu
svn commit: r1710487 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/connector/InputBuffer.java java/org/apache/catalina/connector/OutputBuffer.java webapps/docs/changelog.xml
Author: kkolinko Date: Sun Oct 25 21:55:05 2015 New Revision: 1710487 URL: http://svn.apache.org/viewvc?rev=1710487&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58313 Fix concurrent access of encoders map when clearing encoders during Comet processing. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1710487&r1=1710486&r2=1710487&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Oct 25 21:55:05 2015 @@ -36,13 +36,6 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, remm -1: -* Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58313 - http://svn.apache.org/r1700872 - http://svn.apache.org/r1701095 - Not required for async but still required because of Comet - +1: markt, remm, kkolinko - -1: - * Ensure LogFactoryImpl is excluded from extras/tomcat-juli-adapters jar. Reported by Benjamin Gandon on the dev list Mail thread: http://tomcat.markmail.org/thread/7iygcau3vja4cbui Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1710487&r1=1710486&r2=1710487&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/InputBuffer.java Sun Oct 25 21:55:05 2015 @@ -22,7 +22,8 @@ import java.io.Reader; import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.StringManager; @@ -125,7 +126,7 @@ public class InputBuffer extends Reader /** * List of encoders. */ -protected HashMap encoders = new HashMap(); +protected final Map encoders = new ConcurrentHashMap(); /** Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1710487&r1=1710486&r2=1710487&view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java Sun Oct 25 21:55:05 2015 @@ -23,11 +23,12 @@ import java.io.Writer; import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import org.apache.catalina.Globals; import org.apache.coyote.ActionCode; import org.apache.coyote.Response; -import org.apache.catalina.Globals; import org.apache.tomcat.util.buf.ByteChunk; import org.apache.tomcat.util.buf.C2BConverter; @@ -112,7 +113,7 @@ public class OutputBuffer extends Writer /** * List of encoders. */ -protected HashMap encoders = new HashMap(); +protected final Map encoders = new ConcurrentHashMap(); /** Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1710487&r1=1710486&r2=1710487&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Oct 25 21:55:05 2015 @@ -59,6 +59,10 @@ or org.apache.catalina.STRICT_SERVLET_COMPLIANCE system property. (kkolinko) + +58313: Fix concurrent access of encoders map when clearing +encoders during Comet processing. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58313] Data race inside the non-thread-safe HashMap org.apache.catalina.connector.OutputBuffer.encoders
https://bz.apache.org/bugzilla/show_bug.cgi?id=58313 Konstantin Kolinko changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #3 from Konstantin Kolinko --- Fixed in Tomcat 6 by r1710487 and will be in 6.0.45 onwards. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58538] New: McastServiceImpl run uses bitwise and
https://bz.apache.org/bugzilla/show_bug.cgi?id=58538
Bug ID: 58538
Summary: McastServiceImpl run uses bitwise and
Product: Tomcat 8
Version: trunk
Hardware: Macintosh
OS: Mac OS X 10.1
Status: NEW
Severity: trivial
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: anth...@whitford.com
The 'if (stopService() & startService())' looks suspicious like it should be
logical &&, not a bitwise &.
@Override
public void run() {
boolean success = false;
int attempt = 0;
try {
while (!success) {
if(log.isInfoEnabled())
log.info(sm.getString("mcastServiceImpl.recovery"));
if (stopService() & startService()) {
success = true;
if(log.isInfoEnabled())
log.info(sm.getString("mcastServiceImpl.recovery.successful"));
}
try {
if (!success) {
if(log.isInfoEnabled())
log.info(sm.getString("mcastServiceImpl.recovery.failed",
Integer.toString(++attempt),
Long.toString(parent.recoverySleepTime)));
Thread.sleep(parent.recoverySleepTime);
}
}catch (InterruptedException ignore) {
}
}
}finally {
running.set(false);
}
}
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58539] New: WsFrameBase processDataText uses bitwise and
https://bz.apache.org/bugzilla/show_bug.cgi?id=58539
Bug ID: 58539
Summary: WsFrameBase processDataText uses bitwise and
Product: Tomcat 8
Version: trunk
Hardware: PC
OS: Mac OS X 10.1
Status: NEW
Severity: normal
Priority: P2
Component: WebSocket
Assignee: dev@tomcat.apache.org
Reporter: anth...@whitford.com
The 'else if (cr.isUnderflow() & !last)' looks suspicious like it should be
logical &&, not a bitwise &.
// Frame is fully received
// Convert bytes to UTF-8
while (true) {
CoderResult cr = utf8DecoderMessage.decode(messageBufferBinary,
messageBufferText, last);
if (cr.isError()) {
throw new WsIOException(new CloseReason(
CloseCodes.NOT_CONSISTENT,
sm.getString("wsFrame.invalidUtf8")));
} else if (cr.isOverflow()) {
// Ran out of space in text buffer - flush it
if (usePartial()) {
messageBufferText.flip();
sendMessageText(false);
messageBufferText.clear();
} else {
throw new WsIOException(new CloseReason(
CloseCodes.TOO_BIG,
sm.getString("wsFrame.textMessageTooBig")));
}
} else if (cr.isUnderflow() & !last) {
// End of frame and possible message as well.
if (continuationExpected) {
// If partial messages are supported, send what we have
// managed to decode
if (usePartial()) {
messageBufferText.flip();
sendMessageText(false);
messageBufferText.clear();
}
messageBufferBinary.compact();
newFrame();
// Process next frame
return true;
} else {
// Make sure coder has flushed all output
last = true;
}
} else {
// End of message
messageBufferText.flip();
sendMessageText(true);
newMessage();
return true;
}
}
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58539] WsFrameBase processDataText uses bitwise and
https://bz.apache.org/bugzilla/show_bug.cgi?id=58539 Anthony Whitford changed: What|Removed |Added Severity|normal |minor -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710489 - /tomcat/trunk/webapps/docs/config/host.xml
Author: kkolinko Date: Sun Oct 25 22:11:26 2015 New Revision: 1710489 URL: http://svn.apache.org/viewvc?rev=1710489&view=rev Log: Fix missing " (quote) in a configuration example. Reported via a documentation comment. Modified: tomcat/trunk/webapps/docs/config/host.xml Modified: tomcat/trunk/webapps/docs/config/host.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/host.xml?rev=1710489&r1=1710488&r2=1710489&view=diff == --- tomcat/trunk/webapps/docs/config/host.xml (original) +++ tomcat/trunk/webapps/docs/config/host.xml Sun Oct 25 22:11:26 2015 @@ -606,7 +606,7 @@ ... ... ]]> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710490 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/config/host.xml
Author: kkolinko Date: Sun Oct 25 22:13:33 2015 New Revision: 1710490 URL: http://svn.apache.org/viewvc?rev=1710490&view=rev Log: Fix missing " (quote) in a configuration example. Reported via a documentation comment. Merged r1710489 from tomcat/trunk. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/config/host.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 25 22:13:33 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1 37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577 2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,16
[Bug 58540] New: Request setCharacterEncoding has unused code
https://bz.apache.org/bugzilla/show_bug.cgi?id=58540
Bug ID: 58540
Summary: Request setCharacterEncoding has unused code
Product: Tomcat 8
Version: trunk
Hardware: Macintosh
OS: Mac OS X 10.1
Status: NEW
Severity: trivial
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: anth...@whitford.com
Created attachment 33212
--> https://bz.apache.org/bugzilla/attachment.cgi?id=33212&action=edit
This patch removes the unused buffer.
The 'buffer' variable is unused and can be removed. (I suspect it is a remnant
of some past code.)
@Override
public void setCharacterEncoding(String enc)
throws UnsupportedEncodingException {
if (usingReader) {
return;
}
// Ensure that the specified encoding is valid
byte buffer[] = new byte[1];
buffer[0] = (byte) 'a';
// Confirm that the encoding name is valid
B2CConverter.getCharset(enc);
// Save the validated encoding
coyoteRequest.setCharacterEncoding(enc);
}
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1710491 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/host.xml
Author: kkolinko Date: Sun Oct 25 22:15:01 2015 New Revision: 1710491 URL: http://svn.apache.org/viewvc?rev=1710491&view=rev Log: Fix missing " (quote) in a configuration example. Reported via a documentation comment. Merged r1710490 from tomcat/tc8.0.x/trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/host.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Oct 25 22:15:01 2015 @@ -1,2 +1,2 @@ -/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579
svn commit: r1710492 - /tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml
Author: kkolinko Date: Sun Oct 25 22:16:12 2015 New Revision: 1710492 URL: http://svn.apache.org/viewvc?rev=1710492&view=rev Log: CTR: docs. Fix missing " (quote) in a configuration example. Reported via a documentation comment. Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml?rev=1710492&r1=1710491&r2=1710492&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/host.xml Sun Oct 25 22:16:12 2015 @@ -593,7 +593,7 @@ ...... - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58541] New: CGIServlet and WebdavServlet code improvements
https://bz.apache.org/bugzilla/show_bug.cgi?id=58541 Bug ID: 58541 Summary: CGIServlet and WebdavServlet code improvements Product: Tomcat 8 Version: trunk Hardware: Macintosh OS: Mac OS X 10.1 Status: NEW Severity: trivial Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: anth...@whitford.com Created attachment 33213 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33213&action=edit Code improvements to two Servlet classes Noticed some opportunities: 'String.indexOf(char)' is faster than 'String.indexOf(string)' 'Integer.parseInt(s)' is more efficient than 'new Integer(s).intValue()' 'Integer.valueOf(i)' may be more efficient than 'new Integer(i)' 'Integer.toString(i)' is more efficient than 'Integer.valueOf(i).toString()' -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58542] New: Improve McastService property management
https://bz.apache.org/bugzilla/show_bug.cgi?id=58542 Bug ID: 58542 Summary: Improve McastService property management Product: Tomcat 8 Version: trunk Hardware: PC OS: Mac OS X 10.1 Status: NEW Severity: trivial Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: anth...@whitford.com Created attachment 33214 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33214&action=edit Patch avoids new Number instances. Noticed some opportunities to avoid instantiating unnecessary Number objects: 'Integer.parseInt(p)' is more efficient than 'new Integer(p).intValue()' 'Long.parseLong(p)' is more efficient than 'new Long(p).longValue()' -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58543] New: JspFactoryImpl inefficient static initialization
https://bz.apache.org/bugzilla/show_bug.cgi?id=58543 Bug ID: 58543 Summary: JspFactoryImpl inefficient static initialization Product: Tomcat 8 Version: trunk Hardware: Macintosh OS: Mac OS X 10.1 Status: NEW Severity: trivial Priority: P2 Component: Jasper Assignee: dev@tomcat.apache.org Reporter: anth...@whitford.com Created attachment 33215 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33215&action=edit This patch improves the static initialization. JspFactoryImpl has inefficient static initialization: 'Boolean.parseBoolean(s)' is more efficient than 'Boolean.valueOf(s).booleanValue()' 'Integer.parseInt(s)' is more efficient than 'Integer.valueOf(s).intValue()' -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58544] New: RequestDumperFilter contentLength inefficiently creating Integer
https://bz.apache.org/bugzilla/show_bug.cgi?id=58544 Bug ID: 58544 Summary: RequestDumperFilter contentLength inefficiently creating Integer Product: Tomcat 8 Version: trunk Hardware: Macintosh OS: Mac OS X 10.1 Status: NEW Severity: trivial Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: anth...@whitford.com Created attachment 33216 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33216&action=edit Corrects contentLength logging to use less resources The contentLength logging in RequestDumperFilter is calling: Integer.valueOf(request.getContentLength()).toString() instead of: Integer.toString(request.getContentLength()) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58545] New: WsHandshakeRequest inefficient use of keySet
https://bz.apache.org/bugzilla/show_bug.cgi?id=58545
Bug ID: 58545
Summary: WsHandshakeRequest inefficient use of keySet
Product: Tomcat 8
Version: trunk
Hardware: Macintosh
OS: Mac OS X 10.1
Status: NEW
Severity: trivial
Priority: P2
Component: WebSocket
Assignee: dev@tomcat.apache.org
Reporter: anth...@whitford.com
Created attachment 33217
--> https://bz.apache.org/bugzilla/attachment.cgi?id=33217&action=edit
Replaces inefficient use of keySet() with more efficient entrySet()
In WsHandshakeRequest...
for (String pathName : pathParams.keySet()) {
newParameters.put(pathName,
Collections.unmodifiableList(
Arrays.asList(pathParams.get(pathName;
}
should be:
for (Entry entry : pathParams.entrySet()) {
final String pathName = entry.getKey();
newParameters.put(pathName,
Collections.unmodifiableList(
Arrays.asList(entry.getValue(;
}
to avoid the extra lookup.
See http://findbugs.sourceforge.net/bugDescriptions.html#WMI_WRONG_MAP_ITERATOR
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58546] New: SecureNio2Channel inner class GatherState should be static
https://bz.apache.org/bugzilla/show_bug.cgi?id=58546 Bug ID: 58546 Summary: SecureNio2Channel inner class GatherState should be static Product: Tomcat 8 Version: trunk Hardware: Macintosh OS: Mac OS X 10.1 Status: NEW Severity: trivial Priority: P2 Component: Util Assignee: dev@tomcat.apache.org Reporter: anth...@whitford.com Created attachment 33218 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33218&action=edit Makes GatherState a static inner class Since GatherState does not need its parent SecureNio2Channel, the class can be made static to be leaner. See http://findbugs.sourceforge.net/bugDescriptions.html#SIC_INNER_SHOULD_BE_STATIC -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58486] JreMemoryLeakPreventionListener: initialize two further JRE classes
https://bz.apache.org/bugzilla/show_bug.cgi?id=58486 --- Comment #3 from Konstantin Kolinko --- I raised this issue with Apache Xerces, https://issues.apache.org/jira/browse/XERCESJ-1667 (In reply to Luke Woodward from comment #0) > > I have filed a bug report with Oracle to change the behaviour of these two > classes. However, until this gets fixed (if it gets fixed at all), it would > be appreciated if the JreMemoryLeakPreventionListener could be adapted to > handle these two classes. Do you have a bug number for your report? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58547] New: Avoid new Integer and new Long instances when doing conversions
https://bz.apache.org/bugzilla/show_bug.cgi?id=58547 Bug ID: 58547 Summary: Avoid new Integer and new Long instances when doing conversions Product: Tomcat 8 Version: trunk Hardware: Macintosh OS: Mac OS X 10.1 Status: NEW Severity: trivial Priority: P2 Component: Util Assignee: dev@tomcat.apache.org Reporter: anth...@whitford.com Created attachment 33219 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33219&action=edit Replaced new Integer/Long with valueOf calls Discovered cases where an inefficient Number constructor is being called instead of the static valueOf. Using new Integer(int) is guaranteed to always result in a new object whereas Integer.valueOf(int) allows caching of values to be done by the compiler, class library, or JVM. Using of cached values avoids object allocation and the code will be faster. See http://findbugs.sourceforge.net/bugDescriptions.html#DM_NUMBER_CTOR -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [ANN] New committer: Ognjen Blagojevic
2015-10-24 22:58 GMT+09:00 Mark Thomas : > On behalf of the Tomcat committers I am pleased to announce that > Ognjen Blagojevic (ognjen) has been voted in as a new Tomcat committer. > > Please join me in welcoming him. > > Welcome! > Regards, > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- > Keiichi.Fujino >
svn commit: r1710500 - /tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
Author: kkolinko Date: Mon Oct 26 01:47:24 2015 New Revision: 1710500 URL: http://svn.apache.org/viewvc?rev=1710500&view=rev Log: CTR: docs. Fix a pair of typos in documentation. https://bz.apache.org/bugzilla/show_bug.cgi?id=58222 Backport of r1694790 from Tomcat 7 Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=1710500&r1=1710499&r2=1710500&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Mon Oct 26 01:47:24 2015 @@ -775,7 +775,7 @@ - The the SSL protocol(s) to use (a single value may enable multiple + The SSL protocol(s) to use (a single value may enable multiple protocols - see the JVM documentation for details). If not specified, the default is TLS. The permitted values may be obtained from the JVM documentation for the allowed values for algorithm when creating an @@ -805,7 +805,7 @@ order in which keys are read from the keystore is implementation dependent. It may not be the case that keys are read from the keystore in the same order as they were added. If more than one key is present in the - kesytore it is strongly recommended that a keyAlias is configured to + keystore it is strongly recommended that a keyAlias is configured to ensure that the correct key is used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58548] New: support certifcate transparency
https://bz.apache.org/bugzilla/show_bug.cgi?id=58548 Bug ID: 58548 Summary: support certifcate transparency Product: Tomcat 7 Version: unspecified Hardware: PC OS: Windows NT Status: NEW Severity: normal Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: hau...@acm.org Please provide a documentation for the configuration of all 3 to become listed on http://www.certificate-transparency.org/resources-for-site-owners (see also https://ritter.vg/blog-require_certificate_transparency.html ) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58497] Unable to have a custom implementation of AbstractHttp11Processor due to package private methods
https://bz.apache.org/bugzilla/show_bug.cgi?id=58497 --- Comment #4 from Amit Pande --- Thanks a lot, Mark, all for your quick responses and invaluable suggestions. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
