Bug report for Tomcat 5 [2011/09/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 | | | | | | | |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |38216|Inf|Enh|2006-01-10|Extend Jmxproxy to allow call of MBean Operations | |40728|New|Enh|2006-10-11|Catalina MBeans use non-serializable classes | |40766|New|Enh|2006-10-16|Using an unsecure jsessionid with mod_proxy_ajp ov| |40881|Opn|Enh|2006-11-02|Unable to receive message through TCP channel -> | |41007|Opn|Enh|2006-11-20|Can't define customized 503 error page| |41227|Opn|Enh|2006-12-21|When the jasper compiler fails to compile a JSP, i| |41697|Ver|Enh|2007-02-25|make visible in debug output if charset from brows| |43866|New|Enh|2007-11-14|add support for session attribute propagation with| |43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing | |44216|New|Enh|2008-01-11|Don't reuse session ID even if emptySessionPath=tr| |44904|New|Enh|2008-04-29|Provide warning message when DataSource's maxActiv| +-+---+---+--+--+ | Total 12 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 [2011/09/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| |41883|Ass|Enh|2007-03-18|use abstract wrapper instead of plain X509Certific| |43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant| |43400|New|Enh|2007-09-14|enum support for tag libs | |43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml | |43682|New|Enh|2007-10-23|JULI: web-inf/classes/logging.properties to suppor| |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| |44264|New|Enh|2008-01-18|Clustering - Support for disabling multicasting an| |44284|New|Enh|2008-01-23|Support java.lang.Iterable in c:forEach tag | |44294|New|Enh|2008-01-25|Support for EL functions with varargs | |44312|New|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| |44818|New|Enh|2008-04-13|tomcat hangs with GET when content-length is defin| |45014|New|Enh|2008-05-15|Request and Response classes should have wrappers | |45282|New|Enh|2008-06-25|NioReceiver doesn't close cleanly, leaving sockets| |45283|Opn|Enh|2008-06-25|Provide a JSR196 implementation | |45428|New|Enh|2008-07-18|warn if the tomcat stop doesn't complete | |45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks| |45871|New|Enh|2008-09-23|Support for salted and digested patches in DataSou| |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| |45995|New|Enh|2008-10-13|RFE - MIME type extension not case sensitive | |46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c| |46263|New|Enh|2008-11-21|Tomcat reloading of context does not update contex| |46264|New|Enh|2008-11-21|Shutting down tomcat with large number of contexts| |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| |46497|New|Enh|2009-01-08|Install Tomcat Deployer/ANT on Windows Platform | |46655|New|Enh|2009-02-03|keystore's password handler | |46727|New|Enh|2009-02-17|DefaultServlet - serving multiple encodings | |46902|New|Enh|2009-03-24|LoginValve to bypass restrictions of j_security_ch| |47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho| |47230|New|Enh|2009-05-21|Include sample cert attributes for SSL connectors | |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| |47785|Opn|Enh|2009-09-04|Cluster MBean not registered | |47834|New|Enh|2009-09-14|TldConfig throws Exception when exploring unpacked| |47919|New|Enh|2009-09-30|Log Tomcat & Java environment variables in additio| |48543|New|Enh|2010-01-14|[Patch] More flexibility in specifying -Dcatalina.| |48600|Opn|Enh|2010-01-22|Performance issue with tags | |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| |48899|New|Enh|2010-03-12|Guess URI charset should solve lot of problems| |48922|
Bug report for Tomcat Connectors [2011/09/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 | | | | | | | |34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo| |35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName| |39967|Inf|Nor|2006-07-05|mod_jk gives segmentation fault when apache is sta| |40208|Inf|Nor|2006-08-08|Request-Dump when ErrorDocument in httpd.conf is a| |42366|Inf|Nor|2007-05-09|Memory leak in newer mod_jk version when connectio| |43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn| |43968|New|Enh|2007-11-26|[patch] support ipv6 with mod_jk | |44290|New|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan| |44349|New|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s| |44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8 | |44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc| |44571|New|Enh|2008-03-10|Limits busy per worker to a threshold | |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| |45395|New|Min|2008-07-14|MsgAjp dump method does not dump packet when being| |46337|New|Nor|2008-12-04|real worker name is wrong | |46406|New|Enh|2008-12-16|Supporting relative paths in isapi_redirect.proper| |46676|New|Enh|2009-02-09|Configurable test request for Watchdog thread | |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47038|New|Enh|2009-04-15|USE_FLOCK_LK redefined compiler warning when using| |47327|New|Enh|2009-06-07|remote_user not logged in apache logfile | |47617|New|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err| |47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_| |47714|New|Cri|2009-08-20|Reponse mixed between users | |47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus| |47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit| |47840|Inf|Min|2009-09-14|A broken worker name is written in the log file. | |48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the| |48460|New|Nor|2009-12-30|mod_proxy_ajp document has three misleading portio| |48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert| |48513|New|Enh|2010-01-09|IIS Quick setup instructions | |48564|New|Nor|2010-01-18|Unable to turn off retries for LB worker | |48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv| |48891|Opn|Enh|2010-03-11|Missing EOL-style settings in tomcat/jk/trunk | |49035|New|Maj|2010-04-01|data lost when post a multipart/form-data form| |49048|New|Nor|2010-04-05|ACL not applied to redirect URLs | |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 | |49413|Opn|Reg|2010-06-09|Apache Mod_jk 1.2.30 is shutting down communicatio| |49469|New|Enh|2010-06-19|Workers status page has negative number of connect| |49732|Opn|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 | |50186|New|Nor|2010-10-31|Wrong documentation of connection_pool_timeout / c| |50233|New|Cri|2010-11-08|support long URLs (more than 2048)| |50385|New|Trv|2010-11-30|There's a Spanish Inquisition error in the documen| |50511|Inf|Nor|2010-12-22|WARNING about Internal Dummy Connection of Apache | |50694|New|Nor|2011-01-31|ModJK NSAPI inserted headers case sensitivity issu| |51235|Inf|Maj|2011-05-20|Access Violation in httpd.exe originating in mod_j| |51253|New|Nor|2011-05-24|use_server_errors for status 401 does not forward | |51261|New|Nor|2011-05-25|JK cannt support ipv6 | |51326|
Bug report for Tomcat 7 [2011/09/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 | | | | | | | |10021|New|Enh|2002-06-19|Include upgrade option in installer | |16579|New|Enh|2003-01-30|documentation page layout/style breaks wrapping to| |18500|New|Enh|2003-03-30|Host aliases to match by regular expression | |48358|Opn|Enh|2009-12-09|JSP-unloading reloaded| |48550|Inf|Enh|2010-01-14|Update examples and default server.xml to use UTF-| |48892|New|Enh|2010-03-11|Use URIEncoding from server.xml for decoding post | |49290|New|Enh|2010-05-14|Using a JarScanner with scanAllDirectories=true ca| |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| |49785|New|Enh|2010-08-19|Enabling TLS for JNDIRealm| |49821|New|Enh|2010-08-25|Tomcat CLI| |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 | |50504|New|Enh|2010-12-21|Allow setting query string character set trough re| |50570|New|Enh|2011-01-11|Allow explicit use of FIPS mode in APR lifecycle l| |50670|New|Enh|2011-01-27|Tribes | RpcChannel | Add option to specify extern| |50923|New|Enh|2011-03-13|Difficult to pick out valid values from config des| |51181|New|Enh|2011-05-10|Add support for Web Sockets | |51195|New|Enh|2011-05-13|"Find leaks" reports a false positive memory/class| |51334|New|Enh|2011-06-07|Web SSO support based on WS-Federation Passive Req| |51408|Opn|Enh|2011-06-21|String.getBytes() and new String(byte[]) use defau| |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| |51497|New|Enh|2011-07-11|Use canonical IPv6 text representation in logs| |51500|New|Enh|2011-07-12|NSIS - Allow configuration of more service propert| |51526|New|Enh|2011-07-18|Process web application context config with embedd| |51587|New|Enh|2011-07-29|Implement status and uptime commands | |51717|New|Enh|2011-08-24|Provide a way to disable EL cache | |51872|New|Blk|2011-09-22|request.getRemoteAddr() sometimes returning IP add| |51881|New|Cri|2011-09-23|Server incorrectly parses incoming HTTP requests a| |51883|New|Nor|2011-09-23|NullPointerException in StandardContextValve.invok| +-+---+---+--+--+ | Total 33 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Taglibs [2011/09/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 | |50825|New|Nor|2011-02-24|Site still has links to Jakarta for mailing lists | |51234|New|Nor|2011-05-20|NumberFormatException in fmt:formatNumber tag | |51382|New|Maj|2011-06-15|Link to download pages are broken | +-+---+---+--+--+ | 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 Modules [2011/09/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| |49953|Opn|Nor|2010-09-17|Missing @Override annotations | |50565|New|Min|2011-01-10|Static variables should be accessed in a static wa| |50566|New|Nor|2011-01-10|Duplicate assignment to connection variable | |50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen| |50660|New|Min|2011-01-26|Improve validationQuery error handling| |50860|New|Nor|2011-03-03|In case of invalid or empty slqQuery connection ar| |50864|New|Nor|2011-03-03|Reconfigure pool on the fly using JMX | |51198|New|Nor|2011-05-13|Trunk Version : Performance enhancement in Connect| |51237|New|Nor|2011-05-20|SlowQueryReport interceptor does not log anything | |51388|New|Enh|2011-06-16|SlowQueryReport should respect Statement.getQueryT| |51582|New|Nor|2011-07-29|NPE in SlowQueryReport| |51595|New|Nor|2011-08-01|org.apache.tomcat.jdbc.pool.jmx.ConnectionPool sho| |51871|New|Nor|2011-09-22|Wrong transitive dependency listed in tomcat-jdbc | |51879|New|Enh|2011-09-22|Improve access to Native Connection Methods | +-+---+---+--+--+ | Total 19 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Native [2011/09/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 | | | | | | | |45392|New|Nor|2008-07-14|No OCSP support for client SSL verification | |46179|Opn|Maj|2008-11-10|apr ssl client authentication | |48655|Inf|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown| |49038|Inf|Nor|2010-04-02|Crash in tcnative | |51477|Opn|Enh|2011-07-05|Support all protocol combinations in SSLProtocol o| |51655|New|Nor|2011-08-12|Index page does not say what native does | |51813|New|Cri|2011-09-14|Tomcat randomly crashes with [libtcnative-1.so.1+0| +-+---+---+--+--+ | Total7 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Re: problem when testing tomcat
2011/9/21 tianlm : > Thanks for your answers and suggestions. > > I still got failures and errors when testing Tomcat 7.0.20. I upload the log > files in the mail attachments. Would you please check the files and gei some > further suggestions? TEST-org.apache.tomcat.util.http.mapper.TestMapper.BIO.txt 6718 junit.framework.AssertionFailedError: 6718 at org.apache.tomcat.util.http.mapper.TestMapper.testPerformance(TestMapper.java:157) it shows the failure if the performance test for the mapper runs longer than 4 seconds. There is nothing to worry about. (Maybe you would want better JVM or better hardware). In both TEST-org.apache.tomcat.util.net.TestCustomSsl.BIO.txt and TEST-org.apache.tomcat.util.net.TestSsl.BIO.txt: java.lang.ClassNotFoundException: org.apache.tomcat.util.http.ValuesEnumerator It is very odd. I do not know what is going on here. You have to check, do you have that class and where it is for you. In TEST-org.apache.tomcat.util.net.TestCustomSsl.BIO.txt javax.net.ssl.SSLProtocolException: handshake alert: no_certificate Do not know. I think your 6u21 JRE does not support this feature. See SSL renegotiation support, aka CVE-2009-3555. Anyway the failing testCustomTrustManager2 test tests some API that you wouldn't use during normal operation. Only those who implement their own trust manager will be interested. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1066244 - svn:log
Author: kkolinko Revision: 1066244 Modified property: svn:log Modified: svn:log at Sun Sep 25 15:01:15 2011 -- --- svn:log (original) +++ svn:log Sun Sep 25 15:01:15 2011 @@ -1,2 +1,2 @@ Improve HTTP specification compliance -This works-around the Oracle JVM bug that triggers a DoS. CVE currently not assigned. +This works-around the Oracle JVM bug that triggers a DoS. CVE-2010-4476. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175411 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Sun Sep 25 15:08:10 2011 New Revision: 1175411 URL: http://svn.apache.org/viewvc?rev=1175411&view=rev Log: Update changelog message for r1066244 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=1175411&r1=1175410&r2=1175411&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Sep 25 15:08:10 2011 @@ -2171,7 +2171,8 @@ Improve HTTP specification compliance in support of -Accept-Language header. (kkolinko) +Accept-Language header. This protects from known exploit +of the Oracle JVM bug that triggers a DoS, CVE-2010-4476. (kkolinko) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1066315 - svn:log
Author: kkolinko Revision: 1066315 Modified property: svn:log Modified: svn:log at Sun Sep 25 15:10:33 2011 -- --- svn:log (original) +++ svn:log Sun Sep 25 15:10:33 2011 @@ -1,2 +1,2 @@ Improve HTTP specification compliance -This works-around the Oracle JVM bug that triggers a DoS. CVE currently not assigned. +This works-around the Oracle JVM bug that triggers a DoS. CVE-2010-4476. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175412 - /tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Sun Sep 25 15:12:33 2011 New Revision: 1175412 URL: http://svn.apache.org/viewvc?rev=1175412&view=rev Log: Update changelog message for r1066315 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml 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=1175412&r1=1175411&r2=1175412&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Sep 25 15:12:33 2011 @@ -538,7 +538,8 @@ Improve HTTP specification compliance in support of -Accept-Language header. (kkolinko) +Accept-Language header. This protects from known exploit +of the Oracle JVM bug that triggers a DoS, CVE-2010-4476. (kkolinko) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1066318 - svn:log
Author: kkolinko Revision: 1066318 Modified property: svn:log Modified: svn:log at Sun Sep 25 15:14:51 2011 -- --- svn:log (original) +++ svn:log Sun Sep 25 15:14:51 2011 @@ -1,2 +1,2 @@ Improve HTTP specification compliance -This works-around the Oracle JVM bug that triggers a DoS. CVE currently not assigned. +This works-around the Oracle JVM bug that triggers a DoS. CVE-2010-4476. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175414 - /tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Author: kkolinko Date: Sun Sep 25 15:21:55 2011 New Revision: 1175414 URL: http://svn.apache.org/viewvc?rev=1175414&view=rev Log: Update changelog message for r1066318 Add release date for 5.5.34. Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1175414&r1=1175413&r2=1175414&view=diff == --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sun Sep 25 15:21:55 2011 @@ -39,7 +39,9 @@ - + + + @@ -244,7 +246,8 @@ Improve HTTP specification compliance in support of -Accept-Language header. (kkolinko) +Accept-Language header. This protects from known exploit +of the Oracle JVM bug that triggers a DoS, CVE-2010-4476. (kkolinko) 50620: Stop exceptions that occur during - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175421 - in /tomcat/site/trunk: docs/security-5.html docs/security-6.html docs/security-7.html xdocs/security-5.xml xdocs/security-6.xml xdocs/security-7.xml
Author: kkolinko Date: Sun Sep 25 16:10:59 2011 New Revision: 1175421 URL: http://svn.apache.org/viewvc?rev=1175421&view=rev Log: Mention when support for RFC 5746 was added. As far as I am reading Tomcat-Navive changelog, it does not have implementation for this new renegotiation protocol. Modified: tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/xdocs/security-5.xml tomcat/site/trunk/xdocs/security-6.xml tomcat/site/trunk/xdocs/security-7.xml Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1175421&r1=1175420&r2=1175421&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Sun Sep 25 16:10:59 2011 @@ -1745,6 +1745,22 @@ that provided the new allowUnsafeLegacyRenegotiation attribute. This work around is included in Tomcat 5.5.29 onwards. +Support for the new TLS renegotiation protocol (RFC 5746) that does not + have this security issue: + + + For connectors using JSSE implementation provided by JVM: +Added in Tomcat 5.5.33. +Requires JRE that supports RFC 5746. For Oracle JRE that is +http://www.oracle.com/technetwork/java/javase/documentation/tlsreadme2-176330.html";>known +to be 6u22 or later. + + For connectors using APR and OpenSSL: +Not implemented. See +APR/native connector security page. + + + important: Directory traversal http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2938"; rel="nofollow">CVE-2008-2938 Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1175421&r1=1175420&r2=1175421&view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Sun Sep 25 16:10:59 2011 @@ -1547,7 +1547,23 @@ http://svn.apache.org/viewvc?view=rev&rev=891292";>revision 891292 that provided the new allowUnsafeLegacyRenegotiation attribute. This work around is included in Tomcat 6.0.21 onwards. - + +Support for the new TLS renegotiation protocol (RFC 5746) that does not + have this security issue: + + + For connectors using JSSE implementation provided by JVM: +Added in Tomcat 6.0.32. +Requires JRE that supports RFC 5746. For Oracle JRE that is +http://www.oracle.com/technetwork/java/javase/documentation/tlsreadme2-176330.html";>known +to be 6u22 or later. + + For connectors using APR and OpenSSL: +Not implemented. See +APR/native connector security page. + + + important: Directory traversal http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-2938"; rel="nofollow">CVE-2008-2938 Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1175421&r1=1175420&r2=1175421&view=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Sun Sep 25 16:10:59 2011 @@ -1091,6 +1091,22 @@ This was worked-around in http://svn.apache.org/viewvc?view=rev&rev=882320";>revision 891292. +Support for the new TLS renegotiation protocol (RFC 5746) that does not + have this security issue: + + + For connectors using JSSE implementation provided by JVM: +Added in Tomcat 7.0.8. +Requires JRE that supports RFC 5746. For Oracle JRE that is +http://www.oracle.com/technetwork/java/javase/documentation/tlsreadme2-176330.html";>known +to be 6u22 or later. + + For connectors using APR and OpenSSL: +Not implemented. See +APR/native connector security page. + + + Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=1175421&r1=1175420&r2=1175421&view=diff == --- tomcat/site/trunk/xdocs/security-5.xml (original) +++ tomcat/site/trunk/xdocs/security-5.xml Sun Sep 25 16:10:59 2011 @@ -814,6 +814,23 @@ that provided the new allowUnsafeLegacyRenegotiation attribute. This work around is included in Tomcat 5.5.29 onwards. +Support for the new TLS renegotiation protocol (RFC 5746) that does not + have this security issue: + + + For connectors using JSSE implementation provided by JVM: +Added in Tomcat 5.5.33. +Requires JRE that supports RFC 5746. For Oracle JRE that is +http:/
Re: svn commit: r1175421 - in /tomcat/site/trunk: docs/security-5.html docs/security-6.html docs/security-7.html xdocs/security-5.xml xdocs/security-6.xml xdocs/security-7.xml
On 25/09/2011 17:11, kkoli...@apache.org wrote: > Author: kkolinko > Date: Sun Sep 25 16:10:59 2011 > New Revision: 1175421 > > URL: http://svn.apache.org/viewvc?rev=1175421&view=rev > Log: > Mention when support for RFC 5746 was added. > > As far as I am reading Tomcat-Navive changelog, > it does not have implementation for this new renegotiation protocol. It should have. It is entirely provided by OpenSSL. Also, search http://tomcat.apache.org/native-doc/miscellaneous/changelog.html for renegotiation. The APR/native HTTP connector fully supports control of whether or not legacy negotiation is supported via the allowUnsafeLegacyRenegotiation attribute of the connector. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1175421 - in /tomcat/site/trunk: docs/security-5.html docs/security-6.html docs/security-7.html xdocs/security-5.xml xdocs/security-6.xml xdocs/security-7.xml
2011/9/25 Mark Thomas : > On 25/09/2011 17:11, kkoli...@apache.org wrote: >> Author: kkolinko >> Date: Sun Sep 25 16:10:59 2011 >> New Revision: 1175421 >> >> URL: http://svn.apache.org/viewvc?rev=1175421&view=rev >> Log: >> Mention when support for RFC 5746 was added. >> >> As far as I am reading Tomcat-Navive changelog, >> it does not have implementation for this new renegotiation protocol. > > It should have. It is entirely provided by OpenSSL. > Oops. It needs some time to sort this in my mind Then I think the http://tomcat.apache.org/security-native.html has to be updated with more specific version numbers, like I did for 5.5, 6.0 and 7.0 pages. > Also, search > http://tomcat.apache.org/native-doc/miscellaneous/changelog.html for > renegotiation. The APR/native HTTP connector fully supports control of > whether or not legacy negotiation is supported via the > allowUnsafeLegacyRenegotiation attribute of the connector. I did so, but the changelog mentions only "Add support for unsafe legacy renegotiation." (1.1.21) which is unrelated to RFC 5746. The native security page says "From 1.1.18 onwards, client initiated renegotiations are rejected". So it sounds that they are rejected, regardless of RFC 5746. Both of the above resulted in my confusion. The native code does not check for "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" cipher, unlike JSSESocketFactory used by not-native connectors, nor AprLifecycleListener prints status of this feature support at Tomcat startup. 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: r1175428 - /tomcat/tc7.0.x/trunk/
Author: kkolinko Date: Sun Sep 25 16:43:14 2011 New Revision: 1175428 URL: http://svn.apache.org/viewvc?rev=1175428&view=rev Log: Add r1173342 to mergeinfo. It was merged in r1173343. Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 25 16:43:14 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461 ,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283 +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173342 ,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175429 - /tomcat/tc7.0.x/trunk/
Author: kkolinko Date: Sun Sep 25 16:48:14 2011 New Revision: 1175429 URL: http://svn.apache.org/viewvc?rev=1175429&view=rev Log: Add r117 to mergeinfo. This change was committed to 7.0.x in r1173330. Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 25 16:48:14 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173342 ,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283 +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175431 - in /tomcat/site/trunk: docs/security-5.html docs/security-6.html docs/security-7.html xdocs/security-5.xml xdocs/security-6.xml xdocs/security-7.xml
Author: kkolinko Date: Sun Sep 25 17:10:50 2011 New Revision: 1175431 URL: http://svn.apache.org/viewvc?rev=1175431&view=rev Log: Replace wrong statement with a placeholder for now, to avoid spreading false information. Modified: tomcat/site/trunk/docs/security-5.html tomcat/site/trunk/docs/security-6.html tomcat/site/trunk/docs/security-7.html tomcat/site/trunk/xdocs/security-5.xml tomcat/site/trunk/xdocs/security-6.xml tomcat/site/trunk/xdocs/security-7.xml Modified: tomcat/site/trunk/docs/security-5.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=1175431&r1=1175430&r2=1175431&view=diff == --- tomcat/site/trunk/docs/security-5.html (original) +++ tomcat/site/trunk/docs/security-5.html Sun Sep 25 17:10:50 2011 @@ -1756,7 +1756,7 @@ to be 6u22 or later. For connectors using APR and OpenSSL: -Not implemented. See +TBD. See APR/native connector security page. Modified: tomcat/site/trunk/docs/security-6.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1175431&r1=1175430&r2=1175431&view=diff == --- tomcat/site/trunk/docs/security-6.html (original) +++ tomcat/site/trunk/docs/security-6.html Sun Sep 25 17:10:50 2011 @@ -1559,7 +1559,7 @@ to be 6u22 or later. For connectors using APR and OpenSSL: -Not implemented. See +TBD. See APR/native connector security page. Modified: tomcat/site/trunk/docs/security-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1175431&r1=1175430&r2=1175431&view=diff == --- tomcat/site/trunk/docs/security-7.html (original) +++ tomcat/site/trunk/docs/security-7.html Sun Sep 25 17:10:50 2011 @@ -1102,7 +1102,7 @@ to be 6u22 or later. For connectors using APR and OpenSSL: -Not implemented. See +TBD. See APR/native connector security page. Modified: tomcat/site/trunk/xdocs/security-5.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=1175431&r1=1175430&r2=1175431&view=diff == --- tomcat/site/trunk/xdocs/security-5.xml (original) +++ tomcat/site/trunk/xdocs/security-5.xml Sun Sep 25 17:10:50 2011 @@ -826,7 +826,7 @@ to be 6u22 or later. For connectors using APR and OpenSSL: -Not implemented. See +TBD. See APR/native connector security page. Modified: tomcat/site/trunk/xdocs/security-6.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1175431&r1=1175430&r2=1175431&view=diff == --- tomcat/site/trunk/xdocs/security-6.xml (original) +++ tomcat/site/trunk/xdocs/security-6.xml Sun Sep 25 17:10:50 2011 @@ -773,7 +773,7 @@ to be 6u22 or later. For connectors using APR and OpenSSL: -Not implemented. See +TBD. See APR/native connector security page. Modified: tomcat/site/trunk/xdocs/security-7.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1175431&r1=1175430&r2=1175431&view=diff == --- tomcat/site/trunk/xdocs/security-7.xml (original) +++ tomcat/site/trunk/xdocs/security-7.xml Sun Sep 25 17:10:50 2011 @@ -449,7 +449,7 @@ to be 6u22 or later. For connectors using APR and OpenSSL: -Not implemented. See +TBD. See APR/native connector security page. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1175421 - in /tomcat/site/trunk: docs/security-5.html docs/security-6.html docs/security-7.html xdocs/security-5.xml xdocs/security-6.xml xdocs/security-7.xml
On 25/09/2011 17:39, Konstantin Kolinko wrote: > 2011/9/25 Mark Thomas : >> On 25/09/2011 17:11, kkoli...@apache.org wrote: >>> Author: kkolinko >>> Date: Sun Sep 25 16:10:59 2011 >>> New Revision: 1175421 >>> >>> URL: http://svn.apache.org/viewvc?rev=1175421&view=rev >>> Log: >>> Mention when support for RFC 5746 was added. >>> >>> As far as I am reading Tomcat-Navive changelog, >>> it does not have implementation for this new renegotiation protocol. >> >> It should have. It is entirely provided by OpenSSL. >> > > Oops. > It needs some time to sort this in my mind > > > Then I think the > http://tomcat.apache.org/security-native.html > has to be updated with more specific version numbers, like I did for > 5.5, 6.0 and 7.0 pages. > >> Also, search >> http://tomcat.apache.org/native-doc/miscellaneous/changelog.html for >> renegotiation. The APR/native HTTP connector fully supports control of >> whether or not legacy negotiation is supported via the >> allowUnsafeLegacyRenegotiation attribute of the connector. > > I did so, but the changelog mentions only > "Add support for unsafe legacy renegotiation." (1.1.21) > which is unrelated to RFC 5746. > > The native security page says "From 1.1.18 onwards, client initiated > renegotiations are rejected". So it sounds that they are rejected, > regardless of RFC 5746. > > Both of the above resulted in my confusion. > > The native code does not check for "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" > cipher, unlike JSSESocketFactory used by not-native connectors, > nor AprLifecycleListener prints status of this feature support at > Tomcat startup. The one thing I didn't check was if client initiated renegotiation was re-enabled once the allowUnsafeLegacyRenegotiation option was implemented and I don't know the code well enough to know where to look without some research. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Mailing list for the Tomcat Maven Plugin
2011/9/14 Olivier Lamy : > Hello Folks, > I wonder if we have to create separates mailing lists or using the > default tomcat mls ? (some users ping me directly to have separates) > Let me know what is your opinion on that ? There is a precedent: the Taglibs subproject has separate taglibs-user list, but uses the same dev@ and announce@. I tried to look at the old mailing lists, as listed on http://mojo.codehaus.org/tomcat-maven-plugin/mail-lists.html but those are covering all mojo, not only tomcat-maven-plugin. I did not understand most of topics discussed there, likely because of that. I think though that questions specific to your tomcat-maven plugin will be more understandable, and thus can be discussed on users@tomcat. That is, like questions about Ant support in Tomcat or the Manager webapp, that are already discussed on users@. My opinion is that users@tomcat probably will be fine with those questions, with no need for a separate mailing list. Olivier, are you OK with following users@tomcat for such questions, or there are too many other topics there that will distract your attention, and a separate mailing list will be more comfortable for you? 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: r1175582 - /tomcat/trunk/res/maven/tomcat-jdbc.pom
Author: kkolinko Date: Sun Sep 25 21:25:11 2011 New Revision: 1175582 URL: http://svn.apache.org/viewvc?rev=1175582&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51871 Wrong transitive dependency listed in tomcat-jdbc maven pom It should depend on tomcat-juli, not on itself. Modified: tomcat/trunk/res/maven/tomcat-jdbc.pom Modified: tomcat/trunk/res/maven/tomcat-jdbc.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jdbc.pom?rev=1175582&r1=1175581&r2=1175582&view=diff == --- tomcat/trunk/res/maven/tomcat-jdbc.pom (original) +++ tomcat/trunk/res/maven/tomcat-jdbc.pom Sun Sep 25 21:25:11 2011 @@ -24,7 +24,7 @@ org.apache.tomcat - tomcat-jdbc + tomcat-juli @MAVEN.DEPLOY.VERSION@ compile - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175584 - in /tomcat/tc7.0.x/trunk: ./ res/maven/tomcat-jdbc.pom webapps/docs/changelog.xml
Author: kkolinko Date: Sun Sep 25 21:32:32 2011 New Revision: 1175584 URL: http://svn.apache.org/viewvc?rev=1175584&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51871 Merged revision 1175582 from tomcat/trunk: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51871 Wrong transitive dependency listed in tomcat-jdbc maven pom It should depend on tomcat-juli, not on itself. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 25 21:32:32 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283 +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582 Modified: tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom?rev=1175584&r1=1175583&r2=1175584&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom (original) +++ tomcat/tc7.0.x/trunk/res/maven/tomcat-jdbc.pom Sun Sep 25 21:32:32 2011 @@ -24,7 +24,7 @@ org.apache.tomcat - tomcat-jdbc + tomcat-juli @MAVEN.DEPLOY.VERSION@ compile 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=1175584&r1=1175583&r2=1175584&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Sep 25 21:32:32 2011 @@ -225,6 +225,10 @@ In jdbc-pool: Discarded connection is not active in a pool any longer. It removes from the active connection list. (kfujino) + +51781: In jdbc-pool: Fix dependency in Maven POM file of +tomcat-jbdc. (kkolinko) + Update the "test" target in the default build file to report a test failure only after all available connector variants (bio, nio, apr) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51871] Wrong transitive dependency listed in tomcat-jdbc maven pom
https://issues.apache.org/bugzilla/show_bug.cgi?id=51871 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #3 from Konstantin Kolinko 2011-09-25 21:33:52 UTC --- Fixed with r1175582 and r1175584. Will be in Tomcat 7.0.22. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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: r1175589 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
Author: rjung Date: Sun Sep 25 21:46:49 2011 New Revision: 1175589 URL: http://svn.apache.org/viewvc?rev=1175589&view=rev Log: Whitespace change to align with AjpAprProcessor. No functional change. Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1175589&r1=1175588&r2=1175589&view=diff == --- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Sun Sep 25 21:46:49 2011 @@ -190,7 +190,7 @@ public class AjpNioProcessor extends Abs error = true; } } - + if (isAsync() && !error) { break; } @@ -220,7 +220,7 @@ public class AjpNioProcessor extends Abs recycle(false); } - + rp.setStage(org.apache.coyote.Constants.STAGE_ENDED); if (!error && !endpoint.isPaused()) { @@ -232,10 +232,9 @@ public class AjpNioProcessor extends Abs } else { return SocketState.CLOSED; } - } - + // - ActionHook Methods - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175590 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Author: rjung Date: Sun Sep 25 21:48:25 2011 New Revision: 1175590 URL: http://svn.apache.org/viewvc?rev=1175590&view=rev Log: Add 503 return in process() when endpoint is paused. This is consistent with BIO and NIO. Some more whitespace and other non-functional changes to align with AjpNioProcessor. Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1175590&r1=1175589&r2=1175590&view=diff == --- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sun Sep 25 21:48:25 2011 @@ -120,7 +120,6 @@ public class AjpAprProcessor extends Abs boolean keptAlive = false; while (!error && !endpoint.isPaused()) { - // Parsing the request header try { // Get first message of the request @@ -152,7 +151,6 @@ public class AjpAprProcessor extends Abs error = true; break; } - keptAlive = true; request.setStartTime(System.currentTimeMillis()); } catch (IOException e) { @@ -182,6 +180,13 @@ public class AjpAprProcessor extends Abs } } +if (endpoint.isPaused()) { +// 503 - Service unavailable +response.setStatus(503); +adapter.log(request, response, 0); +error = true; +} + // Process the request in the adapter if (!error) { try { @@ -225,13 +230,15 @@ public class AjpAprProcessor extends Abs } rp.setStage(org.apache.coyote.Constants.STAGE_ENDED); - -if (error || endpoint.isPaused()) { -return SocketState.CLOSED; -} else if (isAsync()) { -return SocketState.LONG; + +if (!error && !endpoint.isPaused()) { +if (isAsync()) { +return SocketState.LONG; +} else { +return SocketState.OPEN; +} } else { -return SocketState.OPEN; +return SocketState.CLOSED; } } @@ -254,7 +261,7 @@ public class AjpAprProcessor extends Abs SocketStatus.OPEN); } } else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) { -if (param==null) return; +if (param == null) return; long timeout = ((Long)param).longValue(); socket.setTimeout(timeout); } else if (actionCode == ActionCode.ASYNC_DISPATCH) { @@ -263,8 +270,6 @@ public class AjpAprProcessor extends Abs SocketStatus.OPEN); } } - - } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175593 - in /tomcat/site/trunk: docs/ci.html xdocs/ci.xml
Author: kkolinko Date: Sun Sep 25 21:54:03 2011 New Revision: 1175593 URL: http://svn.apache.org/viewvc?rev=1175593&view=rev Log: I see that Buildbot for Tomcat 7 is already configured and running, since Sept.25 Add links to it. Modified: tomcat/site/trunk/docs/ci.html tomcat/site/trunk/xdocs/ci.xml Modified: tomcat/site/trunk/docs/ci.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1175593&r1=1175592&r2=1175593&view=diff == --- tomcat/site/trunk/docs/ci.html (original) +++ tomcat/site/trunk/docs/ci.html Sun Sep 25 21:54:03 2011 @@ -314,15 +314,13 @@ prepared and published by ASF Buildbot, http://ci.apache.org/projects/tomcat/tomcat6/docs/index.html";>Tomcat 6.0.x -http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html";>Tomcat 8.0.x +http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html";>Tomcat 7.0.x + + +http://ci.apache.org/projects/tomcat/tomcat8/docs/index.html";>Tomcat trunk (8.0.x) -FIXME: In August 2011 the "stable branch" of Tomcat 7 was created -(/tc7.0.x/trunk), but buildbot configuration has not been -updated yet. Documentation that it builds is actually for "Tomcat 8", -but there is not much difference between it and Tomcat 7 yet. - @@ -385,6 +383,27 @@ but there is not much difference between http://ci.apache.org/builders/tomcat-trunk";>Status page + +http://ci.apache.org/projects/tomcat/tomcat8/";>Files + + + + + + +tomcat-7-trunk + + +/tomcat/tc7.0.x/trunk + + + + +http://ci.apache.org/builders/tomcat-7-trunk";>Status page + + +http://ci.apache.org/projects/tomcat/tomcat7/";>Files + @@ -400,6 +419,9 @@ but there is not much difference between http://ci.apache.org/builders/tomcat-6-trunk";>Status page + +http://ci.apache.org/projects/tomcat/tomcat6/";>Files + Modified: tomcat/site/trunk/xdocs/ci.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/ci.xml?rev=1175593&r1=1175592&r2=1175593&view=diff == --- tomcat/site/trunk/xdocs/ci.xml (original) +++ tomcat/site/trunk/xdocs/ci.xml Sun Sep 25 21:54:03 2011 @@ -35,14 +35,10 @@ prepared and published by ASF Buildbot, http://ci.apache.org/projects/tomcat/tomcat6/docs/index.html";>Tomcat 6.0.x - http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html";>Tomcat 8.0.x + http://ci.apache.org/projects/tomcat/tomcat7/docs/index.html";>Tomcat 7.0.x + http://ci.apache.org/projects/tomcat/tomcat8/docs/index.html";>Tomcat trunk (8.0.x) -FIXME: In August 2011 the "stable branch" of Tomcat 7 was created -(/tc7.0.x/trunk), but buildbot configuration has not been -updated yet. Documentation that it builds is actually for "Tomcat 8", -but there is not much difference between it and Tomcat 7 yet. - @@ -63,6 +59,17 @@ but there is not much difference between http://ci.apache.org/builders/tomcat-trunk";>Status page + http://ci.apache.org/projects/tomcat/tomcat8/";>Files + + + + + tomcat-7-trunk + /tomcat/tc7.0.x/trunk + + + http://ci.apache.org/builders/tomcat-7-trunk";>Status page + http://ci.apache.org/projects/tomcat/tomcat7/";>Files @@ -72,6 +79,7 @@ but there is not much difference between http://ci.apache.org/builders/tomcat-6-trunk";>Status page + http://ci.apache.org/projects/tomcat/tomcat6/";>Files - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175594 - in /tomcat/trunk/java/org/apache/coyote/ajp: AjpAprProcessor.java AjpNioProcessor.java AjpProcessor.java
Author: rjung Date: Sun Sep 25 21:54:13 2011 New Revision: 1175594 URL: http://svn.apache.org/viewvc?rev=1175594&view=rev Log: Don't send 503 if endpoint is paused and we just answered an AJP CPING. If CPING works, mod_jk expects the main request to work too. If we don't want to process the main request we need to fail the CPING received directly before. Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1175594&r1=1175593&r2=1175594&view=diff == --- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sun Sep 25 21:54:13 2011 @@ -113,6 +113,7 @@ public class AjpAprProcessor extends Abs long socketRef = socket.getSocket().longValue(); Socket.setrbb(socketRef, inputBuffer); Socket.setsbb(socketRef, outputBuffer); +boolean cping = false; // Error flag error = false; @@ -137,6 +138,7 @@ public class AjpAprProcessor extends Abs recycle(true); break; } +cping = true; if (Socket.send(socketRef, pongMessageArray, 0, pongMessageArray.length) < 0) { error = true; @@ -180,12 +182,13 @@ public class AjpAprProcessor extends Abs } } -if (endpoint.isPaused()) { +if (!cping && endpoint.isPaused()) { // 503 - Service unavailable response.setStatus(503); adapter.log(request, response, 0); error = true; } +cping = false; // Process the request in the adapter if (!error) { Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1175594&r1=1175593&r2=1175594&view=diff == --- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Sun Sep 25 21:54:13 2011 @@ -98,6 +98,7 @@ public class AjpNioProcessor extends Abs this.socket = socket.getSocket(); long soTimeout = endpoint.getSoTimeout(); +boolean cping = false; // Error flag error = false; @@ -122,6 +123,7 @@ public class AjpNioProcessor extends Abs recycle(true); break; } +cping = true; try { output(pongMessageArray, 0, pongMessageArray.length); } catch (IOException e) { @@ -167,12 +169,13 @@ public class AjpNioProcessor extends Abs } } -if (endpoint.isPaused()) { +if (!cping && endpoint.isPaused()) { // 503 - Service unavailable response.setStatus(503); adapter.log(request, response, 0); error = true; } +cping = false; // Process the request in the adapter if (!error) { Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1175594&r1=1175593&r2=1175594&view=diff == --- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Sun Sep 25 21:54:13 2011 @@ -111,6 +111,7 @@ public class AjpProcessor extends Abstra if (keepAliveTimeout > 0) { soTimeout = socket.getSocket().getSoTimeout(); } +boolean cping = false; // Error flag error = false; @@ -140,6 +141,7 @@ public class AjpProcessor extends Abstra recycle(true); break; } +cping = true; try { output.write(pongMessageArray); } catch (IOException e) { @@ -183,12 +185,13 @@ public class AjpProcessor extends Abstra } } -if (endpoint.isPaused()) { +if (!cping && endpoint.isPaused()) { // 503 - Service unavailable response.setStatus(503);
svn commit: r1175595 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ajp/AjpAprProcessor.java java/org/apache/coyote/ajp/AjpNioProcessor.java webapps/docs/changelog.xml
Author: rjung Date: Sun Sep 25 22:04:04 2011 New Revision: 1175595 URL: http://svn.apache.org/viewvc?rev=1175595&view=rev Log: Align APR AJP connector with NIO one. Send 503 if endpoint is paused. Marge r1175589, r1175590 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 25 22:04:04 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582 +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1175595&r1=1175594&r2=1175595&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sun Sep 25 22:04:04 2011 @@ -120,7 +120,6 @@ public class AjpAprProcessor extends Abs boolean keptAlive = false; while (!error && !endpoint.isPaused()) { - // Parsing the request header try { // Get first message of the request @@ -152,7 +151,6 @@ public class AjpAprProcessor extends Abs error = true; break; } - keptAlive = true; request.setStartTime(System.currentTimeMillis()); } catch (IOException e) { @@ -182,6 +180,13 @@ public class AjpAprProcessor extends Abs } } +if (endpoint.isPaused()) { +// 503 - Service unavailable +response.setStatus(503); +adapter.log(request, response, 0); +error = true; +} + // Process the request in the adapter if (!error) { try { @@ -225,13 +230,15 @@ public class AjpAprProcessor extends Abs } rp.setStage(org.apache.coyote.Constants.STAGE_ENDED); - -if (error || endpoint.isPaused()) { -return SocketState.CLOSED; -} else if (isAsync()) { -return SocketState.LONG; + +if (!error && !endpoint.isPaused()) { +if (isAsync()) { +return
svn commit: r1175597 - in /tomcat/trunk/webapps/docs: architecture/project.xml config/project.xml project.xml
Author: kkolinko Date: Sun Sep 25 22:06:57 2011 New Revision: 1175597 URL: http://svn.apache.org/viewvc?rev=1175597&view=rev Log: Update version number to Tomcat 8, where it was added by r962466 Modified: tomcat/trunk/webapps/docs/architecture/project.xml tomcat/trunk/webapps/docs/config/project.xml tomcat/trunk/webapps/docs/project.xml Modified: tomcat/trunk/webapps/docs/architecture/project.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/architecture/project.xml?rev=1175597&r1=1175596&r2=1175597&view=diff == --- tomcat/trunk/webapps/docs/architecture/project.xml (original) +++ tomcat/trunk/webapps/docs/architecture/project.xml Sun Sep 25 22:06:57 2011 @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://tomcat.apache.org/";> -Apache Tomcat 7 Architecture +Apache Tomcat 8 Architecture The Apache Tomcat Servlet/JSP Container Modified: tomcat/trunk/webapps/docs/config/project.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/project.xml?rev=1175597&r1=1175596&r2=1175597&view=diff == --- tomcat/trunk/webapps/docs/config/project.xml (original) +++ tomcat/trunk/webapps/docs/config/project.xml Sun Sep 25 22:06:57 2011 @@ -15,10 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> -http://tomcat.apache.org/";> - Apache Tomcat 7 Configuration Reference + Apache Tomcat 8 Configuration Reference The Apache Tomcat Servlet/JSP Container Modified: tomcat/trunk/webapps/docs/project.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/project.xml?rev=1175597&r1=1175596&r2=1175597&view=diff == --- tomcat/trunk/webapps/docs/project.xml (original) +++ tomcat/trunk/webapps/docs/project.xml Sun Sep 25 22:06:57 2011 @@ -18,7 +18,7 @@ http://tomcat.apache.org/";> -Apache Tomcat 7 +Apache Tomcat 8 The Apache Tomcat Servlet/JSP Container - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175598 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: rjung Date: Sun Sep 25 22:09:13 2011 New Revision: 1175598 URL: http://svn.apache.org/viewvc?rev=1175598&view=rev Log: Add changelog entry for r1175187. 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=1175598&r1=1175597&r2=1175598&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Sep 25 22:09:13 2011 @@ -167,6 +167,9 @@ 7. (markt) +Don't send AJP CPONG if endpoint is already paused. (rjung) + + Align APR AJP connector with NIO one. Send 503 if endpoint is paused. (rjung) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175599 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ajp/AjpAprProcessor.java java/org/apache/coyote/ajp/AjpNioProcessor.java java/org/apache/coyote/ajp/AjpProcessor.java webapps
Author: rjung Date: Sun Sep 25 22:12:08 2011 New Revision: 1175599 URL: http://svn.apache.org/viewvc?rev=1175599&view=rev Log: Accept AJP request even if endpoint is paused, if CPING was successful. Merge of r1175594 from trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 25 22:12:08 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590 +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594 Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1175599&r1=1175598&r2=1175599&view=diff == --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Sun Sep 25 22:12:08 2011 @@ -113,6 +113,7 @@ public class AjpAprProcessor extends Abs long socketRef = socket.getSocket().longValue(); Socket.setrbb(socketRef, inputBuffer); Socket.setsbb(socketRef, outputBuffer); +boolean cping = false; // Error flag error = false; @@ -137,6 +138,7 @@ public class AjpAprProcessor extends Abs recycle(true); break; } +cping = true; if (Socket.send(socketRef, pongMessageArray, 0, pongMessageArray.length) < 0) { error = true; @@ -180,12 +182,13 @@ public class AjpAprProcessor extends Abs } } -if (endpoint.isPaused()) { +if (!cping && endpoint.isPaused()) { // 503 - Service unavailable response.setStatus(503); adapter.log(request, response, 0); error = true; } +cping = false; // Process the request in the adapter if (!error) { Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyot
svn commit: r1175602 - /tomcat/trunk/webapps/docs/tribes/tomcat-docs.xsl
Author: kkolinko Date: Sun Sep 25 22:21:17 2011 New Revision: 1175602 URL: http://svn.apache.org/viewvc?rev=1175602&view=rev Log: Remove unused webapps/docs/tribes/tomcat-docs.xsl The build.xml that does "xslt basedir="webapps/docs/tribes"" uses the common webapps/docs/tomcat-docs.xsl instead. Removed: tomcat/trunk/webapps/docs/tribes/tomcat-docs.xsl - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175610 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/tribes/tomcat-docs.xsl
Author: kkolinko Date: Sun Sep 25 22:33:30 2011 New Revision: 1175610 URL: http://svn.apache.org/viewvc?rev=1175610&view=rev Log: Merged revision(s) 1175602 from tomcat/trunk: Remove unused webapps/docs/tribes/tomcat-docs.xsl The build.xml that does "xslt basedir="webapps/docs/tribes"" uses the common webapps/docs/tomcat-docs.xsl instead. Removed: tomcat/tc7.0.x/trunk/webapps/docs/tribes/tomcat-docs.xsl Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 25 22:33:30 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594 +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175612 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl
Author: kkolinko Date: Sun Sep 25 22:36:08 2011 New Revision: 1175612 URL: http://svn.apache.org/viewvc?rev=1175612&view=rev Log: Update version number for Tomcat 8. Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=1175612&r1=1175611&r2=1175612&view=diff == --- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Sun Sep 25 22:36:08 2011 @@ -36,7 +36,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175613 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl
Author: kkolinko Date: Sun Sep 25 22:46:45 2011 New Revision: 1175613 URL: http://svn.apache.org/viewvc?rev=1175613&view=rev Log: Use slightly more correct markup: is block element, while is inline element Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=1175613&r1=1175612&r2=1175613&view=diff == --- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Sun Sep 25 22:46:45 2011 @@ -109,10 +109,8 @@ - - -Version , - + + Version , APACHE LOGO - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175614 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/tomcat-docs.xsl
Author: kkolinko Date: Sun Sep 25 22:48:41 2011 New Revision: 1175614 URL: http://svn.apache.org/viewvc?rev=1175614&view=rev Log: Merged revision 1175613 from tomcat/trunk: Use slightly more correct markup Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 25 22:48:41 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602 +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613 Modified: tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl?rev=1175614&r1=1175613&r2=1175614&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/tomcat-docs.xsl Sun Sep 25 22:48:41 2011 @@ -109,10 +109,8 @@ - - -Version , - + + Version , APACHE LOGO - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175620 - /tomcat/tc6.0.x/trunk/build.properties.default
Author: kkolinko Date: Sun Sep 25 23:11:26 2011 New Revision: 1175620 URL: http://svn.apache.org/viewvc?rev=1175620&view=rev Log: Remove explicit definition for ${version}, so that "-dev" suffix is properly added to development builds. CTR Modified: tomcat/tc6.0.x/trunk/build.properties.default Modified: tomcat/tc6.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=1175620&r1=1175619&r2=1175620&view=diff == --- tomcat/tc6.0.x/trunk/build.properties.default (original) +++ tomcat/tc6.0.x/trunk/build.properties.default Sun Sep 25 23:11:26 2011 @@ -30,7 +30,6 @@ version.minor=0 version.build=33 version.patch=0 version.suffix=-dev -version=6.0.33 # - Default Base Path for Dependent Packages - # Please note this path must be absolute, not relative, - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175621 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Sun Sep 25 23:14:41 2011 New Revision: 1175621 URL: http://svn.apache.org/viewvc?rev=1175621&view=rev Log: proposal 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=1175621&r1=1175620&r2=1175621&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Sep 25 23:14:41 2011 @@ -85,6 +85,12 @@ PATCHES PROPOSED TO BACKPORT: kkolinko: In trunk it is r1174353. Maybe better to merge from there instead of r1174359, for consistency. The code is the same in both. +* Add build date and version to documentation pages + Automate copyright end date + It is based on r962466 + http://people.apache.org/~kkolinko/patches/2011-09-26_tc6_docs-date.patch + +1: kkolinko + -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175633 - in /tomcat/trunk/webapps: docs/config/filter.xml docs/config/valve.xml docs/manager-howto.xml host-manager/META-INF/context.xml manager/META-INF/context.xml
Author: kkolinko Date: Mon Sep 26 00:24:20 2011 New Revision: 1175633 URL: http://svn.apache.org/viewvc?rev=1175633&view=rev Log: There is a caveat when using RemoteAddrValve with IPv6 addresses - see thread "tomcat 7.0.21: bug in RemoteAddrValve?" of 2011-09-14 on users@ Document it and update configuration examples in manager and host-manager apps. Add usage examples to valve.html, filter.html. Modified: tomcat/trunk/webapps/docs/config/filter.xml tomcat/trunk/webapps/docs/config/valve.xml tomcat/trunk/webapps/docs/manager-howto.xml tomcat/trunk/webapps/host-manager/META-INF/context.xml tomcat/trunk/webapps/manager/META-INF/context.xml Modified: tomcat/trunk/webapps/docs/config/filter.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1175633&r1=1175632&r2=1175633&view=diff == --- tomcat/trunk/webapps/docs/config/filter.xml (original) +++ tomcat/trunk/webapps/docs/config/filter.xml Mon Sep 26 00:24:20 2011 @@ -531,6 +531,15 @@ FINE: Request "/docs/config/manager.html package. Please consult the Java documentation for details of the expressions supported. +Note: There is a caveat when using this filter with +IPv6 addresses. Format of the IP address that this valve is processing +depends on the API that was used to obtain it. If the address was obtained +from Java socket using Inet6Address class, its format will be +x:x:x:x:x:x:x:x. That is, the IP address for localhost +will be 0:0:0:0:0:0:0:1 instead of the more widely used +::1. Consult your access logs for the actual value. + +See also: Remote Host Filter. @@ -569,6 +578,24 @@ FINE: Request "/docs/config/manager.html + +To allow access only for the clients connecting from localhost: + ++ +Remote Address Filter +org.apache.catalina.filters.RemoteAddrFilter ++ +allow +127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1 ++ + + + @@ -586,6 +613,7 @@ FINE: Request "/docs/config/manager.html package. Please consult the Java documentation for details of the expressions supported. +See also: Remote Address Filter. Modified: tomcat/trunk/webapps/docs/config/valve.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1175633&r1=1175632&r2=1175633&view=diff == --- tomcat/trunk/webapps/docs/config/valve.xml (original) +++ tomcat/trunk/webapps/docs/config/valve.xml Mon Sep 26 00:24:20 2011 @@ -509,6 +509,16 @@ package. Please consult the Java documentation for details of the expressions supported. +Note: There is a caveat when using this valve with +IPv6 addresses. Format of the IP address that this valve is processing +depends on the API that was used to obtain it. If the address was obtained +from Java socket using Inet6Address class, its format will be +x:x:x:x:x:x:x:x. That is, the IP address for localhost +will be 0:0:0:0:0:0:0:1 instead of the more widely used +::1. Consult your access logs for the actual value. + +See also: Remote Host Filter, +Remote IP Valve. @@ -544,6 +554,14 @@ + +To allow access only for the clients connecting from localhost: + +Remote Address Filter +/* ++ + + @@ -565,6 +583,7 @@ package. Please consult the Java documentation for details of the expressions supported. +See also: Remote Address Filter. Modified: tomcat/trunk/webapps/docs/manager-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/manager-howto.xml?rev=1175633&r1=1175632&r2=1175633&view=diff == --- tomcat/trunk/webapps/docs/manager-howto.xml (original) +++ tomcat/trunk/webapps/docs/manager-howto.xml Mon Sep 26 00:24:20 2011 @@ -159,7 +159,9 @@ the role manager-script In addition to the password restrictions the Manager web application could be restricted by the remote IP address or host by adding a -RemoteAddrValve or RemoteHostValve. Here is +RemoteAddrValve or RemoteHostValve. +See valves documentation +for details. Here is an example of restricting access to the localhost by IP address: Modified: tomcat/trunk/webapps/host-manager/META-INF/context.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/host-manager/META-INF/context.xml?rev=1175633&r1=1175632&r2=1175633&view=diff
svn commit: r1175635 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/config/filter.xml webapps/docs/config/valve.xml webapps/docs/manager-howto.xml webapps/host-manager/META-INF
Author: kkolinko Date: Mon Sep 26 00:34:14 2011 New Revision: 1175635 URL: http://svn.apache.org/viewvc?rev=1175635&view=rev Log: Merged revision(s) 1175633 from tomcat/trunk: There is a caveat when using RemoteAddrValve with IPv6 addresses - see thread "tomcat 7.0.21: bug in RemoteAddrValve?" of 2011-09-14 on users@ Document it and update configuration examples in manager and host-manager apps. Add usage examples to valve.html, filter.html. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml tomcat/tc7.0.x/trunk/webapps/docs/config/valve.xml tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml tomcat/tc7.0.x/trunk/webapps/host-manager/META-INF/context.xml tomcat/tc7.0.x/trunk/webapps/manager/META-INF/context.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 26 00:34:14 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613 +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633 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=1175635&r1=1175634&r2=1175635&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 26 00:34:14 2011 @@ -216,6 +216,10 @@ Correct the documentation for connectionLinger attribute for the AJP and HTTP connectors. (markt) + +Document caveat of using RemoteAddrValve with IPv6 +addresses. (kkolinko) + Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml?rev=1175635&r1=1175634&r2=1175635&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml Mon Sep 26 00:34:14 2011 @@ -531,6 +531,15 @@ FINE: Request "/docs/config/manager.html package. Please consult the Java documentation for details of the expressions supported. +Note: There is a caveat when using this filter with +IPv6 addresses. Format of the IP address that this valve is processing +depends on the API that was used to obtain it. If
svn commit: r1175638 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kfujino Date: Mon Sep 26 00:59:58 2011 New Revision: 1175638 URL: http://svn.apache.org/viewvc?rev=1175638&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=1175638&r1=1175637&r2=1175638&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Sep 26 00:59:58 2011 @@ -73,13 +73,13 @@ PATCHES PROPOSED TO BACKPORT: There is no need to call size() on a liked list to check whether it is empty, especially if it is followed by us iterating the list by ourselves. http://svn.apache.org/viewvc?rev=1173614&view=rev - +1: kkolinko, markt + +1: kkolinko, markt, kfujino -1: * bug 51862: JreMemoryLeakPreventionListener enhancement to load configurable classes https://issues.apache.org/bugzilla/show_bug.cgi?id=51862 http://svn.apache.org/viewvc?rev=1174359&view=rev - +1: slaurent, kkolinko + +1: slaurent, kkolinko, kfujino -1: kkolinko: In trunk it is r1174353. Maybe better to merge from there @@ -89,7 +89,7 @@ PATCHES PROPOSED TO BACKPORT: Automate copyright end date It is based on r962466 http://people.apache.org/~kkolinko/patches/2011-09-26_tc6_docs-date.patch - +1: kkolinko + +1: kkolinko, kfujino -1: PATCHES/ISSUES THAT ARE STALLED - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1170485 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
2011/9/14 : > Author: kfujino > Date: Wed Sep 14 09:05:40 2011 > New Revision: 1170485 > > URL: http://svn.apache.org/viewvc?rev=1170485&view=rev > Log: > Additional fix for r1170479. > Make sure calling disconnect() when only setDiscarded(true) is called and the > real connection is not closed. > > Modified: > > tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java > > Modified: > tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java > URL: > http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1170485&r1=1170484&r2=1170485&view=diff > == > --- > tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java > (original) > +++ > tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java > Wed Sep 14 09:05:40 2011 > @@ -309,7 +309,7 @@ public class PooledConnection { > * @param finalize if set to true, a call to {@link > ConnectionPool#finalize(PooledConnection)} is called. > */ > private void disconnect(boolean finalize) { > - if (isDiscarded()) { > + if (isDiscarded() && connection == null) { > return; > } I think that the above code had to be if (isDiscarded() || connection == null) { return; } > setDiscarded(true); > 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: r1175643 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Mon Sep 26 01:16:46 2011 New Revision: 1175643 URL: http://svn.apache.org/viewvc?rev=1175643&view=rev Log: Correct issue number. Add missing changelog entry for r1169796. 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=1175643&r1=1175642&r2=1175643&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 26 01:16:46 2011 @@ -230,6 +230,10 @@ ArrayBlockingQueue doesn't allow capacity of 0 or less. (kfujino) +48392 (1169796): In jdbc-pool: Fix typo in +StatementDecoratorInterceptor. (fhanik) + + 51139: In jdbc-pool: validatorClassName and suspectTimeout are ignored. In order to support them correctly, validatorClassName and @@ -241,7 +245,7 @@ It removes from the active connection list. (kfujino) -51781: In jdbc-pool: Fix dependency in Maven POM file of +51871: In jdbc-pool: Fix dependency in Maven POM file of tomcat-jbdc. (kkolinko) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1175676 - /tomcat/tc7.0.x/trunk/
Author: kkolinko Date: Mon Sep 26 05:24:20 2011 New Revision: 1175676 URL: http://svn.apache.org/viewvc?rev=1175676&view=rev Log: Update mergeinfo: mark r1156519 as merged: this change was committed in r1156518. Modified: tomcat/tc7.0.x/trunk/ (props changed) Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 26 05:24:20 2011 @@ -1 +1 @@ -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,117 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633 +/tomcat/trunk:1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288 ,117,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1170485 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
2011/9/26 Konstantin Kolinko : > 2011/9/14 : >> Author: kfujino >> Date: Wed Sep 14 09:05:40 2011 >> New Revision: 1170485 >> >> URL: http://svn.apache.org/viewvc?rev=1170485&view=rev >> Log: >> Additional fix for r1170479. >> Make sure calling disconnect() when only setDiscarded(true) is called and >> the real connection is not closed. >> >> Modified: >> >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java >> >> Modified: >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java >> URL: >> http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1170485&r1=1170484&r2=1170485&view=diff >> == >> --- >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java >> (original) >> +++ >> tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java >> Wed Sep 14 09:05:40 2011 >> @@ -309,7 +309,7 @@ public class PooledConnection { >> * @param finalize if set to true, a call to {@link >> ConnectionPool#finalize(PooledConnection)} is called. >> */ >> private void disconnect(boolean finalize) { >> - if (isDiscarded()) { >> + if (isDiscarded() && connection == null) { >> return; >> } > > I think that the above code had to be > if (isDiscarded() || connection == null) { > return; > } > I understand the code now. Your change was OK. I did not notice that there is "if (connection != null) {}" block below, that handles the case of null connection. 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: r1175690 - /tomcat/trunk/webapps/docs/tomcat-docs.xsl
Author: kkolinko Date: Mon Sep 26 06:38:51 2011 New Revision: 1175690 URL: http://svn.apache.org/viewvc?rev=1175690&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50923 Use slightly different color for tags Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl Modified: tomcat/trunk/webapps/docs/tomcat-docs.xsl URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/tomcat-docs.xsl?rev=1175690&r1=1175689&r2=1175690&view=diff == --- tomcat/trunk/webapps/docs/tomcat-docs.xsl (original) +++ tomcat/trunk/webapps/docs/tomcat-docs.xsl Mon Sep 26 06:38:51 2011 @@ -81,6 +81,9 @@ .noPrint {display: none;} td#mainBody {width: 100%;} + +code {color:rgb(0,64,64);} +
DO NOT REPLY [Bug 50923] Difficult to pick out valid values from config descriptions
https://issues.apache.org/bugzilla/show_bug.cgi?id=50923 --- Comment #7 from Konstantin Kolinko 2011-09-26 06:52:00 UTC --- I changed the color for tags in trunk in r1175690. Generated documentation is available at buildbot. Please review. I am hesitant to introduce another tag. BTW, the generated template uses tags and other old markup. It would be nice to get rid of it at some day. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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