Bug report for Tomcat Native [2019/02/17]
+---+ | 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 | | | | | | | |53940|New|Enh|2012-09-27|Added support for new CRL loading after expiration| |57815|New|Enh|2015-04-15|Improve error message when OpenSSL does not suppor| |59286|New|Nor|2016-04-07|Socket binding failures when using APR| |62626|Inf|Nor|2018-08-15|Tomcat 9.0.10 APR/Native crashes | |62911|New|Enh|2018-11-15|Add support for proxying ocsp requests via ProxyH| |63159|New|Nor|2019-02-08|Problem with native/Makefile.in introduced with na| +-+---+---+--+--+ | Total6 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 [2019/02/17]
+---+ | 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 | | | | | | | |50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen| |51595|Inf|Nor|2011-08-01|org.apache.tomcat.jdbc.pool.jmx.ConnectionPool sho| |51879|Inf|Enh|2011-09-22|Improve access to Native Connection Methods | |52024|Inf|Enh|2011-10-13|Custom interceptor to support automatic failover o| |53199|Inf|Enh|2012-05-07|Refactor ConnectionPool to use ScheduledExecutorSe| |54437|New|Enh|2013-01-16|Update PoolProperties javadoc for ConnectState int| |54929|Inf|Nor|2013-05-05|jdbc-pool cannot be used with Java 1.5, "java.lang| |55078|New|Nor|2013-06-07|Configuring a DataSource Resource with dataSourceJ| |55662|New|Enh|2013-10-17|Add a way to set an instance of java.sql.Driver di| |56046|New|Enh|2014-01-21|org.apache.tomcat.jdbc.pool.XADataSource InitSQL p| |56088|New|Maj|2014-01-29|AbstractQueryReport$StatementProxy throws exceptio| |56310|Inf|Maj|2014-03-25|PooledConnection and XAConnection not handled corr| |56586|New|Nor|2014-06-02|initSQL should be committed if defaultAutoCommit =| |56775|New|Nor|2014-07-28|PoolCleanerTime schedule issue| |56779|New|Nor|2014-07-28|Allow multiple connection initialization statement| |56790|New|Nor|2014-07-29|Resizing pool.maxActive to a higher value at runti| |56798|New|Nor|2014-07-31|Idle eviction strategy could perform better (and i| |56804|New|Nor|2014-08-02|Use a default validationQueryTimeout other than "f| |56805|New|Nor|2014-08-02|datasource.getConnection() may be unnecessarily bl| |56837|New|Nor|2014-08-11|if validationQuery have error with timeBetweenEvic| |56970|New|Nor|2014-09-11|MaxActive vs. MaxTotal for commons-dbcp and tomcat| |56974|New|Nor|2014-09-12|jdbc-pool validation query defaultAutoCommit statu| |57460|New|Nor|2015-01-19|[DB2]Connection broken after few hours but not rem| |57729|New|Enh|2015-03-20|Add QueryExecutionReportInterceptor to log query e| |58489|Opn|Maj|2015-10-08|QueryStatsComparator throws IllegalArgumentExcepti| |59077|New|Nor|2016-02-26|DataSourceFactory creates a neutered data source | |59569|New|Nor|2016-05-18|isWrapperFor/unwrap implementations incorrect | |59879|New|Nor|2016-07-18|StatementCache interceptor returns ResultSet objec| |60195|New|Nor|2016-10-02|No javadoc in Maven Central | |60522|New|Nor|2016-12-27|An option for setting if the transaction should be| |60524|Inf|Nor|2016-12-28|NPE in SlowQueryReport in tomcat-jdbc-7.0.68 | |60645|New|Nor|2017-01-25|StatementFinalizer is not thread-safe | |61032|New|Nor|2017-04-24|min pool size is not being respected | |61103|New|Nor|2017-05-18|StatementCache potentially caching non-functional | |61302|New|Enh|2017-07-15|Refactoring of DataSourceProxy| |61303|New|Enh|2017-07-15|Refactoring of ConnectionPool | |62432|New|Nor|2018-06-06|Memory Leak in Statement Finalizer? | |62598|New|Enh|2018-08-04|support pool with multiple JDBC data sources | |62910|Inf|Nor|2018-11-15|tomcat-jdbc global pool transaction problem | +-+---+---+--+--+ | Total 39 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Connectors [2019/02/17]
+---+ | 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 | | | | | | | |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47327|New|Enh|2009-06-07|Return tomcat authenticated user back to mod_jk (A| |47750|New|Maj|2009-08-27|ISAPI: Loss of worker settings when changing via j| |47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit| |48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv| |49822|New|Enh|2010-08-25|Add hash lb worker method | |49903|New|Enh|2010-09-09|Make workers file reloadable | |52483|New|Enh|2012-01-18|Print JkOptions's options in log file and jkstatus| |53883|Inf|Maj|2012-09-17|isapi_redirect v 1.2.37 crashes w3wp.exe on the p| |54621|New|Enh|2013-02-28|[PATCH] custom mod_jk availability checks | |56489|New|Enh|2014-05-05|Include a directory for configuration files | |56576|New|Enh|2014-05-29|Websocket support | |57402|New|Enh|2014-12-30|Provide correlation ID between mod_jk log and acce| |57403|New|Enh|2014-12-30|Persist configuration changes made via status work| |57407|New|Enh|2014-12-31|Make session_cookie, session_path and session_cook| |57790|New|Enh|2015-04-03|Check worker names for typos | |61476|New|Enh|2017-09-01|Allow reset of an individual worker stat value| |61621|New|Enh|2017-10-15|Content-Type is forced to lowercase when it goes t| |62093|New|Enh|2018-02-09|Allow use_server_errors to apply to specific statu| +-+---+---+--+--+ | 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 7 [2019/02/17]
+---+ | 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 | | | | | | | |50944|Ver|Blk|2011-03-18|JSF: java.lang.NullPointerException at com.sun.fac| |53620|New|Enh|2012-07-30|[juli] delay opening a file until something gets l| |55104|New|Enh|2013-06-16|Allow passing arguments with spaces to Commons Dae| |55470|New|Enh|2013-08-23|Help users for ClassNotFoundExceptions during star| |55477|New|Enh|2013-08-23|Add a solution to map an realm name to a security | |56148|New|Enh|2014-02-17|support (multiple) ocsp stapling | |56181|New|Enh|2014-02-23|RemoteIpValve & RemoteIpFilter: HttpServletRequest| |56300|New|Enh|2014-03-22|[Tribes] No useful examples, lack of documentation| |56438|New|Enh|2014-04-21|If jar scan does not find context config or TLD co| |56614|New|Enh|2014-06-12|Add a switch to ignore annotations detection on ta| |56787|New|Enh|2014-07-29|Simplified jndi name parsing | |57367|New|Enh|2014-12-18|If JAR scan experiences a stack overflow, give the| |57827|New|Enh|2015-04-17|Enable adding/removing of members via jmx in a sta| |57872|New|Enh|2015-04-29|Do not auto-switch session cookie to version=1 due| |57892|New|Enh|2015-05-05|Log once a warning if a symbolic link is ignored (| |58338|New|Nor|2015-09-07|BasicDataSourceFactory uses wrong attribute name | |59716|New|Enh|2016-06-17|Allow JNDI configuration of CorsFilter| |60597|New|Enh|2017-01-17|Add ability to set cipher suites for websocket cli| |63167|New|Enh|2019-02-12|Network Requirements To Resolve No Members Active | +-+---+---+--+--+ | 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 Taglibs [2019/02/17]
+---+ | 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 | |57548|New|Min|2015-02-08|Auto-generate the value for org.apache.taglibs.sta| |57684|New|Min|2015-03-10|Version info should be taken from project version | |59359|New|Enh|2016-04-20|(Task) Extend validity period for signing KEY - be| |59668|New|Nor|2016-06-06|x:forEach retains the incorrect scope when used in| |61875|New|Nor|2017-12-08|Investigate whether Xalan can be removed | +-+---+---+--+--+ | Total 10 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 9 [2019/02/17]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |57505|New|Enh|2015-01-27|Add integration tests for JspC| |57661|New|Enh|2015-03-04|Delay sending of 100 continue response until appli| |58242|New|Enh|2015-08-13|Scanning jars in classpath to get annotations in p| |58530|New|Enh|2015-10-23|Proposal for new Manager HTML GUI | |58548|New|Enh|2015-10-26|support certifcate transparency | |58859|New|Enh|2016-01-14|Allow to limit charsets / encodings supported by T| |59203|New|Enh|2016-03-21|Try to call Thread.interrupt before calling Thread| |59344|Ver|Enh|2016-04-18|PEM file support for JSSE | |59750|New|Enh|2016-06-24|Amend "authenticate" method with context by means | |59901|New|Enh|2016-07-26|Reduce I/O associated with JSP compilation| |60997|New|Enh|2017-04-17|Enhance SemaphoreValve to support denied status an| |61971|New|Enh|2018-01-06|documentation for using tomcat with systemd | |62048|New|Enh|2018-01-25|Missing logout function in Manager and Host-Manage| |62072|New|Enh|2018-02-01|Add support for request compression | |62140|New|Enh|2018-02-27|catalina.sh should document the verbs it accepts a| |62312|New|Enh|2018-04-18|Add Proxy Authentication support to websocket clie| |62405|New|Enh|2018-05-23|Add Rereadable Request Filter | |62488|New|Enh|2018-06-25|Obtain dependencies from Maven Central where possi| |62611|New|Enh|2018-08-09|Compress log files after rotation | |62695|Inf|Nor|2018-09-07|Provide sha512 checksums for Tomcat releases publi| |62696|New|Enh|2018-09-07|Consider use of sha256 for signing of .exe files o| |62723|New|Enh|2018-09-14|Clarify "channelSendOptions" value in cluster docu| |62773|New|Enh|2018-09-28|Change DeltaManager to handle session deserializat| |62814|New|Enh|2018-10-10|Use readable names for cluster channel/map options| |62841|New|Enh|2018-10-20|Refactor DeltaSession locking | |62843|New|Enh|2018-10-22|Tomcat Russian localization | |62920|New|Enh|2018-11-17|Maven Plugin For Tomcat 9.0.x | |62964|New|Enh|2018-11-29|Add RFC7807 conformant Problem Details for HTTP st| |63023|New|Enh|2018-12-20|Provide a way to load SecurityProviders into the s| |63049|New|Enh|2018-12-31|Add support in system properties override from com| +-+---+---+--+--+ | Total 30 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 8 [2019/02/17]
+---+ | 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 | | | | | | | |53930|Opn|Enh|2012-09-24|allow capture of catalina stdout/stderr to a comma| |55243|New|Enh|2013-07-11|Add special search string for nested roles| |55252|New|Enh|2013-07-12|Separate Ant and command-line wrappers for JspC | |55383|New|Enh|2013-08-07|Improve markup and design of Tomcat's HTML pages | |9|New|Enh|2013-09-14|UserDatabaseRealm enhacement: may use local JNDI | |55675|New|Enh|2013-10-18|Checking and handling invalid configuration option| |55788|New|Enh|2013-11-16|TagPlugins should key on tag QName rather than imp| |55969|New|Enh|2014-01-07|Security-related enhancements to the Windows Insta| |56166|New|Enh|2014-02-20|Suggestions for exception handling (avoid potentia| |56361|New|Enh|2014-04-08|org.apache.tomcat.websocket.WsWebSocketContainer#b| |56398|New|Enh|2014-04-11|Support Arquillian-based unit testing | |56399|New|Enh|2014-04-11|Re-factor request/response recycling so Coyote and| |56402|New|Enh|2014-04-11|Add support for HTTP Upgrade to AJP components| |56448|New|Enh|2014-04-23|Implement a robust solution for client initiated S| |56522|Opn|Enh|2014-05-14|jasper-el 8 does not comply to EL Spec 3.0 regardi| |56546|New|Enh|2014-05-19|Improve thread trace logging in WebappClassLoader.| |56713|New|Enh|2014-07-12|Limit time that incoming request waits while webap| |56724|New|Enh|2014-07-15|Restart Container background thread if it died une| |56890|Inf|Maj|2014-08-26|getRealPath returns null | |56966|New|Enh|2014-09-11|AccessLogValve's elapsed time has 15ms precision o| |57130|New|Enh|2014-10-22|Allow digest.sh to accept password from a file or | |57287|New|Enh|2014-11-29|Sort files listed by DefaultServlet | |57421|New|Enh|2015-01-07|Farming default directories | |57486|New|Enh|2015-01-23|Improve reuse of ProtectedFunctionMapper instances| |57665|New|Enh|2015-03-05|support x-forwarded-host | |57701|New|Enh|2015-03-13|Implement "[Redeploy]" button for a web applicatio| |57830|New|Enh|2015-04-18|Add support for ProxyProtocol | |58052|Opn|Enh|2015-06-19|RewriteValve: Implement additional RewriteRule dir| |58072|New|Enh|2015-06-23|ECDH curve selection | |58143|Opn|Enh|2015-07-15|The WebppClassLoader doesn't call transformers on | |58577|New|Enh|2015-11-03|JMX Proxy Servlet can't handle overloaded methods | |58837|New|Enh|2016-01-12|support "X-Content-Security-Policy" a.k.a as "CSP"| |58935|Opn|Enh|2016-01-29|Re-deploy from war without deleting context | |59232|New|Enh|2016-03-24|Make the context name of an app available via JNDI| |59423|New|Enh|2016-05-03|amend "No LoginModules configured for ..." with hi| |59758|New|Enh|2016-06-27|Add http proxy username-password credentials suppo| |60281|Ver|Nor|2016-10-20|Pathname of uploaded WAR file should not be contai| |60721|Ver|Nor|2017-02-10|Unable to find key spec if more applications use b| |60781|New|Nor|2017-02-27|Access Log Valve does not escape the same as mod_l| |60849|New|Enh|2017-03-13|Tomcat NIO Connector not able to handle SSL renego| |61668|Ver|Min|2017-10-26|Possible NullPointerException in org.apache.coyote| |61877|New|Enh|2017-12-08|use web.xml from CATALINA_HOME by default | |61917|New|Enh|2017-12-19|AddDefaultCharsetFilter only supports text/* respo| |62150|New|Enh|2018-03-01|Behavior of relative paths with RequestDispatcher | |62214|New|Enh|2018-03-22|The "userSubtree=true" and "roleSubtree=true" in J| |62245|New|Enh|2018-04-02|[Documentation] Mention contextXsltFile in Default| |62496|New|Enh|2018-06-27|Add possibility write remote user/auth type to res| |62912|New|Enh|2018-11-15|Tomcat adds a space character in the Content-Type | |63080|New|Enh|2019-01-16|Support rfc7239 Forwarded header | |63182|Inf|Nor|2019-02-16|Servlet 3.1 ReadListener got exception(sometime) w| +-+---+---+--+--+ | Total
Re: [VOTE] Release Apache Tomcat 7.0.93
Hi Rainer, On Sat, Feb 16, 2019 at 2:42 PM Rainer Jung wrote: > Hi Igal, > > Am 16.02.2019 um 22:10 schrieb Igal Sapir: > > Violeta, > > > > On Sat, Feb 16, 2019 at 9:41 AM Violeta Georgieva > > wrote: > > > >> The proposed Apache Tomcat 7.0.93 release is now available for voting. > >> > >> > > I know that this is an issue with my environment, and not with Tomcat, > but > > I wonder how you get it to download the dependencies with Java 6 since > the > > ciphers in Java 6 are outdated (log excerpt below [1]). > > > > For the record, I downloaded JDK6, JDK7, and ANT1.8.4, set the path to > JDK7 > > in build.properties, and JAVA_HOME and ANT_HOME to JDK6 and ANT1.8.4 > > respectively. > > My workaround is currently somethin like: > > export JAVA_HOME=/usr/local/jdk1.7.0 > > export ANT_OPTS="-Djavax.net.ssl.trustStore=/path/to/cacerts > -Djavax.net.ssl.trustStorePassword=changeit > -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2" > > ant download-dist > ant download-validate > ant download-compile > ant download-test-compile > ant download-cobertura > ant extras-commons-logging-prepare > ant extras-webservices-prepare > > export JAVA_HOME=/usr/local/jdk1.6.0 > > export ANT_OPTS="-Djavax.net.ssl.trustStore=/path/to/cacerts > -Djavax.net.ssl.trustStorePassword=changeit" > > ant release > ant test > Thank you, that makes sense. I'm running the tests now. Best, Igal > > Regards, > > Rainer > > > > [1] > > [get] Error getting > > https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar to > > /home/ux/tomcat-build-libs/download-2104110046.tmp > > > > BUILD FAILED > > /home/ux/Downloads/apache-tomcat-7.0.93-src/build.xml:2702: The following > > error occurred while executing this line: > > /home/ux/Downloads/apache-tomcat-7.0.93-src/build.xml:3066: > > javax.net.ssl.SSLException: Received fatal alert: protocol_version > > at > com.sun.net.ssl.internal.ssl.Alerts.getSSLException(Alerts.java:190) > > at > com.sun.net.ssl.internal.ssl.Alerts.getSSLException(Alerts.java:136) > > at > > > com.sun.net.ssl.internal.ssl.SSLSocketImpl.recvAlert(SSLSocketImpl.java:1822) > > at > > > com.sun.net.ssl.internal.ssl.SSLSocketImpl.readRecord(SSLSocketImpl.java:1004) > > at > > > com.sun.net.ssl.internal.ssl.SSLSocketImpl.performInitialHandshake(SSLSocketImpl.java:1188) > > at > > > com.sun.net.ssl.internal.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:1215) > > at > > > com.sun.net.ssl.internal.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:1199) > > at > > sun.net.www.protocol.https.HttpsClient.afterConnect(HttpsClient.java:434) > > at > > > sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection.connect(AbstractDelegateHttpsURLConnection.java:166) > > at > > > sun.net.www.protocol.https.HttpsURLConnectionImpl.connect(HttpsURLConnectionImpl.java:133) > > at > > org.apache.tools.ant.taskdefs.Get$GetThread.openConnection(Get.java:660) > > at org.apache.tools.ant.taskdefs.Get$GetThread.get(Get.java:579) > > at org.apache.tools.ant.taskdefs.Get$GetThread.run(Get.java:569) > > > > > > > > > > > >> It can be obtained from: > >> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.93/ > >> The Maven staging repo is: > >> > https://repository.apache.org/content/repositories/orgapachetomcat-1204/ > >> The svn tag is: > >> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ > >> > >> The proposed 7.0.93 release is: > >> [ ] Broken - do not release > >> [ ] Stable - go ahead and release as 7.0.93 Stable > >> > >> Regards, > >> Violeta >
Re: [VOTE] Release Apache Tomcat 7.0.93
Hi Igal, Am 16.02.2019 um 22:10 schrieb Igal Sapir: Violeta, On Sat, Feb 16, 2019 at 9:41 AM Violeta Georgieva wrote: The proposed Apache Tomcat 7.0.93 release is now available for voting. I know that this is an issue with my environment, and not with Tomcat, but I wonder how you get it to download the dependencies with Java 6 since the ciphers in Java 6 are outdated (log excerpt below [1]). For the record, I downloaded JDK6, JDK7, and ANT1.8.4, set the path to JDK7 in build.properties, and JAVA_HOME and ANT_HOME to JDK6 and ANT1.8.4 respectively. My workaround is currently somethin like: export JAVA_HOME=/usr/local/jdk1.7.0 export ANT_OPTS="-Djavax.net.ssl.trustStore=/path/to/cacerts -Djavax.net.ssl.trustStorePassword=changeit -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2" ant download-dist ant download-validate ant download-compile ant download-test-compile ant download-cobertura ant extras-commons-logging-prepare ant extras-webservices-prepare export JAVA_HOME=/usr/local/jdk1.6.0 export ANT_OPTS="-Djavax.net.ssl.trustStore=/path/to/cacerts -Djavax.net.ssl.trustStorePassword=changeit" ant release ant test Regards, Rainer [1] [get] Error getting https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar to /home/ux/tomcat-build-libs/download-2104110046.tmp BUILD FAILED /home/ux/Downloads/apache-tomcat-7.0.93-src/build.xml:2702: The following error occurred while executing this line: /home/ux/Downloads/apache-tomcat-7.0.93-src/build.xml:3066: javax.net.ssl.SSLException: Received fatal alert: protocol_version at com.sun.net.ssl.internal.ssl.Alerts.getSSLException(Alerts.java:190) at com.sun.net.ssl.internal.ssl.Alerts.getSSLException(Alerts.java:136) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.recvAlert(SSLSocketImpl.java:1822) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.readRecord(SSLSocketImpl.java:1004) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.performInitialHandshake(SSLSocketImpl.java:1188) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:1215) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:1199) at sun.net.www.protocol.https.HttpsClient.afterConnect(HttpsClient.java:434) at sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection.connect(AbstractDelegateHttpsURLConnection.java:166) at sun.net.www.protocol.https.HttpsURLConnectionImpl.connect(HttpsURLConnectionImpl.java:133) at org.apache.tools.ant.taskdefs.Get$GetThread.openConnection(Get.java:660) at org.apache.tools.ant.taskdefs.Get$GetThread.get(Get.java:579) at org.apache.tools.ant.taskdefs.Get$GetThread.run(Get.java:569) It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.93/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1204/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ The proposed 7.0.93 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.93 Stable Regards, Violeta - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.93
Violeta, On Sat, Feb 16, 2019 at 9:41 AM Violeta Georgieva wrote: > The proposed Apache Tomcat 7.0.93 release is now available for voting. > > I know that this is an issue with my environment, and not with Tomcat, but I wonder how you get it to download the dependencies with Java 6 since the ciphers in Java 6 are outdated (log excerpt below [1]). For the record, I downloaded JDK6, JDK7, and ANT1.8.4, set the path to JDK7 in build.properties, and JAVA_HOME and ANT_HOME to JDK6 and ANT1.8.4 respectively. Thanks, Igal [1] [get] Error getting https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar to /home/ux/tomcat-build-libs/download-2104110046.tmp BUILD FAILED /home/ux/Downloads/apache-tomcat-7.0.93-src/build.xml:2702: The following error occurred while executing this line: /home/ux/Downloads/apache-tomcat-7.0.93-src/build.xml:3066: javax.net.ssl.SSLException: Received fatal alert: protocol_version at com.sun.net.ssl.internal.ssl.Alerts.getSSLException(Alerts.java:190) at com.sun.net.ssl.internal.ssl.Alerts.getSSLException(Alerts.java:136) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.recvAlert(SSLSocketImpl.java:1822) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.readRecord(SSLSocketImpl.java:1004) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.performInitialHandshake(SSLSocketImpl.java:1188) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:1215) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:1199) at sun.net.www.protocol.https.HttpsClient.afterConnect(HttpsClient.java:434) at sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection.connect(AbstractDelegateHttpsURLConnection.java:166) at sun.net.www.protocol.https.HttpsURLConnectionImpl.connect(HttpsURLConnectionImpl.java:133) at org.apache.tools.ant.taskdefs.Get$GetThread.openConnection(Get.java:660) at org.apache.tools.ant.taskdefs.Get$GetThread.get(Get.java:579) at org.apache.tools.ant.taskdefs.Get$GetThread.run(Get.java:569) > It can be obtained from: > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.93/ > The Maven staging repo is: > https://repository.apache.org/content/repositories/orgapachetomcat-1204/ > The svn tag is: > http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ > > The proposed 7.0.93 release is: > [ ] Broken - do not release > [ ] Stable - go ahead and release as 7.0.93 Stable > > Regards, > Violeta >
[Bug 63182] Servlet 3.1 ReadListener got exception(sometime) when invoking servletinputstream.read method, after isReady returns true.
https://bz.apache.org/bugzilla/show_bug.cgi?id=63182 Remy Maucherat changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #3 from Remy Maucherat --- Please provide the test case and details for the problem as your last comment does not match the code given. Note that we have virtually the exact same code and test case in the Tomcat testsuite (as far as the portion given is concerned), so what you have given is not enough to investigate further: org.apache.catalina.nonblocking.TestNonBlockingAPI.testNonBlockingRead -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63183] catalina_pid file not created
https://bz.apache.org/bugzilla/show_bug.cgi?id=63183 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Mark Thomas --- You can use the catalina.sh from 8.5.36 as a workaround until the next 8.5.x release in a few weeks. *** This bug has been marked as a duplicate of bug 63041 *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63041] shutdown.sh exits non 0 requires KILLSIG from OS
https://bz.apache.org/bugzilla/show_bug.cgi?id=63041 Mark Thomas changed: What|Removed |Added CC||harvinder_ru...@hotmail.com --- Comment #32 from Mark Thomas --- *** Bug 63183 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63183] New: catalina_pid file not created
https://bz.apache.org/bugzilla/show_bug.cgi?id=63183 Bug ID: 63183 Summary: catalina_pid file not created Product: Tomcat 8 Version: 8.5.38 Hardware: Other OS: Linux Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: harvinder_ru...@hotmail.com Target Milestone: The catalina pid file is not created even though CATALINA_PID has been set. I am executing "catalina.sh start". This worked for me on the previous version 8.5.37. -- 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: r1853725 - in /tomcat/tc7.0.x/trunk: build.properties.default res/maven/mvn.properties.default webapps/docs/changelog.xml
Author: violetagg Date: Sat Feb 16 17:45:06 2019 New Revision: 1853725 URL: http://svn.apache.org/viewvc?rev=1853725&view=rev Log: Increment version for next dev cycle Modified: tomcat/tc7.0.x/trunk/build.properties.default tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.properties.default?rev=1853725&r1=1853724&r2=1853725&view=diff == --- tomcat/tc7.0.x/trunk/build.properties.default (original) +++ tomcat/tc7.0.x/trunk/build.properties.default Sat Feb 16 17:45:06 2019 @@ -25,7 +25,7 @@ # - Version Control Flags - version.major=7 version.minor=0 -version.build=93 +version.build=94 version.patch=0 version.suffix=-dev Modified: tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default?rev=1853725&r1=1853724&r2=1853725&view=diff == --- tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default (original) +++ tomcat/tc7.0.x/trunk/res/maven/mvn.properties.default Sat Feb 16 17:45:06 2019 @@ -35,7 +35,7 @@ maven.asf.release.repo.url=https://repos maven.asf.release.repo.repositoryId=apache.releases # Release version info -maven.asf.release.deploy.version=7.0.93 +maven.asf.release.deploy.version=7.0.94 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib 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=1853725&r1=1853724&r2=1853725&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Feb 16 17:45:06 2019 @@ -58,6 +58,8 @@ They eventually become mixed with the numbered issues. (I.e., numbered issues do not "pop up" wrt. others). --> + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Tomcat 7.0.93
The proposed Apache Tomcat 7.0.93 release is now available for voting. It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.93/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1204/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ The proposed 7.0.93 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.93 Stable Regards, Violeta
svn commit: r32532 [1/2] - in /dev/tomcat/tomcat-7/v7.0.93: ./ bin/ bin/embed/ bin/extras/ src/
Author: violetagg Date: Sat Feb 16 17:39:46 2019 New Revision: 32532 Log: Stage Tomcat 7.0.93 Added: dev/tomcat/tomcat-7/v7.0.93/ dev/tomcat/tomcat-7/v7.0.93/KEYS dev/tomcat/tomcat-7/v7.0.93/README.html dev/tomcat/tomcat-7/v7.0.93/RELEASE-NOTES dev/tomcat/tomcat-7/v7.0.93/bin/ dev/tomcat/tomcat-7/v7.0.93/bin/README.html dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-deployer.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-deployer.tar.gz.asc dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-deployer.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-deployer.zip (with props) dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-deployer.zip.asc dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-deployer.zip.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-fulldocs.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-fulldocs.tar.gz.asc dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-fulldocs.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-windows-x64.zip (with props) dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-windows-x64.zip.asc dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-windows-x64.zip.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-windows-x86.zip (with props) dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-windows-x86.zip.asc dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93-windows-x86.zip.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93.exe (with props) dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93.exe.asc dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93.exe.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93.tar.gz.asc dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93.zip (with props) dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93.zip.asc dev/tomcat/tomcat-7/v7.0.93/bin/apache-tomcat-7.0.93.zip.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/embed/ dev/tomcat/tomcat-7/v7.0.93/bin/embed/apache-tomcat-7.0.93-embed.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.93/bin/embed/apache-tomcat-7.0.93-embed.tar.gz.asc dev/tomcat/tomcat-7/v7.0.93/bin/embed/apache-tomcat-7.0.93-embed.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/embed/apache-tomcat-7.0.93-embed.zip (with props) dev/tomcat/tomcat-7/v7.0.93/bin/embed/apache-tomcat-7.0.93-embed.zip.asc dev/tomcat/tomcat-7/v7.0.93/bin/embed/apache-tomcat-7.0.93-embed.zip.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/extras/ dev/tomcat/tomcat-7/v7.0.93/bin/extras/catalina-jmx-remote.jar (with props) dev/tomcat/tomcat-7/v7.0.93/bin/extras/catalina-jmx-remote.jar.asc dev/tomcat/tomcat-7/v7.0.93/bin/extras/catalina-jmx-remote.jar.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/extras/catalina-ws.jar (with props) dev/tomcat/tomcat-7/v7.0.93/bin/extras/catalina-ws.jar.asc dev/tomcat/tomcat-7/v7.0.93/bin/extras/catalina-ws.jar.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli-adapters.jar (with props) dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli-adapters.jar.asc dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli-adapters.jar.sha512 dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli.jar (with props) dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli.jar.asc dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli.jar.sha512 dev/tomcat/tomcat-7/v7.0.93/src/ dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.tar.gz (with props) dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.tar.gz.asc dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.tar.gz.sha512 dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.zip (with props) dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.zip.asc dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.zip.sha512 Added: dev/tomcat/tomcat-7/v7.0.93/KEYS == --- dev/tomcat/tomcat-7/v7.0.93/KEYS (added) +++ dev/tomcat/tomcat-7/v7.0.93/KEYS Sat Feb 16 17:39:46 2019 @@ -0,0 +1,650 @@ +This file contains the PGP&GPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp < KEYS +Apache developers: +(pgpk -ll && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +Type Bits/KeyIDDate User ID +pub 2048/F22C4FED 2001/07/02 Andy Armstrong + +-BEGIN PGP PUBLIC KEY BLOCK-
svn commit: r32532 [2/2] - in /dev/tomcat/tomcat-7/v7.0.93: ./ bin/ bin/embed/ bin/extras/ src/
Added: dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli-adapters.jar.sha512 == --- dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli-adapters.jar.sha512 (added) +++ dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli-adapters.jar.sha512 Sat Feb 16 17:39:46 2019 @@ -0,0 +1 @@ +e4b56b4772efca0981d74cf9aa842ff8d342da778e0aa29fd885d49c03ec6d824ff3b4195477c5492850cbdd04f116b845086728d7ed2c120336d6bddaaa9db7 *tomcat-juli-adapters.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli.jar == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli.jar -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli.jar.asc == --- dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli.jar.asc (added) +++ dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli.jar.asc Sat Feb 16 17:39:46 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAlxoRQ8ACgkQIIsKsdYw +EcfbMg/8CgBn4HrE22p9EY+xmOK4uEmFl+S0Ec9ysjQFQh3NUs1sY7eyZpMPDX1X +c+3x7Efo3HOaztEqabsZ+smFok6MHy+38LqXa5YTy8W25rvUPX0v9jZ4BrumsOYZ +1AYZhgW6YlKl0EBfLd7ldjwoWl8khDnQKBQbRDrhJ4vw3QDCdNQFzCC/Vb1/znYt +Fn8uWScAji6NhWCB4j/RjNTHNh7YB+EMuz0zP2DLfkUcTMnlUMyE3qV+51iOPY6Q +qEM5K3b77cR7aHQwbNquyUCz8G/IBH458egwjlrMUoG8Qb0kuQ6SQkyHi1BMrFkW +0dKLDZMp9lxe9oPBbd5NPQu2W3EOO1fa3w575WQ6ad3QwUXj1S5EbiupMTkFbvE6 +f24e06z2KmDkfnbNaZrvh5b3TEAe3mfBixlXWeRs7y0Lr6gGuuQlN1Tghfl/3Qbh +6aNR5t7t8Dx/vCUtSkeXkgqjUOpJ7Edq6GzUEKUdvDuDm05ckxghXCZX5adkoZ6F +LIMxqAv38i2MaY1m5DHNb7xBlfOYQhoSIECeP0BJdX+C2suwp0b66mcMF/FeLYID +OpIeG8T/CFLNnm2IO/octS65OFzLa3ApZEgfn8JjMfxOVM+u3sJMmB7stz81q5Zn +ttiRO1WD8gI5s/r+V41F+QHzcD7upMWaqc0lywxuQ+C+vJH5I9U= +=yzo+ +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli.jar.sha512 == --- dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli.jar.sha512 (added) +++ dev/tomcat/tomcat-7/v7.0.93/bin/extras/tomcat-juli.jar.sha512 Sat Feb 16 17:39:46 2019 @@ -0,0 +1 @@ +f4ab1a021e3d177aafdef3e3cc79d1053032f3ec3ca31335da2f0884b182ad062e7a79639822c3e3ffb7a7fb210f0068954fd5cd4d649828391b9f19ada55fea *tomcat-juli.jar \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.tar.gz.asc == --- dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.tar.gz.asc (added) +++ dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.tar.gz.asc Sat Feb 16 17:39:46 2019 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEEcT2oi+UJEVNf5xb1IIsKsdYwEccFAlxoRrAACgkQIIsKsdYw +EceP/Q//QnBMkIJMbHBYTrrKbyXNAB3+VHWmG0Ea4/gBfbiZZOn6kGyLr5nY8U60 +JappCoPK9EmdDEgPDqxWDoOUd8trLqI/EJzkMptLFMQ89FWsxmUqGiTrtIXqNTMv +jiuc/If7Y+bGBiA9qVhHZW+jnCS8jw9dNpNMwnMe2OpnsmXV28gpdFDAxxgdesZ+ +amoZc0mdQxRJqsuewk7id6bQsPiSTiTEHdBYEaLliW78TBLA+QxP5ni0VvC+AzCh +ATfSn+iQRJY/olm51Pu2xd0K39YvYl5MUxeRFYR4ZDEt2mg7+dP+hHV5NK9+Pm4Y +rSKksmeZfEtSuynlli5qmUt6B/6F4NHGuoTVdd8EWSUlKqW/0Az9tepl9Z3YdApK +2a3+O038/dnFmqoyFVdCjePd2Vjh44Y4Nh/h6IrWnKJJh27kuYgsHXmJPRfTLGcA +td8cHt+dyTFOpig4VGTXAjldbLafH0jE2tDyQ4NreIF2cqXo2Sz3QR6T0xQZmYAf +FtKtc32nr8XCsPGxp9Gcf4oE6u/dbPd+gfEyPTjK/Kl82Lop9ePFfOl63/OOKTJq +hFx3Engs7/EMgWRkhZGnXiDvRXO8NeOHeuRmuqUm5+QBxecLyAPmph+kO69OD+AO +s5fi8wc2j7FXtkKAlXQODM/im51zoAtIh+16/8FBqpyRcRWbUuc= +=f5CL +-END PGP SIGNATURE- Added: dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.tar.gz.sha512 == --- dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.tar.gz.sha512 (added) +++ dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.tar.gz.sha512 Sat Feb 16 17:39:46 2019 @@ -0,0 +1 @@ +5f9b08827aeae58f371496c34ce1ae5692bd5403e1a9a7a91b283ece3289356dbd85d48fcb71958aaeeb42cd65bb70fcf34cbe2db3901475cfb812370766f3fc *apache-tomcat-7.0.93-src.tar.gz \ No newline at end of file Added: dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.zip == Binary file - no diff available. Propchange: dev/tomcat/tomcat-7/v7.0.93/src/apache-tomcat-7.0.93-src.zip --
svn commit: r1853723 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_93: ./ build.properties.default
Author: violetagg Date: Sat Feb 16 16:32:33 2019 New Revision: 1853723 URL: http://svn.apache.org/viewvc?rev=1853723&view=rev Log: Tag 7.0.93 Added: tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ (props changed) - copied from r1853722, tomcat/tc7.0.x/trunk/ Modified: tomcat/tc7.0.x/tags/TOMCAT_7_0_93/build.properties.default Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ -- bugtraq:append = false Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ -- bugtraq:label = Bugzilla ID (optional) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ -- --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Feb 16 16:32:33 2019 @@ -0,0 +1,2 @@ +(https?\://(bz|issues)\.apache\.org/bugzilla/show_bug.cgi\?id=\d+|BZ\s?\d+) +(\d+) Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ -- bugtraq:message = Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ -- bugtraq:url = https://bz.apache.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ -- --- svn:ignore (added) +++ svn:ignore Sat Feb 16 16:32:33 2019 @@ -0,0 +1,7 @@ +.* +build.properties +logs +nbproject +output +work +*.iml Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Feb 16 16:32:33 2019 @@ -0,0 +1,3 @@ +/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,17
Re: Tag Tomcat 7
На сб, 16.02.2019 г. в 16:14 ч. Konstantin Kolinko написа: > > сб, 16 февр. 2019 г. в 11:20, Violeta Georgieva : > > > > На пт, 15.02.2019 г. в 22:29 ч. Christopher Schultz < > > ch...@christopherschultz.net> написа: > > > > > > -BEGIN PGP SIGNED MESSAGE- > > > Hash: SHA256 > > > > > > Violetta, > > > > > > I think there might be one more item to back-port from Konstantin, who > > > has not yet committed his changes to trunk/8.5. Given the time between > > > Tomcat 7 releases, can you maybe delay another 24-48 hours to see if > > > he wants to get his patch into Tomcat 7? > > > > Ok, n.p. > > I committed all that I planned for today. > OK to go. Thanks
[Bug 63182] Servlet 3.1 ReadListener got exception(sometime) when invoking servletinputstream.read method, after isReady returns true.
https://bz.apache.org/bugzilla/show_bug.cgi?id=63182
--- Comment #2 from xax...@gmail.com ---
Also if the code dosen't start a new thread to do the read operation,
everything got fine. e.g.
@Override
public void onDataAvailable() throws IOException {
System.out.println("onDataAvailable");
int c = in.read(new byte[1024]);
System.out.println("read: " + c);
if (c > 0) {
count += c;
System.out.println("\t\t\t\ttotal: " +
MessageFormat.format("{0,number,#,##0}", count));
}
boolean ready = in.isReady();
System.out.println("ready after: " + ready);
if (ready) {
onDataAvailable();
}
}
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63182] Servlet 3.1 ReadListener got exception(sometime) when invoking servletinputstream.read method, after isReady returns true.
https://bz.apache.org/bugzilla/show_bug.cgi?id=63182 xax...@gmail.com changed: What|Removed |Added OS||All --- Comment #1 from xax...@gmail.com --- the bug only happen when protocol="org.apache.coyote.http11.Http11Nio2Protocol", i.e. the code work fine when protocol="org.apache.coyote.http11.Http11NioProtocol" being used -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63182] New: Servlet 3.1 ReadListener got exception(sometime) when invoking servletinputstream.read method, after isReady returns true.
https://bz.apache.org/bugzilla/show_bug.cgi?id=63182
Bug ID: 63182
Summary: Servlet 3.1 ReadListener got exception(sometime) when
invoking servletinputstream.read method, after isReady
returns true.
Product: Tomcat 8
Version: 8.5.38
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: xax...@gmail.com
Target Milestone:
using the following code can reproduce the error, with large size post request.
ServletInputStream in = req.getInputStream();
in.setReadListener(new ReadListener() {
@Override
public void onError(Throwable t) {
System.out.println("error: " + t);
d.resolve(null);
}
int count = 0;
@Override
public void onDataAvailable() throws
IOException {
System.out.println("onDataAvailable");
int c = in.read(new byte[1024]);
System.out.println("read: " + c);
if (c > 0) {
count += c;
System.out.println("\t\t\t\ttotal: " + MessageFormat.format("{0,number,#,##0}",
count));
}
boolean ready = in.isReady();
System.out.println("ready after: " +
ready);
if (ready) {
onDataAvailable();
}
}
@Override
public void onAllDataRead() throws IOException
{
System.out.println("all read");
d.resolve(null);
}
});
Console output sample:
...
...
ready after: true
onDataAvailable
read: 1024
total: 21,050,368
ready after: true
onDataAvailable
read: 1024
2019-02-16 23:27:09,654 ERROR com.webclient.web.LoginForm$3$1.run:444 -
java.lang.IllegalStateException: In non-blocking mode you may not read from the
ServletInputStream until the previous read has completed and isReady() returns
true
java.lang.IllegalStateException: In non-blocking mode you may not read from the
ServletInputStream until the previous read has completed and isReady() returns
true
at
org.apache.catalina.connector.CoyoteInputStream.checkNonBlockingRead(CoyoteInputStream.java:287)
at
org.apache.catalina.connector.CoyoteInputStream.read(CoyoteInputStream.java:128)
--
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
Git migration: consistent commit message
Folks, most of you know that there is a common convention of how to write decent Git commit messages. The scheme is: \n\n". Where as title (proposed) is: BZ #: If there is no corresponding BZ issue (which almost always should be), just an abtract. The abstract shouldn't contain more than 80 chars (sometimes not possible). This will highly improve commit message readablity in Git CLI, GitHub as well as Gitbox. Everything is trimmed on "\n\n" in the Git world. Personally, I sometimes have trouble to follow the commit log in Subversion to diff two versions between deployments. Therefore, I'd appreciate a better approach for the entire user base. Here are three good examples of a readable log: * https://github.com/apache/maven/commits/master * https://github.com/curl/curl/commits/master * https://github.com/apache/httpcomponents-client/commits/master Michael - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Git migration: new branch/tag naming scheme
Folks, given that we are currently in the process of migrating to Git I'd like to propose a more readible and with the branch names consistent tag naming scheme. The given approach, for whatsoever reason, performs an uppercase and replaces dots with underscores. This reduces readability, but also requires people (esp. package maintainers) to perform sed(1) magic to convert back and forth. There are bascially two approaches I'd like to discuss: Approch 1: It will reuse the branch name of the current major version, excluding master. Thus, we will have the following prefixes: tomcat90-, tomcat85-, and tomcat70-. Since JDBC Pool remains in place and if it is released separately the prefix would be jdbc-pool-. The version itself would remain as-is and simply appended, e.g., 8.5.40, 9.0.25, etc. Finally it would be tomcat85-8.5.40, tomcat90-9.0.25. Another benefit would be autocompletion in Git CLI. I could simply say: "git checkout tomcat85" or "git checkout tomcat85-" and grab the specific version I want. Approach 2: A simpler, less redundant approach would be naming the branches master, 7.0.x, 8.5.x, etc. and get rid of the "tomcat" prefix at all. The tags would simply be the versions as-is: 8.5.40, 9.0.25, etc. The Git autocompletion will work here too. I personally opt for approach 2 because it is consistent, concise and removes redundancy on always used prefixes. Michael - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git migration - Timing
Am 2019-02-16 um 14:46 schrieb Mark Thomas:
On 16/02/2019 13:39, Michael Osipov wrote:
Am 2019-02-11 um 15:51 schrieb Mark Thomas:
All,
I'd like to propose that we make the move from svn to git for Tomcat
7.0.x, 8.5.x and 9.0.x as soon as the next 7.0.x release is complete.
The proposed approach is documented here:
https://cwiki.apache.org/confluence/display/TOMCAT/Git+migration
I anticipate that the repositories will be read only for a couple of
hours.
I also anticipate that the CI systems - particularly Gump - will take up
to a day to switch over and iron out any problems.
Any objections?
Hi Mark,
thanks for bearing with me. I was now finally able to look at the
proposal. As far as I understand there wil be a single repo for the
entire code base and everything will happen in branches.
Here are my comments:
1. You have set up branches: master, tomcat70, tomcat85, etc, but the
document talks about "Branch names. master, tc8.5, tc8.0, tc7.0 etc"
that seems to be inconsistent.
The demo was set up before the branch names were agreed.
2. What will happens with Tomcat JDBC Pool? Will in remain in the
Subversion repo or will it move to tomcat-jdbc-pool.git? The code does
not change that offen that justifies a tandem release with Tomcat.
It will remain part of the repo for each Tomcat version - as it is now.
3. Why do you bother to import Tomcat 8.0? It is EOL, leave it in
Subversion. Do you plan to perform any futher merge here?
The demo was set up before 8.0.x was made EOL. There are no plans to
move 8.0.c to git.
4. Can we *please* have a readible tag name scheme?! I simply don't
understand why people uppercase everything and replace dots with
underscores. That's just ugly. Consistent tag names would be
"{branch-name}-{version}" for the mono repo. E.g, tomcat85-8.5.40, or
tomcat70-7.0.95. This would heavily reduce sed(1) magic for package
maintainers and improve readability.
The community has not expressed a desire to change the naming scheme.
You are, of course, free to start such a discussion on dev@.
5. I assume that mod_jk, native and friends will remain in the
Subversion repo?
Yes.
6. I don't see in the wiki page an agreement on a good/wellknown Git
commit message scheme: "BZ #123: \n\n"
No such convention exists for subversion. The community has not
expressed a desire to introduce one with the move to git. Again, you are
free to start a discussion on dev@
Thanks for the quick response. I will start the approapriate discussions!
Michael
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tag Tomcat 7
сб, 16 февр. 2019 г. в 11:20, Violeta Georgieva : > > На пт, 15.02.2019 г. в 22:29 ч. Christopher Schultz < > ch...@christopherschultz.net> написа: > > > > -BEGIN PGP SIGNED MESSAGE- > > Hash: SHA256 > > > > Violetta, > > > > I think there might be one more item to back-port from Konstantin, who > > has not yet committed his changes to trunk/8.5. Given the time between > > Tomcat 7 releases, can you maybe delay another 24-48 hours to see if > > he wants to get his patch into Tomcat 7? > > Ok, n.p. I committed all that I planned for today. OK to go. 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: r1853721 [2/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ webapps/docs/
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=1853721&r1=1853720&r2=1853721&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Feb 16 14:05:22 2019 @@ -206,6 +206,12 @@ language of the default system locale is not English. (markt) +Use client's preferred language for the Server Status page of the +Manager web application. Review and fix several cases when the +client's language preference was not respected in Manager and +Host Manager web applications. (kkolinko) + + Fix messages used by Manager and Host Manager web applications. Disambiguate message keys used when adding or removing a host. Improve display of summary values on the status page: separate - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853721 [1/2] - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ webapps/docs/
Author: kkolinko Date: Sat Feb 16 14:05:22 2019 New Revision: 1853721 URL: http://svn.apache.org/viewvc?rev=1853721&view=rev Log: Use client's preferred language for the Server Status page of the Manager web application. Review and fix several cases when the client's language preference was not respected in Manager and Host Manager web applications. Merged r1853709 from tomcat/tc8.5.x/trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 16 14:05:22 2019 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,
Re: Git migration - Timing
On 16/02/2019 13:39, Michael Osipov wrote:
> Am 2019-02-11 um 15:51 schrieb Mark Thomas:
>> All,
>>
>> I'd like to propose that we make the move from svn to git for Tomcat
>> 7.0.x, 8.5.x and 9.0.x as soon as the next 7.0.x release is complete.
>>
>> The proposed approach is documented here:
>> https://cwiki.apache.org/confluence/display/TOMCAT/Git+migration
>>
>> I anticipate that the repositories will be read only for a couple of
>> hours.
>>
>> I also anticipate that the CI systems - particularly Gump - will take up
>> to a day to switch over and iron out any problems.
>>
>> Any objections?
>
> Hi Mark,
>
> thanks for bearing with me. I was now finally able to look at the
> proposal. As far as I understand there wil be a single repo for the
> entire code base and everything will happen in branches.
>
> Here are my comments:
>
> 1. You have set up branches: master, tomcat70, tomcat85, etc, but the
> document talks about "Branch names. master, tc8.5, tc8.0, tc7.0 etc"
> that seems to be inconsistent.
The demo was set up before the branch names were agreed.
> 2. What will happens with Tomcat JDBC Pool? Will in remain in the
> Subversion repo or will it move to tomcat-jdbc-pool.git? The code does
> not change that offen that justifies a tandem release with Tomcat.
It will remain part of the repo for each Tomcat version - as it is now.
> 3. Why do you bother to import Tomcat 8.0? It is EOL, leave it in
> Subversion. Do you plan to perform any futher merge here?
The demo was set up before 8.0.x was made EOL. There are no plans to
move 8.0.c to git.
> 4. Can we *please* have a readible tag name scheme?! I simply don't
> understand why people uppercase everything and replace dots with
> underscores. That's just ugly. Consistent tag names would be
> "{branch-name}-{version}" for the mono repo. E.g, tomcat85-8.5.40, or
> tomcat70-7.0.95. This would heavily reduce sed(1) magic for package
> maintainers and improve readability.
The community has not expressed a desire to change the naming scheme.
You are, of course, free to start such a discussion on dev@.
> 5. I assume that mod_jk, native and friends will remain in the
> Subversion repo?
Yes.
> 6. I don't see in the wiki page an agreement on a good/wellknown Git
> commit message scheme: "BZ #123: \n\n"
No such convention exists for subversion. The community has not
expressed a desire to introduce one with the move to git. Again, you are
free to start a discussion on dev@
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853717 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/LocalStrings_ru.properties
Author: kkolinko Date: Sat Feb 16 13:45:15 2019 New Revision: 1853717 URL: http://svn.apache.org/viewvc?rev=1853717&view=rev Log: Improve Russian translation of messages for expire sessions command. Merged r1853713 from tomcat/tc8.5.x/trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 16 13:45:15 2019 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1821365,1822235,1823165,1823341,1823490,1823493,
svn commit: r1853716 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/LocalStrings.properties webapps/docs/changelog.xml
Author: kkolinko Date: Sat Feb 16 13:42:56 2019 New Revision: 1853716 URL: http://svn.apache.org/viewvc?rev=1853716&view=rev Log: Improve wording of messages for expire sessions command. Merged r1853710,r1853714 from tomcat/tc8.5.x/trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 16 13:42:56 2019 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1820305,1821303-1821311,1821313,1821316,1821330,1
svn commit: r1853715 - /tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Author: kkolinko Date: Sat Feb 16 13:39:45 2019 New Revision: 1853715 URL: http://svn.apache.org/viewvc?rev=1853715&view=rev Log: Correct changelog message. (followup) Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1853715&r1=1853714&r2=1853715&view=diff == --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Sat Feb 16 13:39:45 2019 @@ -127,14 +127,14 @@ Use client's preferred language for the Server Status page of the Manager web application. Review and fix several cases when the client's language preference was not respected in Manager and -Host Manager web applications. Improve wording of messages -for expire sessions command. (kkolinko) +Host Manager web applications. (kkolinko) Fix messages used by Manager and Host Manager web applications. Disambiguate message keys used when adding or removing a host. Improve display of summary values on the status page: separate -terms and values with a whitespace. (kkolinko) +terms and values with a whitespace. Improve wording of messages +for expire sessions command. (kkolinko) Do not add CSRF nonce parameter and suppress Referer header for external - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git migration - Timing
Am 2019-02-11 um 15:51 schrieb Mark Thomas:
All,
I'd like to propose that we make the move from svn to git for Tomcat
7.0.x, 8.5.x and 9.0.x as soon as the next 7.0.x release is complete.
The proposed approach is documented here:
https://cwiki.apache.org/confluence/display/TOMCAT/Git+migration
I anticipate that the repositories will be read only for a couple of hours.
I also anticipate that the CI systems - particularly Gump - will take up
to a day to switch over and iron out any problems.
Any objections?
Hi Mark,
thanks for bearing with me. I was now finally able to look at the
proposal. As far as I understand there wil be a single repo for the
entire code base and everything will happen in branches.
Here are my comments:
1. You have set up branches: master, tomcat70, tomcat85, etc, but the
document talks about "Branch names. master, tc8.5, tc8.0, tc7.0 etc"
that seems to be inconsistent.
2. What will happens with Tomcat JDBC Pool? Will in remain in the
Subversion repo or will it move to tomcat-jdbc-pool.git? The code does
not change that offen that justifies a tandem release with Tomcat.
3. Why do you bother to import Tomcat 8.0? It is EOL, leave it in
Subversion. Do you plan to perform any futher merge here?
4. Can we *please* have a readible tag name scheme?! I simply don't
understand why people uppercase everything and replace dots with
underscores. That's just ugly. Consistent tag names would be
"{branch-name}-{version}" for the mono repo. E.g, tomcat85-8.5.40, or
tomcat70-7.0.95. This would heavily reduce sed(1) magic for package
maintainers and improve readability.
5. I assume that mod_jk, native and friends will remain in the
Subversion repo?
6. I don't see in the wiki page an agreement on a good/wellknown Git
commit message scheme: "BZ #123: \n\n"
Regards,
Michael
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853714 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/LocalStrings.properties
Author: kkolinko Date: Sat Feb 16 13:24:36 2019 New Revision: 1853714 URL: http://svn.apache.org/viewvc?rev=1853714&view=rev Log: Improve wording of messages for expire sessions command. (followup) Merged r1853711 from tomcat/trunk. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 16 13:24:36 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-17635
svn commit: r1853713 - /tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
Author: kkolinko
Date: Sat Feb 16 13:22:48 2019
New Revision: 1853713
URL: http://svn.apache.org/viewvc?rev=1853713&view=rev
Log:
Improve Russian translation of messages for expire sessions command.
Backport of r1853708 and r1853712.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties?rev=1853713&r1=1853712&r2=1853713&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
Sat Feb 16 13:22:48 2019
@@ -149,11 +149,11 @@ managerServlet.resourcesType=OK - \u041f
managerServlet.saved=OK -
\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
\u0441\u0435\u0440\u0432\u0435\u0440\u0430
\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0430
managerServlet.savedContext=OK -
\u041a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u043d\u044b\u0435
\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0434\u043b\u044f [{0}]
\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b
managerServlet.saveFail=\u041e\u0428\u0418\u0411\u041a\u0410 - \u041d\u0435
\u0443\u0434\u0430\u043b\u043e\u0441\u044c
\u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438: [{0}]
-managerServlet.sessiondefaultmax=\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439
\u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u044b\u0439
\u043f\u0435\u0440\u0438\u043e\u0434
\u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0433\u043e
\u0441\u0435\u0430\u043d\u0441\u0430 [{0}] \u043c\u0438\u043d\u0443\u0442
+managerServlet.sessiondefaultmax=\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439
\u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u044b\u0439
\u043f\u0435\u0440\u0438\u043e\u0434
\u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0433\u043e
\u0441\u0435\u0430\u043d\u0441\u0430: [{0}] \u043c\u0438\u043d\u0443\u0442
managerServlet.sessions=OK -
\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e
\u0441\u0435\u0430\u043d\u0441\u0430\u0445
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043f\u043e
\u043f\u0443\u0442\u0438 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0430
[{0}]
-managerServlet.sessiontimeout=\u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u044b
[{0}] \u043c\u0438\u043d\u0443\u0442: [{1}]
\u0441\u0435\u0430\u043d\u0441\u043e\u0432
-managerServlet.sessiontimeout.expired=\u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u044b
[{0}] \u043c\u0438\u043d\u0443\u0442: [{1}]
\u0441\u0435\u0430\u043d\u0441\u043e\u0432 \u0431\u044b\u043b\u0438
\u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u044b
-managerServlet.sessiontimeout.unlimited=\u043d\u0435\u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u043e\u0435
\u0432\u0440\u0435\u043c\u044f: [{0}]
\u0441\u0435\u0430\u043d\u0441\u043e\u0432
+managerServlet.sessiontimeout=\u041d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u044b\u0435
[{0}] \u043c\u0438\u043d\u0443\u0442: [{1}]
\u0441\u0435\u0430\u043d\u0441(\u043e\u0432)
+managerServlet.sessiontimeout.expired=\u041d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u044b\u0435
[{0}] \u043c\u0438\u043d\u0443\u0442: [{1}]
\u0441\u0435\u0430\u043d\u0441(\u043e\u0432) \u0431\u044b\u043b\u0438
\u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u044b
+managerServlet.sessiontimeout.unlimited=\u041d\u0435\u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u043d\u043e\u0435
\u0432\u0440\u0435\u043c\u044f: [{0}]
\u0441\u0435\u0430\u043d\u0441(\u043e\u0432)
managerServlet.sslConnectorCerts=OK -
\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e
\u0446\u0435\u043f\u043e\u0447\u043a\u0435
\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0432
managerServlet.sslConnectorCiphers=OK -
\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e
\u0448\u0438\u0444\u0440\u043e\u0432\u0430\u043d\u0438\u0438 SSL
managerServlet.sslConnectorTrustedCerts=OK -
\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e
\u0434\u043e\u0432\u0435\u0440\u0435\u043d\u043d\u043e\u043c
\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u0435
\u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853712 - /tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
Author: kkolinko
Date: Sat Feb 16 13:20:24 2019
New Revision: 1853712
URL: http://svn.apache.org/viewvc?rev=1853712&view=rev
Log:
Improve Russian translation of messages for expire sessions command.
(followup)
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties?rev=1853712&r1=1853711&r2=1853712&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
[UTF-8] Sat Feb 16 13:20:24 2019
@@ -152,7 +152,7 @@ managerServlet.sessiondefaultmax=Ста�
managerServlet.sessions=OK - Информация о сеансах приложения по пути контекста
[{0}]
managerServlet.sessiontimeout=Неактивные [{0}] минут: [{1}] сеанс(ов)
managerServlet.sessiontimeout.expired=Неактивные [{0}] минут: [{1}] сеанс(ов)
были завершены
-managerServlet.sessiontimeout.unlimited=неограниченное время: [{0}] сеансов
+managerServlet.sessiontimeout.unlimited=Неограниченное время: [{0}] сеанс(ов)
managerServlet.sslConnectorCerts=OK - Информация о цепочке сертификатов
managerServlet.sslConnectorCiphers=OK - Информация о шифровании SSL
managerServlet.sslConnectorTrustedCerts=OK - Информация о доверенном
сертификате безопасности
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853711 - /tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
Author: kkolinko
Date: Sat Feb 16 13:19:50 2019
New Revision: 1853711
URL: http://svn.apache.org/viewvc?rev=1853711&view=rev
Log:
Improve wording of messages for expire sessions command.
(followup)
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1853711&r1=1853710&r2=1853711&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
[UTF-8] Sat Feb 16 13:19:50 2019
@@ -174,7 +174,7 @@ managerServlet.sessiondefaultmax=Default
managerServlet.sessions=OK - Session information for application at context
path [{0}]
managerServlet.sessiontimeout=Inactive for [{0}] minutes: [{1}] sessions
managerServlet.sessiontimeout.expired=Inactive for [{0}] minutes: [{1}]
sessions were expired
-managerServlet.sessiontimeout.unlimited=unlimited time: [{0}] sessions
+managerServlet.sessiontimeout.unlimited=Unlimited time: [{0}] sessions
managerServlet.sslConnectorCerts=OK - Connector / Certificate Chain information
managerServlet.sslConnectorCiphers=OK - Connector / SSL Cipher information
managerServlet.sslConnectorTrustedCerts=OK - Connector / Trusted Certificate
information
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853710 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/LocalStrings.properties webapps/docs/changelog.xml
Author: kkolinko Date: Sat Feb 16 13:16:51 2019 New Revision: 1853710 URL: http://svn.apache.org/viewvc?rev=1853710&view=rev Log: Improve wording of messages for expire sessions command. Merged r1853707 from tomcat/trunk. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 16 13:16:51 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-176205 3,1762123,1762168,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763
svn commit: r1853709 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ webapps/docs/
Author: kkolinko Date: Sat Feb 16 13:09:23 2019 New Revision: 1853709 URL: http://svn.apache.org/viewvc?rev=1853709&view=rev Log: Use client's preferred language for the Server Status page of the Manager web application. Review and fix several cases when the client's language preference was not respected in Manager and Host Manager web applications. Merged r1852916 from tomcat/trunk. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 16 13:09:23 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,176002
svn commit: r1853708 - /tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
Author: kkolinko
Date: Sat Feb 16 12:55:31 2019
New Revision: 1853708
URL: http://svn.apache.org/viewvc?rev=1853708&view=rev
Log:
Improve Russian translation of messages for expire sessions command.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties?rev=1853708&r1=1853707&r2=1853708&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
[UTF-8] Sat Feb 16 12:55:31 2019
@@ -148,10 +148,10 @@ managerServlet.resourcesType=OK - Пер
managerServlet.saveFail=ОШИБКА - Не удалось сохранить настройки: [{0}]
managerServlet.saved=OK - Конфигурация сервера сохранена
managerServlet.savedContext=OK - Контекстные настройки для [{0}] сохранены
-managerServlet.sessiondefaultmax=Стандартный максимальный период неактивного
сеанса [{0}] минут
+managerServlet.sessiondefaultmax=Стандартный максимальный период неактивного
сеанса: [{0}] минут
managerServlet.sessions=OK - Информация о сеансах приложения по пути контекста
[{0}]
-managerServlet.sessiontimeout=неактивны [{0}] минут: [{1}] сеансов
-managerServlet.sessiontimeout.expired=неактивны [{0}] минут: [{1}] сеансов
были завершены
+managerServlet.sessiontimeout=Неактивные [{0}] минут: [{1}] сеанс(ов)
+managerServlet.sessiontimeout.expired=Неактивные [{0}] минут: [{1}] сеанс(ов)
были завершены
managerServlet.sessiontimeout.unlimited=неограниченное время: [{0}] сеансов
managerServlet.sslConnectorCerts=OK - Информация о цепочке сертификатов
managerServlet.sslConnectorCiphers=OK - Информация о шифровании SSL
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853707 - in /tomcat/trunk: java/org/apache/catalina/manager/LocalStrings.properties webapps/docs/changelog.xml
Author: kkolinko
Date: Sat Feb 16 12:30:32 2019
New Revision: 1853707
URL: http://svn.apache.org/viewvc?rev=1853707&view=rev
Log:
Improve wording of messages for expire sessions command.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1853707&r1=1853706&r2=1853707&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
[UTF-8] Sat Feb 16 12:30:32 2019
@@ -170,10 +170,10 @@ OS Version: [{2}]\n\
OS Architecture: [{3}]\n\
JVM Version: [{4}]\n\
JVM Vendor: [{5}]
-managerServlet.sessiondefaultmax=Default maximum session inactive interval
[{0}] minutes
+managerServlet.sessiondefaultmax=Default maximum session inactive interval is
[{0}] minutes
managerServlet.sessions=OK - Session information for application at context
path [{0}]
-managerServlet.sessiontimeout=[{0}] minutes: [{1}] sessions
-managerServlet.sessiontimeout.expired=[{0}] minutes: [{1}] sessions were
expired
+managerServlet.sessiontimeout=Inactive for [{0}] minutes: [{1}] sessions
+managerServlet.sessiontimeout.expired=Inactive for [{0}] minutes: [{1}]
sessions were expired
managerServlet.sessiontimeout.unlimited=unlimited time: [{0}] sessions
managerServlet.sslConnectorCerts=OK - Connector / Certificate Chain information
managerServlet.sslConnectorCiphers=OK - Connector / SSL Cipher information
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1853707&r1=1853706&r2=1853707&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Feb 16 12:30:32 2019
@@ -89,12 +89,11 @@
-Fix messages used by Host Manager web application. Disambiguate
-message keys used for different messages. (kkolinko)
-
-
-Improve display of summary values on the status page of Manager web
-application: separate terms and values with a whitespace. (kkolinko)
+Fix messages used by Manager and Host Manager web applications.
+Disambiguate message keys used when adding or removing a host.
+Improve display of summary values on the status page: separate
+terms and values with a whitespace. Improve wording of messages
+for expire sessions command. (kkolinko)
Do not add CSRF nonce parameter and suppress Referer header for
external
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853706 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/LocalStrings_ru.properties java/org/apache/catalina/manager/host/LocalStrings_ru.properties
Author: kkolinko Date: Sat Feb 16 12:12:59 2019 New Revision: 1853706 URL: http://svn.apache.org/viewvc?rev=1853706&view=rev Log: Update Russian translation for Manager and Host Manager web applications Merged r1853702 from tomcat/tc8.5.x/trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 16 12:12:59 2019 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-1810577,1810584,1810588,1811141,1811842,1812090,1812096,1812150,1812511,1814976,1814983,1815072,1815453,1815946,1815957,1816143,1816682,1817229,1817287,1820200,1820209,1820283,1
svn commit: r1853705 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ webapps/docs/ webapps/manager/WEB-INF/jsp/
Author: kkolinko Date: Sat Feb 16 12:11:07 2019 New Revision: 1853705 URL: http://svn.apache.org/viewvc?rev=1853705&view=rev Log: Do not add CSRF nonce parameter and suppress Referer header for external links in Manager and Host Manager web applications. Merged r1853701 from tomcat/tc8.5.x/trunk. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/401.jsp tomcat/tc7.0.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 16 12:11:07 2019 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260
svn commit: r1853703 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/host/Constants.java java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
Author: kkolinko Date: Sat Feb 16 11:45:40 2019 New Revision: 1853703 URL: http://svn.apache.org/viewvc?rev=1853703&view=rev Log: Align tomcat and ASF logos heading between Manager and Host Manager applications, to reduce duplication and to simplify subsequent merges. Host Manager used http: links, while Manager already uses https: ones. This is a backport of r1732049 from tomcat/trunk: De-duplication. Reported by Simian. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 16 11:45:40 2019 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1758563,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,180281 4,1803618,1806107,1806733,1807082-1807083,1808707,1808884,1809267,1809644,1809832,1809904,1809915,1809924,1810283,1810328,1810574,1810576-18
svn commit: r1853702 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager: LocalStrings_ru.properties host/LocalStrings_ru.properties
Author: kkolinko
Date: Sat Feb 16 10:43:36 2019
New Revision: 1853702
URL: http://svn.apache.org/viewvc?rev=1853702&view=rev
Log:
Update Russian translation for Manager and Host Manager web applications
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties?rev=1853702&r1=1853701&r2=1853702&view=diff
==
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
Sat Feb 16 10:43:36 2019
@@ -14,11 +14,11 @@
# limitations under the License.
htmlManagerServlet.appsAvailable=\u0417\u0430\u043f\u0443\u0449\u0435\u043d\u043e
-htmlManagerServlet.appsExpire=\u041f\u0440\u0438\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c
+htmlManagerServlet.appsExpire=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c
\u0441\u0435\u0430\u043d\u0441\u044b
htmlManagerServlet.appsName=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435
htmlManagerServlet.appsPath=\u041f\u0443\u0442\u044c
htmlManagerServlet.appsReload=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c
-htmlManagerServlet.appsSessions=\u0421\u0435\u0441\u0441\u0438\u0438
+htmlManagerServlet.appsSessions=\u0421\u0435\u0430\u043d\u0441\u044b
htmlManagerServlet.appsStart=\u0421\u0442\u0430\u0440\u0442
htmlManagerServlet.appsStop=\u0421\u0442\u043e\u043f
htmlManagerServlet.appsTasks=\u041a\u043e\u043c\u0430\u043d\u0434\u044b
@@ -73,7 +73,7 @@ htmlManagerServlet.diagnosticsSslConnect
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=\u0414\u043e\u0432\u0435\u0440\u0435\u043d\u043d\u044b\u0435
\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u044b
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=\u0421\u043f\u0438\u0441\u043e\u043a
\u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 TLS
\u0445\u043e\u0441\u0442\u043e\u0432 \u0438 \u0438\u0445
\u0434\u043e\u0432\u0435\u0440\u0435\u043d\u043d\u044b\u0445
\u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0432
\u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438
htmlManagerServlet.diagnosticsTitle=\u0414\u0438\u0430\u0433\u043d\u043e\u0441\u0442\u0438\u043a\u0430
-htmlManagerServlet.expire.explain=\u0441
\u0431\u0435\u0437\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435\u043c ≥
+htmlManagerServlet.expire.explain=\u0441
\u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u044c\u044e
≥
htmlManagerServlet.expire.unit=\u043c\u0438\u043d\u0443\u0442
htmlManagerServlet.findleaksList=\
\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435
\u0432\u0435\u0431-\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f
\u0431\u044b\u043b\u0438
\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u044b
(\u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u044b,
\u0443\u0434\u0430\u043b\u0435\u043d\u044b),\n\
@@ -149,11 +149,11 @@ managerServlet.resourcesType=OK - \u041f
managerServlet.saved=OK -
\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
\u0441\u0435\u0440\u0432\u0435\u0440\u0430
\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0430
managerServlet.savedContext=OK -
\u041a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u043d\u044b\u0435
\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0434\u043b\u044f [{0}]
\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b
managerServlet.saveFail=\u041e\u0428\u0418\u0411\u041a\u0410 - \u041d\u0435
\u0443\u0434\u0430\u043b\u043e\u0441\u044c
\u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
\u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438: [{0}]
-managerServlet.sessiondefaultmax=\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439
\u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u044b\u0439
\u043f\u0435\u0440\u0438\u043e\u0434
\u043d\u0435\u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0439
\u0441\u0435\u0441\u0441\u0438\u0438 [{0}] \u043c\u0438\u043d\u0443\u0442\u044b
-managerServlet.sessions=OK -
\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e
\u0441\u0435\u0430\u043d\u0441\u0430\u0445
\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043d\u0430
\u043f\u0443\u0442\u0438 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0430
[{0}]
-managerServlet.sessiontimeout=[{0}] \u043c\u0438\u043d\u0443\u0442\u044b:
[{1}] \u0441\u0435\u0441\u0441\u0438\u0438
-managerServlet.sessiontimeout.expired=[{0}]
\u043c\u0438\u043d\u0443\u0442\u044b: [{1}]
\u044
svn commit: r1853701 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ webapps/docs/ webapps/manager/WEB-INF/jsp/
Author: kkolinko Date: Sat Feb 16 10:28:07 2019 New Revision: 1853701 URL: http://svn.apache.org/viewvc?rev=1853701&view=rev Log: Do not add CSRF nonce parameter and suppress Referer header for external links in Manager and Host Manager web applications. Merged r1853693-r1853696 from tomcat/trunk. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/Constants.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/Constants.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/401.jsp tomcat/tc8.5.x/trunk/webapps/manager/WEB-INF/jsp/403.jsp Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 16 10:28:07 2019 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1809644 -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739492,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409 ,1741501,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744149,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747 404,1747506,1747536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1 756289,1756408-1756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,
svn commit: r1853700 - in /tomcat/trunk/java/org/apache/catalina/manager: LocalStrings_ru.properties host/LocalStrings_ru.properties
Author: kkolinko
Date: Sat Feb 16 10:24:06 2019
New Revision: 1853700
URL: http://svn.apache.org/viewvc?rev=1853700&view=rev
Log:
Update Russian translation for Manager and Host Manager web applications
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
Modified:
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties?rev=1853700&r1=1853699&r2=1853700&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_ru.properties
[UTF-8] Sat Feb 16 10:24:06 2019
@@ -14,11 +14,11 @@
# limitations under the License.
htmlManagerServlet.appsAvailable=Запущено
-htmlManagerServlet.appsExpire=Приостановить
+htmlManagerServlet.appsExpire=Завершить сеансы
htmlManagerServlet.appsName=Название
htmlManagerServlet.appsPath=Путь
htmlManagerServlet.appsReload=Перезагрузить
-htmlManagerServlet.appsSessions=Сессии
+htmlManagerServlet.appsSessions=Сеансы
htmlManagerServlet.appsStart=Старт
htmlManagerServlet.appsStop=Стоп
htmlManagerServlet.appsTasks=Команды
@@ -73,7 +73,7 @@ htmlManagerServlet.diagnosticsSslConnect
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=Доверенные
сертификаты
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=Список виртуальных
TLS хостов и их доверенных сертификатов безопасности
htmlManagerServlet.diagnosticsTitle=Диагностика
-htmlManagerServlet.expire.explain=с бездействием ≥
+htmlManagerServlet.expire.explain=с неактивностью ≥
htmlManagerServlet.expire.unit=минут
htmlManagerServlet.findleaksList=Следующие веб-приложения были остановлены
(перезагружены, удалены),\n\
но их классы с предыдущих запусков до сих пор присутствуют в памяти\n\
@@ -148,11 +148,11 @@ managerServlet.resourcesType=OK - Пер
managerServlet.saveFail=ОШИБКА - Не удалось сохранить настройки: [{0}]
managerServlet.saved=OK - Конфигурация сервера сохранена
managerServlet.savedContext=OK - Контекстные настройки для [{0}] сохранены
-managerServlet.sessiondefaultmax=Стандартный максимальный период неактивной
сессии [{0}] минуты
-managerServlet.sessions=OK - Информация о сеансах приложения на пути контекста
[{0}]
-managerServlet.sessiontimeout=[{0}] минуты: [{1}] сессии
-managerServlet.sessiontimeout.expired=[{0}] минуты: [{1}] сессии истекли
-managerServlet.sessiontimeout.unlimited=неограниченное время: [{0}] сессии
+managerServlet.sessiondefaultmax=Стандартный максимальный период неактивного
сеанса [{0}] минут
+managerServlet.sessions=OK - Информация о сеансах приложения по пути контекста
[{0}]
+managerServlet.sessiontimeout=неактивны [{0}] минут: [{1}] сеансов
+managerServlet.sessiontimeout.expired=неактивны [{0}] минут: [{1}] сеансов
были завершены
+managerServlet.sessiontimeout.unlimited=неограниченное время: [{0}] сеансов
managerServlet.sslConnectorCerts=OK - Информация о цепочке сертификатов
managerServlet.sslConnectorCiphers=OK - Информация о шифровании SSL
managerServlet.sslConnectorTrustedCerts=OK - Информация о доверенном
сертификате безопасности
@@ -170,5 +170,5 @@ managerServlet.undeployed=OK - Удал�
managerServlet.unknownCommand=ОШИБКА - Неизвестная команда [{0}]
managerServlet.vminfo=OK - VM инфо
-statusServlet.complete=Состояние сервера
+statusServlet.complete=Подробный отчёт о состоянии
statusServlet.title=Состояние сервера
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties?rev=1853700&r1=1853699&r2=1853700&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
[UTF-8] (original)
+++
tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings_ru.properties
[UTF-8] Sat Feb 16 10:24:06 2019
@@ -87,5 +87,5 @@ htmlHostManagerServlet.serverTitle=Ин�
htmlHostManagerServlet.serverVersion=Версия Tomcat
htmlHostManagerServlet.title=Управление виртуальными серверами Tomcat
-statusServlet.complete=Полный статус сервера
+statusServlet.complete=Подробный отчёт о состоянии
statusServlet.title=Состояние сервера
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4049 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1853693 Blamelist: kkolinko Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853696 - in /tomcat/trunk/webapps/manager/WEB-INF/jsp: 401.jsp 403.jsp
Author: kkolinko Date: Sat Feb 16 09:50:24 2019 New Revision: 1853696 URL: http://svn.apache.org/viewvc?rev=1853696&view=rev Log: Do not add CSRF nonce parameter and suppress Referer header for external links in Manager and Host Manager web applications. Modified: tomcat/trunk/webapps/manager/WEB-INF/jsp/401.jsp tomcat/trunk/webapps/manager/WEB-INF/jsp/403.jsp Modified: tomcat/trunk/webapps/manager/WEB-INF/jsp/401.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/jsp/401.jsp?rev=1853696&r1=1853695&r2=1853696&view=diff == --- tomcat/trunk/webapps/manager/WEB-INF/jsp/401.jsp (original) +++ tomcat/trunk/webapps/manager/WEB-INF/jsp/401.jsp Sat Feb 16 09:50:24 2019 @@ -73,7 +73,7 @@ For more information - please see the -Manager App How-To. +Manager App How-To. Modified: tomcat/trunk/webapps/manager/WEB-INF/jsp/403.jsp URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/jsp/403.jsp?rev=1853696&r1=1853695&r2=1853696&view=diff == --- tomcat/trunk/webapps/manager/WEB-INF/jsp/403.jsp (original) +++ tomcat/trunk/webapps/manager/WEB-INF/jsp/403.jsp Sat Feb 16 09:50:24 2019 @@ -93,7 +93,7 @@ For more information - please see the -Manager App How-To. +Manager App How-To. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853693 - in /tomcat/trunk: java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ webapps/docs/
Author: kkolinko
Date: Sat Feb 16 09:45:00 2019
New Revision: 1853693
URL: http://svn.apache.org/viewvc?rev=1853693&view=rev
Log:
Do not add CSRF nonce parameter and suppress Referer header for external links
in Manager and Host Manager web applications.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/Constants.java
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/Constants.java?rev=1853693&r1=1853692&r2=1853693&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/Constants.java Sat Feb 16
09:45:00 2019
@@ -23,6 +23,8 @@ public class Constants {
public static final String Package = "org.apache.catalina.manager";
+public static final String REL_EXTERNAL = "rel=\"noopener noreferrer\"";
+
public static final String HTML_HEADER_SECTION;
public static final String BODY_HEADER_SECTION;
public static final String MESSAGE_SECTION;
@@ -118,11 +120,11 @@ public class Constants {
"\n" +
" \n" +
" \n" +
-" https://tomcat.apache.org/\";>\n" +
+" https://tomcat.apache.org/\"; " + REL_EXTERNAL +
">\n" +
"\n" +
" \n" +
-" https://www.apache.org/\";>\n" +
+" https://www.apache.org/\"; " + REL_EXTERNAL + ">\n" +
"\n" +
" \n" +
@@ -159,8 +161,8 @@ public class Constants {
"\n" +
" \n" +
" {2}\n" +
-" {4}\n" +
-" {6}\n" +
+" {4}\n" +
+" {6}\n" +
" {8}\n" +
" \n" +
"\n" +
@@ -215,6 +217,5 @@ public class Constants {
public static final String XML_STYLE =
"\n";
-
}
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1853693&r1=1853692&r2=1853693&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Sat
Feb 16 09:45:00 2019
@@ -373,11 +373,11 @@ public final class HTMLManagerServlet ex
args[0] = smClient.getString("htmlManagerServlet.manager");
args[1] = response.encodeURL(request.getContextPath() + "/html/list");
args[2] = smClient.getString("htmlManagerServlet.list");
-args[3] = response.encodeURL
+args[3] = // External link
(request.getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpHtmlManagerFile"));
args[4] = smClient.getString("htmlManagerServlet.helpHtmlManager");
-args[5] = response.encodeURL
+args[5] = // External link
(request.getContextPath() + "/" +
smClient.getString("htmlManagerServlet.helpManagerFile"));
args[6] = smClient.getString("htmlManagerServlet.helpManager");
@@ -455,9 +455,11 @@ public final class HTMLManagerServlet ex
}
args = new Object[7];
-args[0] = "" + Escape.htmlElementContent(displayPath) +
"";
+args[0] = // External link
+""
++ Escape.htmlElementContent(displayPath) + "";
if ("".equals(ctxt.getWebappVersion())) {
args[1] = noVersion;
} else {
Modified:
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java?rev=1853693&r1=1853692&r2=1853693&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java Sat
Feb 16 09:45:00 2019
@@ -235,11 +235,11 @@ public class StatusManagerServlet
args[0] = smClient.getString("htmlManagerServlet.manager");
args[1] = response.encodeURL(request.getContextPath() + "/html/list");
args[2] = smClient.getString("htmlManagerServlet.list");
-args[3] = response.encodeURL
+args[3] = // External link
(request.getCo
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building . Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4048 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch tomcat/trunk] 1853683 Blamelist: kkolinko BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tag Tomcat 7
На пт, 15.02.2019 г. в 22:29 ч. Christopher Schultz < ch...@christopherschultz.net> написа: > > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Violetta, > > On 2/15/19 05:37, Violeta Georgieva wrote: > > На пт, 15.02.2019 г. в 10:24 ч. Mark Thomas > > написа: > >> > >> > >> > >> On 15/02/2019 07:02, Violeta Georgieva wrote: > >>> На вт, 12.02.2019 г. в 7:30 ч. Violeta Georgieva > >>> написа: > > > > На вт, 12.02.2019 г. в 1:11 ч. Konstantin Kolinko < > > knst.koli...@gmail.com> > >>> написа: > > > > пн, 11 февр. 2019 г. в 18:33, Violeta Georgieva > > >> : > >>> > >>> I did what I planned for today. I think it is OK to > >>> go. > >> > >> Thanks I'll tag it in the next hours > > > > There is a regression in catalina.sh script. It does not > > create a correct PID file. This is discussed in > > https://bz.apache.org/bugzilla/show_bug.cgi?id=63041 > > Ok as I didn't upload any binaries, I'll just drop the tag > and retag > >>> again when there is a fix for this issue. > >>> > >>> > >>> Are we OK with the current changes so that I can restart the > >>> release process? > >> > >> Essentially the changes have been reverted so yes, I think we are > >> good to go. > > I think there might be one more item to back-port from Konstantin, who > has not yet committed his changes to trunk/8.5. Given the time between > Tomcat 7 releases, can you maybe delay another 24-48 hours to see if > he wants to get his patch into Tomcat 7? Ok, n.p. Violeta
svn commit: r1853684 - in /tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net: localhost-ec-cert.pem localhost-ec-key.pem
Author: kkolinko Date: Sat Feb 16 08:08:09 2019 New Revision: 1853684 URL: http://svn.apache.org/viewvc?rev=1853684&view=rev Log: Set svn:eol-style=native Modified: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-ec-cert.pem (props changed) tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-ec-key.pem (props changed) Propchange: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-ec-cert.pem -- svn:eol-style = native Propchange: tomcat/tc8.5.x/trunk/test/org/apache/tomcat/util/net/localhost-ec-key.pem -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1853683 - in /tomcat/trunk/test/org/apache/tomcat/util/net: localhost-ec-cert.pem localhost-ec-key.pem
Author: kkolinko Date: Sat Feb 16 08:06:14 2019 New Revision: 1853683 URL: http://svn.apache.org/viewvc?rev=1853683&view=rev Log: Set svn:eol-style=native Modified: tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-cert.pem (props changed) tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-key.pem (props changed) Propchange: tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-cert.pem -- svn:eol-style = native Propchange: tomcat/trunk/test/org/apache/tomcat/util/net/localhost-ec-key.pem -- svn:eol-style = native - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
