Re: [PROPOSAL] Copy DBCP 1.x (and POOL 1.x) source to 7.0.x

2019-02-13 Thread Mark Thomas 
On 12/02/2019 23:10, Christopher Schultz wrote:
> Mark,
> 
> On 2/12/19 08:55, Mark Thomas wrote:
>> Hi,
> 
>> Tomcat 7 depends on DBCP 1.x and POOL 1.x. The last release of each
>> of these was in 2013. There are a number of fixes I would like to
>> be able to pull into Tomcat 7 - including the fix for BZ 58338.
> 
>> There is little/no appetite in the Commons community to release
>> DBCP 1.x or Pool 1.x.
> 
>> Having tried to get releases out via the release process Commons
>> uses, I have no desire to try and get these releases out myself.
> 
>> It would greatly simplify things if 7.0.x took the same approach to
>> DBCP and Pool as 8.5.x and 9.0.x and maintained a local fork of the
>> code.
> 
>> Like the fork of DBCP 2.x and Pool 2.x, changes would be made in
>> commons and the Tomcat fork updated. The only local changes would
>> be the package re-naming and and changes required to keep
>> checkstyle and FindBugs happy (and some of those may get made in
>> Commons first).
> 
>> I therefore propose to import the DBCP/Pool 1.x source into Tomcat
>> 7.x following the same pattern as for DBCP/Pool 2.x in 8.5.x.
> 
>> If there are no objections, I'll probably do this late this week
>> early next.
> 
> Is there any appetite for maintaining patches-only and
> merging-on-build? It would mean a smaller repo for us not just in
> terms of size (which is largely irrelevant) but also in terms of
> brain-cycles.
> 
> If I can see that we patch pool-1.x with a 5-line change and add a
> sour\ce file versus there are 500 source files in there that all need
> to be diff'd against their original sources, it makes it easier for
> anyone to look at the code to see what's happening.
> 
> It does complicate the release process, though.

Speaking as the one volunteering to doing the work, there is no appetite
for that here. For me, at least, it is more work.

I'm expecting it to be more like 100 files as we only want the sources.

The diff isn't an issue. We do it for DBCP2 and friends in 9.0.x/8.5.x
and it is easy to do a quick visual check of the diff.

Mark

-
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

2019-02-13 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63041

--- Comment #26 from Mark Thomas  ---
Got it.

With the single & the pid of the process that is put in the background is not
the pid of the Tomcat process. If I specify $CATALINA_PID and then configure
systemd to use the same file with PIDFILE everything starts working.

That final "&" prevents the eval command being written to the console when
using catalina.sh start

Assuming the above is correct I think we have two options:

1. Revert the "&" -> "&&" change. systemd users (and possibly others) will be
required to use a PID file and to tell systemd where to find that file.

2. Revert both changes. systemd users will have to take no action. Users
wanting to redirect to a command will have to use a named pipe.

I'm leaning towards 2 on the grounds this has the least impact on the smallest
number of users. This assumes that the number of systemd users is greater than
the number of users wanting to redirect to a command.

-- 
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

2019-02-13 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63041

--- Comment #24 from Mark Thomas  ---
(In reply to Rainer Jung from comment #22)
> Do we actually understand, what would be wrong with the line
> 
> 2\>\&1 \& echo \$! \>\"$catalina_pid_file\" \; \} $catalina_out_command "&"
> 
> (single escaped ampersand)?

If I add set -x to catalina.sh and then execute the full command line that
results I see:

bash: syntax error near unexpected token `}'

My guess is that systemd sees this error and assumes Tomcat failed to start
properly.

I've now got a test environment set up for this with systemd and 9.0.x HEAD.
I'm going to work on a fix but if anyone with better bash foo than me wants to
make a suggestion, I'm happy to try it.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 63041] shutdown.sh exits non 0 requires KILLSIG from OS

2019-02-13 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63041

--- Comment #25 from Mark Thomas  ---
(In reply to Mark Thomas from comment #24)
> bash: syntax error near unexpected token `}'

I think this is just incorrect escaping of the command and could be a red
herring.

-- 
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

2019-02-13 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63041

--- Comment #27 from Rainer Jung  ---
Excellent analysis!

I *think* the "&" at the end of the line is only useful, if a pipe command is
actually being used. So one could put it into the construction of the string
variable to which we pipe, just as we prefix the command with "|" we could
suffix it with "&".

Nevertheless systemd will probably have trouble identifying the backgrounded
Java process.

When using systemd in our own distribution, we include

Type=forking
...

PIDFile=/path/to/my/logs/catalina.pid
ExecStart=/path/to/catalina_home/bin/catalina.sh start
ExecStop=/path/to/catalina_home/bin/catalina.sh stop

in our service description file (or whatever CATALINA_PID is). So it might make
sense to better support systemd by providing a template for this. 

Using the PIDFile, systemd should be able to correctly detect, whether Tomcat
is running or not (once we are writing te correct pid to it).

As an example, the full file is the following, where all XXX params are patched
before copying the file to systemd during running a custom "service-install"
script target.

[Unit]

RequiresMountsFor=XXXKPDT_CATALINA_HOMEXXX XXXKPDT_CATALINA_BASEXXX
SourcePath=XXXKPDT_CATALINA_BASEXXX/bin/tomcat-SERVICE.systemd
After=network.target nss-lookup.target

[Service]

Type=forking
Restart=on-failure
# Disable OOM killer for this service
OOMScoreAdjust=-1000

Environment=CATALINA_HOME=XXXKPDT_CATALINA_HOMEXXX
Environment=CATALINA_BASE=XXXKPDT_CATALINA_BASEXXX
Environment=TC_USER=XXXKPDT_TC_USERXXX
Environment=JAVA_HOME=XXXKPDT_JAVA_HOMEXXX

User=XXXKPDT_TC_USERXXX
PIDFile=XXXKPDT_CATALINA_PIDXXX
ExecStart=XXXKPDT_CATALINA_HOMEXXX/bin/catalina.sh start
ExecStop=XXXKPDT_CATALINA_HOMEXXX/bin/catalina.sh stop

[Install]
WantedBy=multi-user.target

-- 
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

2019-02-13 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63041

--- Comment #28 from Konstantin Kolinko  ---
(In reply to Rainer Jung from comment #27)
> Excellent analysis!
> 
> I *think* the "&" at the end of the line is only useful, if a pipe command
> is actually being used. So one could put it into the construction of the
> string variable to which we pipe, just as we prefix the command with "|" we
> could suffix it with "&".
> 

Interesting. A good idea.

(In reply to Mark Thomas from comment #26)
> 
> That final "&" prevents the eval command being written to the console when
> using catalina.sh start

So it could be >/dev/null ?


(In reply to Mark Thomas from comment #26)
> Assuming the above is correct I think we have two options:
> 
> 1. Revert the "&" -> "&&" change. systemd users (and possibly others) will
> be required to use a PID file and to tell systemd where to find that file.
>

1. I wonder how OP's configuration with systemd was written. Is it some
home-grown configuration (and can be fixed in place), or it has to be fixed
somewhere upstream.

Personally, I always use a PID file.

Thank you Rainer Jung for sharing your configuration.

> PIDFile=XXXKPDT_CATALINA_PIDXXX

If the PID file is created by catalina.sh, I guess one has to set CATALINA_PID
somewhere (e.g. with 'Environment=' line).


2. I am not sure how the '&' recipe plays with nohup.

It might work.

I just fear that nohup might create a nohup.out file.  (It sends "nohup java"
process into background without redirecting its output. The nohup.out file is
created if nohup thinks that its output is a terminal. Is it able to detect
redirection of a compound command?)

Documentation:
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/nohup.html

(In reply to Mark Thomas from comment #20)
> (In reply to Konstantin Kolinko from comment #19)
> > An idea: use a named pipe (a FIFO special file) to solve the original bug
> > 53930.
> 
> If I am understanding this correctly that would mean:
> 
> - reverting r1848046 and r1850829 for 9.0.x
> - reverting r1848048 and r1850830 for 8.5.x
> - reverting r1848049 and r1850831 for 7.0.x
> 
> Re-opening bug 53930 and resolving it as WONTFIX - suggesting that a named
> pipe is used.

I am not sure whether configuring a pipe externally will work. It is just that
if one uses the pipe, we can keep the original "eval" line, and the overall
patch is less intrusive.

Support for setting up the pipe could be in catalina.sh.

It needs some thought and some testing.

1) I wonder how 'touch "$CATALINA_OUT"' command will interact with a pipe.

Maybe it has to be skipped if the file exists.

2) catalina.sh has code that checks existing PID file to prevent double starts.

If the code that manages the pipe is places after the checks, it can benefit
from them.

3) I wonder whether it is better to start the process reading from pipe before
or after Tomcat. I guess that with a usual (non-named) pipe it is started after
Tomcat.

I've read that a process writing to a pipe will hang if there is no one
reading.


My preference is to revert and to start planning a new patch from there.

-- 
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: r1853510 - in /tomcat/tc7.0.x/trunk: ./ bin/catalina.sh webapps/docs/changelog.xml

2019-02-13 Thread markt 
Author: markt
Date: Wed Feb 13 14:05:45 2019
New Revision: 1853510

URL: http://svn.apache.org/viewvc?rev=1853510=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63041
Revert the changes for BZ 53930 that added support for the CATALINA_OUT_CMD 
environment variable as they prevented correct operation with systemd 
configurations that did not explicitly specify a PID file. 

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/bin/catalina.sh
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 13 14:05:45 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

[Bug 63041] shutdown.sh exits non 0 requires KILLSIG from OS

2019-02-13 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63041

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|REOPENED|RESOLVED

--- Comment #30 from Mark Thomas  ---
Fixed in:
- trunk for 9.0.17 onwards
- 8.5.x for 8.5.38 onwards
- 7.0.x for 7.0.93 onwards

Note: The regression never made it into a 7.0.x release

-- 
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 53930] allow capture of catalina stdout/stderr to a command instead of just a file [PATCH]

2019-02-13 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=53930

Mark Thomas  changed:

   What|Removed |Added

 Resolution|FIXED   |---
 Status|RESOLVED|REOPENED

--- Comment #7 from Mark Thomas  ---
The original fix has been reverted due to regressions.

-- 
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

2019-02-13 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63041

--- Comment #31 from Christopher Schultz  ---
(In reply to Mark Thomas from comment #26)

(for the record)

> Assuming the above is correct I think we have two options:
> 
> 1. Revert the "&" -> "&&" change. systemd users (and possibly others) will
> be required to use a PID file and to tell systemd where to find that file.
> 
> 2. Revert both changes. systemd users will have to take no action. Users
> wanting to redirect to a command will have to use a named pipe.

+1 on option 2

pid-files are anathema to systemd, so let's do them a favor. Also,
logging huge amounts of data to an unrotatable file is something users
have to swallow if they want to dump huge amounts of data to it.

Finally, using a named-pipe is possible with the original startup
script, so we aren't taking anything away from anyone.

> I'm leaning towards 2 on the grounds this has the least impact on
> the smallest number of users. This assumes that the number of
> systemd users is greater than the number of users wanting to
> redirect to a command.

+1

-- 
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

Confirming that UTF-7 is not a typo in Tomcat docs

2019-02-13 Thread Christopher Schultz 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

I just wanted to confirm that UTF-7 is not a typo on this page:

http://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#System_Prope
rties

Under the system property ENFORCE_ENCODING_IN_GET_WRITER.

I'm almost certain that it's *not* a typo because UTF-7 can be
misinterpreted as ISO-8859-1 by a particularly stupid client, but
wanted to be sure just in case.

The UTF-7 character encoding is such a rare thing that I think many
readers might think that UTF-7 is a typo and UTF-8 might be the
intended encoding.

Since that's not the case, I'd like to add a little note that we
really mean UTF-7 and not UTF-8 in this context.

Thanks,
- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlxkMGQACgkQHPApP6U8
pFgSkBAAmaNpGCkxRePauqAq5xPAURhWnBEKSNdGpdjHS5chZqJ0jrCDL0dCEapR
F99G6UeZGKGqQHSHljwzXHBF+rPO+1Ofj6LbkGuc0+lVzfbFYhtR8lUuJ3FIijfS
HMJwDhLoqs4b5rVO888HOyNN+fbIp0H1T0KwD9islNffwZHGQVCeT48+GEe/XHCy
G9AUwE1JUPtJhW3odFCpd8rlO9lRBUT484+DrWic8+jqMcqvSIke47sC1EFlFG++
QGUEAtrVYNBmAGHnVmYxisHA+0EzMOn6RSRtzUDm9XnWfcS0YbhCyp9bWLQwmQnX
RKPF+Nlezlmo5wq3bOv7pu6LvtdW+Dj8fYHo4DRDD24RhusN81ovAzs+XbErXnRv
IFbzRhVHBYiIDrbiXMaiEVCcujNEUG/aw5alNmUDQ2aSBoMq+ai/oMKBqGe14O57
fjEhInOKkVUPShHr/HZmC/qpnjNWghogBuHiMzxUU2+YT3M0rPN34E3BcBSbC6VJ
sTcDMtATeyYzAiJcfnJZf1Lo7cCRYI8unFuYXf9YYYy5I6VvSwSCPXWwzWo5H/S1
Avb5TWqBXrw5XG5f6imkgwdwiRcqBykbm92wQ00Hv7xSuXSoXJHU3nNWVaSL2U+V
TdJ6t5H3BQBiSoNoV1/pGQZd0rl5/8Q1a5BSO7hjb0CtnDLIg2k=
=pAE6
-END PGP SIGNATURE-

-
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

2019-02-13 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63041

--- Comment #29 from Mark Thomas  ---
(In reply to Konstantin Kolinko from comment #28)
> My preference is to revert and to start planning a new patch from there.

+1

We can re-open bug 53930 and discuss options there.

Calling touch on a named pipe just updates the last modified date.

Yes, a process will hang if writing to a pipe and the reading process stops but
I don't see much difference between the named pipe approach and the unnamed
pipe approach if the user wants output piped to a command. Both will hang if
the destination doesn't read the data fast enough.

-- 
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: r1853509 - in /tomcat/tc8.5.x/trunk: ./ bin/catalina.sh webapps/docs/changelog.xml

2019-02-13 Thread markt 
Author: markt
Date: Wed Feb 13 14:04:15 2019
New Revision: 1853509

URL: http://svn.apache.org/viewvc?rev=1853509=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63041
Revert the changes for BZ 53930 that added support for the CATALINA_OUT_CMD 
environment variable as they prevented correct operation with systemd 
configurations that did not explicitly specify a PID file. 

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/bin/catalina.sh
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 13 14:04:15 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

Re: [Bug 63041] shutdown.sh exits non 0 requires KILLSIG from OS

2019-02-13 Thread Christopher Schultz 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 2/13/19 06:46, bugzi...@apache.org wrote:
> https://bz.apache.org/bugzilla/show_bug.cgi?id=63041
> 
> --- Comment #26 from Mark Thomas  --- Got it.
> 
> With the single & the pid of the process that is put in the
> background is not the pid of the Tomcat process. If I specify
> $CATALINA_PID and then configure systemd to use the same file with
> PIDFILE everything starts working.
> 
> That final "&" prevents the eval command being written to the
> console when using catalina.sh start
> 
> Assuming the above is correct I think we have two options:
> 
> 1. Revert the "&" -> "&&" change. systemd users (and possibly
> others) will be required to use a PID file and to tell systemd
> where to find that file.
> 
> 2. Revert both changes. systemd users will have to take no action.
> Users wanting to redirect to a command will have to use a named
> pipe.

+1 on option 2

pid-files are anathema to systemd, so let's do them a favor. Also,
logging huge amounts of data to an unrotatable file is something users
have to swallow if they want to dump huge amounts of data to it.

Finally, using a named-pipe is possible with the original startup
script, so we aren't taking anything away from anyone.

> I'm leaning towards 2 on the grounds this has the least impact on
> the smallest number of users. This assumes that the number of
> systemd users is greater than the number of users wanting to
> redirect to a command.

+1

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlxkKMIACgkQHPApP6U8
pFhRhxAAkOAiINas0qjNUFevzJOB3wVpiAjT4mJ338571582WazD7gLX66knDlRV
UC1TXvENI/HADcpjgu2ncA7O8qHaEv3Sf5ZGN+JzYHfzVcwPBGq9P2N8WNZoFV6O
qpYNfBj5Ph37ecxLzYYw0fCTVmNXoOpPqc+7c08VqxXSpJ89C0sYCbZhA1CKLJQr
J3adJLrVdUOJSGBMEJaYzdKH6kWHVwZSohq5qsqfJrgfKkaSn8f/usq6Qdzawnd5
RDIzNYvPAkfid9VleS43kVhiKAR5+xhQMUkygVWQxCrnOdciI3UFrVUGaxHb843r
j0NnLneqAqcQC6ECR/bX087tSU/XpVd3BvS7H/DSxGnd/fZFL2yhV29nE9iMBKOj
YjOKRdVCXZJRbf+OqweMM7GpSYdBd3AHNqtfilAR5id9PbxhwoJzBd6Ebck+mw05
jmDsNirX6PFSoaC6+bnlAsdlcMGNtBj4h84SA65jtNhdSJPymC+osbaM6Or8VeIi
EHbLWusYK7JWrBP7myQzLYfiXNw2Fa6G3pfTBCt8B+VI2FW37692d3qFwWjY2ZDj
84yoPNreli1Pgud6bzc5eqwGkWwdDuYLnzKAUK1EQ3h3G4lhZvZiVrD/bQCqo64f
q8tQpyXBQPcX13252ZjTHF6FXJ+inE5XMS7to1T/U+YLnf/oeCk=
=M6xb
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 53930] allow capture of catalina stdout/stderr to a command instead of just a file [PATCH]

2019-02-13 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=53930

--- Comment #6 from Konstantin Kolinko  ---
Note that a regression from this patch is being discussed in 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

svn commit: r1853508 - in /tomcat/trunk: bin/catalina.sh webapps/docs/changelog.xml

2019-02-13 Thread markt 
Author: markt
Date: Wed Feb 13 14:01:49 2019
New Revision: 1853508

URL: http://svn.apache.org/viewvc?rev=1853508=rev
Log: (empty)

Modified:
tomcat/trunk/bin/catalina.sh
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/bin/catalina.sh
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina.sh?rev=1853508=1853507=1853508=diff
==
--- tomcat/trunk/bin/catalina.sh (original)
+++ tomcat/trunk/bin/catalina.sh Wed Feb 13 14:01:49 2019
@@ -33,14 +33,6 @@
 #   will be redirected.
 #   Default is $CATALINA_BASE/logs/catalina.out
 #
-#   CATALINA_OUT_CMD (Optional) Command which will be executed and receive
-#   as its stdin the stdout and stderr from the Tomcat java
-#   process. If CATALINA_OUT_CMD is set, the value of
-#   CATALINA_OUT will be ignored.
-#   No default.
-#   Example (all one line)
-#   CATALINA_OUT_CMD="cronolog 
$CATALINA_BASE/logs/catalina.%Y-%m-%d.out >/dev/null 2>&1"
-#
 #   CATALINA_OPTS   (Optional) Java runtime options used when the "start",
 #   "run" or "debug" command is executed.
 #   Include here and not in JAVA_OPTS all options, that should
@@ -451,23 +443,13 @@ elif [ "$1" = "start" ] ; then
   fi
 
   shift
-  if [ -z "$CATALINA_OUT_CMD" ] ; then
-touch "$CATALINA_OUT"
-catalina_out_command=">> \"$CATALINA_OUT\" 2>&1"
-  else
-catalina_out_command="| $CATALINA_OUT_CMD"
-  fi
-  if [ ! -z "$CATALINA_PID" ]; then
-catalina_pid_file="$CATALINA_PID"
-  else
-catalina_pid_file=/dev/null
-  fi
+  touch "$CATALINA_OUT"
   if [ "$1" = "-security" ] ; then
 if [ $have_tty -eq 1 ]; then
   echo "Using Security Manager"
 fi
 shift
-eval \{ $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
+eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Djava.security.manager \
@@ -476,20 +458,24 @@ elif [ "$1" = "start" ] ; then
   -Dcatalina.home="\"$CATALINA_HOME\"" \
   -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
   org.apache.catalina.startup.Bootstrap "$@" start \
-  2\>\&1 \&\& echo \$! \>\"$catalina_pid_file\" \; \} 
$catalina_out_command "&"
+  >> "$CATALINA_OUT" 2>&1 "&"
 
   else
-eval \{ $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
+eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Dcatalina.base="\"$CATALINA_BASE\"" \
   -Dcatalina.home="\"$CATALINA_HOME\"" \
   -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
   org.apache.catalina.startup.Bootstrap "$@" start \
-  2\>\&1 \&\& echo \$! \>\"$catalina_pid_file\" \; \} 
$catalina_out_command "&"
+  >> "$CATALINA_OUT" 2>&1 "&"
 
   fi
 
+  if [ ! -z "$CATALINA_PID" ]; then
+echo $! > "$CATALINA_PID"
+  fi
+
   echo "Tomcat started."
 
 elif [ "$1" = "stop" ] ; then

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1853508=1853507=1853508=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb 13 14:01:49 2019
@@ -108,6 +108,12 @@
 Expand the coverage and quality of the French translations provided
 with Apache Tomcat. (remm)
   
+  
+63041: Revert the changes for 53930 that added
+support for the CATALINA_OUT_CMD environment variable as
+they prevented correct operation with systemd configurations that did
+not explicitly specify a PID file. (markt)
+  
 
   
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 53930] allow capture of catalina stdout/stderr to a command instead of just a file [PATCH]

2019-02-13 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=53930

--- Comment #8 from Mark Thomas  ---
The proposed patch causes problems for systemd users (and possibly others) that
do not explicitly use CATALINA_PID to determine the PID of the started Tomcat
process.

Options:

1. Apply this patch as intended (e.g. r1848046) and document that systemd users
need to explicitly use CATALINA_PID

2. Close as WONTFIX with the advice to use a named pipe in CATALINA_OUT if
users want to pipe output to a process.

3. Add CATALINA_PIPE and CATALINA_OUT_CMD and manage creating of named pipe and
creation of process to read from that pipe in catalina.sh

4. Something else?

Personally, I'm leaning towards 2 at the moment.

-- 
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: r1853553 - in /tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager: LocalStrings_ru.properties host/LocalStrings_ru.properties

2019-02-13 Thread kkolinko 
Author: kkolinko
Date: Thu Feb 14 04:41:27 2019
New Revision: 1853553

URL: http://svn.apache.org/viewvc?rev=1853553=rev
Log:
Improve Russian translations provided 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=1853553=1853552=1853553=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
 Thu Feb 14 04:41:27 2019
@@ -49,7 +49,7 @@ htmlManagerServlet.connectorStateTableTi
 
htmlManagerServlet.connectorStateThreadBusy=\u041d\u044b\u043d\u0435\u0448\u043d\u0435\u0435
 \u0447\u0438\u0441\u043b\u043e \u0437\u0430\u043d\u044f\u0442\u044b\u0445 
\u043f\u043e\u0442\u043e\u043a\u043e\u0432:
 
htmlManagerServlet.connectorStateThreadCount=\u041d\u044b\u043d\u0435\u0448\u043d\u0435\u0435
 \u0447\u0438\u0441\u043b\u043e \u043f\u043e\u0442\u043e\u043a\u043e\u0432:
 
htmlManagerServlet.deployButton=\u0420\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u044c
-htmlManagerServlet.deployConfig=\u0420\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435
 \u0444\u0430\u0439\u043b\u0430 
\u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a XML:
+htmlManagerServlet.deployConfig=\u041f\u0443\u0442\u044c XML 
\u0444\u0430\u0439\u043b\u0430 
\u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 
\u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0430:
 htmlManagerServlet.deployPath=\u041f\u0443\u0442\u044c:
 
htmlManagerServlet.deployServer=\u0420\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u044c
 \u0441\u0435\u0440\u0432\u0435\u0440\u043d\u044b\u0439 WAR 
\u0444\u0430\u0439\u043b
 
htmlManagerServlet.deployTitle=\u0420\u0430\u0437\u0432\u0435\u0440\u043d\u0443\u0442\u044c
@@ -64,25 +64,25 @@ htmlManagerServlet.deployVersion=\u0412\
 htmlManagerServlet.deployWar=WAR \u0438\u043b\u0438 \u043f\u0443\u0442\u044c 
\u0434\u043e \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438:
 
htmlManagerServlet.diagnosticsLeak=\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0435\u0442,
 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043b\u0438 
\u0443\u0442\u0435\u0447\u043a\u0430 \u043f\u0430\u043c\u044f\u0442\u0438 
\u043f\u043e\u0441\u043b\u0435 
\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438, 
\u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 
\u0438\u043b\u0438 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f 
\u0432\u0435\u0431-\u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
 htmlManagerServlet.diagnosticsLeakButton=\u041d\u0430\u0439\u0442\u0438 
\u0443\u0442\u0435\u0447\u043a\u0438 \u043f\u0430\u043c\u044f\u0442\u0438
-htmlManagerServlet.diagnosticsLeakWarning=\u0414\u0430\u043d\u043d\u0430\u044f 
\u0434\u0438\u0430\u0433\u043d\u043e\u0441\u0442\u0438\u043a\u0430 
\u043c\u043e\u0436\u0435\u0442 
\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c 
\u0441\u0431\u043e\u0440\u043a\u0443 \u043c\u0443\u0441\u043e\u0440\u0430. 
\u0411\u0443\u0434\u044c\u0442\u0435 
\u043e\u0441\u0442\u043e\u0440\u043e\u0436\u043d\u044b \u043f\u0440\u0438 
\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438 
\u0435\u0451 \u043d\u0430 
\u043f\u0440\u043e\u0434\u0443\u043a\u0442\u0438\u0432\u043d\u044b\u0445 
\u0441\u0438\u0441\u0442\u0435\u043c\u0430\u0445.
+htmlManagerServlet.diagnosticsLeakWarning=\u0414\u0430\u043d\u043d\u0430\u044f 
\u0434\u0438\u0430\u0433\u043d\u043e\u0441\u0442\u0438\u043a\u0430 
\u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0435\u0442 
\u0441\u0431\u043e\u0440\u043a\u0443 \u043c\u0443\u0441\u043e\u0440\u0430. 
\u0411\u0443\u0434\u044c\u0442\u0435 
\u043e\u0441\u0442\u043e\u0440\u043e\u0436\u043d\u044b \u043f\u0440\u0438 
\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438 
\u0435\u0451 \u043d\u0430 
\u043f\u0440\u043e\u0434\u0443\u043a\u0442\u0438\u0432\u043d\u044b\u0445 
\u0441\u0438\u0441\u0442\u0435\u043c\u0430\u0445.
 
htmlManagerServlet.diagnosticsSsl=\u0414\u0438\u0430\u0433\u043d\u043e\u0441\u0442\u0438\u043a\u0430
 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 TLS 
\u0434\u043b\u044f 
\u043a\u043e\u043d\u043d\u0435\u043a\u0442\u043e\u0440\u043e\u0432
 
htmlManagerServlet.diagnosticsSslConnectorCertsButton=\u0421\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u044b
 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438
 
htmlManagerServlet.diagnosticsSslConnectorCertsText=\u0421\u043f\u0438\u0441\u043e\u043a

svn commit: r1853551 - in /tomcat/trunk: java/org/apache/catalina/manager/StatusTransformer.java webapps/docs/changelog.xml

2019-02-13 Thread kkolinko 
Author: kkolinko
Date: Thu Feb 14 04:14:37 2019
New Revision: 1853551

URL: http://svn.apache.org/viewvc?rev=1853551=rev
Log:
Improve display of summary values on the status page of Manager web 
application: separate terms and values with a whitespace.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1853551=1853550=1853551=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java Thu 
Feb 14 04:14:37 2019
@@ -174,19 +174,31 @@ public class StatusTransformer {
 
 writer.print("");
 writer.print( args[0] );
+writer.print(' ');
 writer.print(formatSize(Long.valueOf(result[0]), true));
-writer.print(" " + args[1]);
+writer.print(' ');
+writer.print(args[1]);
+writer.print(' ');
 writer.print(formatSize(Long.valueOf(result[1]), true));
-writer.print(" " + args[2]);
+writer.print(' ');
+writer.print(args[2]);
+writer.print(' ');
 writer.print(formatSize(Long.valueOf(result[2]), true));
-writer.print(" " + args[3]);
+writer.print(' ');
+writer.print(args[3]);
+writer.print(' ');
 writer.print(formatSize(Long.valueOf(result[3]), true));
-writer.print(" " + args[4]);
+writer.print(' ');
+writer.print(args[4]);
+writer.print(' ');
 writer.print(Long.valueOf(result[6]));
 writer.print("");
-writer.print(" " + args[5]);
+writer.print(args[5]);
+writer.print(' ');
 writer.print(formatTime(Long.valueOf(result[11] / 1000), 
true));
-writer.print(" " + args[6]);
+writer.print(' ');
+writer.print(args[6]);
+writer.print(' ');
 writer.print(formatTime(Long.valueOf(result[12] / 1000), 
true));
 writer.print("");
 } else if (mode == 1){
@@ -219,12 +231,17 @@ public class StatusTransformer {
 
 writer.print("");
 writer.print( args[0] );
+writer.print(' ');
 writer.print(formatSize(
 Long.valueOf(Runtime.getRuntime().freeMemory()), true));
-writer.print(" " + args[1] );
+writer.print(' ');
+writer.print(args[1]);
+writer.print(' ');
 writer.print(formatSize(
 Long.valueOf(Runtime.getRuntime().totalMemory()), true));
-writer.print(" " + args[2] );
+writer.print(' ');
+writer.print(args[2]);
+writer.print(' ');
 writer.print(formatSize(
 Long.valueOf(Runtime.getRuntime().maxMemory()), true));
 writer.print("");
@@ -301,12 +318,19 @@ public class StatusTransformer {
 
 writer.print("");
 writer.print( args[0] );
+writer.print(' ');
 writer.print(mBeanServer.getAttribute(tpName, "maxThreads"));
-writer.print(" " + args[1]);
+writer.print(' ');
+writer.print(args[1]);
+writer.print(' ');
 writer.print(mBeanServer.getAttribute(tpName, 
"currentThreadCount"));
-writer.print(" " + args[2]);
+writer.print(' ');
+writer.print(args[2]);
+writer.print(' ');
 writer.print(mBeanServer.getAttribute(tpName, 
"currentThreadsBusy"));
-writer.print(" " + args[3]);
+writer.print(' ');
+writer.print(args[3]);
+writer.print(' ');
 writer.print(mBeanServer.getAttribute(tpName, "keepAliveCount"));
 
 writer.print("");
@@ -327,19 +351,30 @@ public class StatusTransformer {
 }
 
 writer.print( args[4] );
+writer.print(' ');
 writer.print(formatTime(mBeanServer.getAttribute
 (grpName, "maxTime"), false));
-writer.print(" " + args[5]);
+writer.print(' ');
+writer.print(args[5]);
+writer.print(' ');
 writer.print(formatTime(mBeanServer.getAttribute
 (grpName, "processingTime"), true));
-writer.print(" " + args[6]);
+writer.print(' ');
+writer.print(args[6]);
+

svn commit: r1853550 - in /tomcat/trunk: java/org/apache/catalina/manager/LocalStrings_ru.properties java/org/apache/catalina/manager/host/LocalStrings_ru.properties webapps/docs/changelog.xml

2019-02-13 Thread kkolinko 
Author: kkolinko
Date: Thu Feb 14 04:13:12 2019
New Revision: 1853550

URL: http://svn.apache.org/viewvc?rev=1853550=rev
Log:
Improve Russian translations provided 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
tomcat/trunk/webapps/docs/changelog.xml

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=1853550=1853549=1853550=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] Thu Feb 14 04:13:12 2019
@@ -49,7 +49,7 @@ htmlManagerServlet.connectorStateTableTi
 htmlManagerServlet.connectorStateThreadBusy=Нынешнее число занятых потоков:
 htmlManagerServlet.connectorStateThreadCount=Нынешнее число потоков:
 htmlManagerServlet.deployButton=Развернуть
-htmlManagerServlet.deployConfig=Расположение файла настроек XML:
+htmlManagerServlet.deployConfig=Путь XML файла конфигурации контекста:
 htmlManagerServlet.deployPath=Путь:
 htmlManagerServlet.deployServer=Развернуть серверный WAR файл
 htmlManagerServlet.deployTitle=Развернуть
@@ -64,24 +64,24 @@ htmlManagerServlet.deployVersion=Вер�
 htmlManagerServlet.deployWar=WAR или путь до директории:
 htmlManagerServlet.diagnosticsLeak=Проверяет, произошла ли утечка памяти после 
остановки, перезагрузки или удаления веб-приложений
 htmlManagerServlet.diagnosticsLeakButton=Найти утечки памяти
-htmlManagerServlet.diagnosticsLeakWarning=Данная диагностика может запустить 
сборку мусора. Будьте осторожны при использовании её на продуктивных системах.
+htmlManagerServlet.diagnosticsLeakWarning=Данная диагностика запускает сборку 
мусора. Будьте осторожны при использовании её на продуктивных системах.
 htmlManagerServlet.diagnosticsSsl=Диагностика конфигурации TLS для коннекторов
 htmlManagerServlet.diagnosticsSslConnectorCertsButton=Сертификаты безопасности
 htmlManagerServlet.diagnosticsSslConnectorCertsText=Список виртуальных TLS 
хостов и их сертификатов безопасности
-htmlManagerServlet.diagnosticsSslConnectorCipherButton=Шифр
+htmlManagerServlet.diagnosticsSslConnectorCipherButton=Шифры
 htmlManagerServlet.diagnosticsSslConnectorCipherText=Список виртуальных TLS 
хостов и их шифры
 htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=Доверенные 
сертификаты
-htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=Список виртуальных 
TLS хостов и их доверенные сертификаты безопасности
+htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=Список виртуальных 
TLS хостов и их доверенных сертификатов безопасности
 htmlManagerServlet.diagnosticsTitle=Диагностика
 htmlManagerServlet.expire.explain=с бездействием 
 htmlManagerServlet.expire.unit=минут
-htmlManagerServlet.findleaksList=The following web applications were stopped 
(reloaded, undeployed), but their\n\
-classes from previous runs are still loaded in memory, thus causing a memory\n\
-leak (use a profiler to confirm):
+htmlManagerServlet.findleaksList=Следующие веб-приложения были остановлены 
(перезагружены, удалены),\n\
+но их классы с предыдущих запусков до сих пор присутствуют в памяти\n\
+(используйте программу-профайлер, чтобы подтвердить наличие проблемы):\n
 htmlManagerServlet.findleaksNone=Кажется, что веб-приложения не вызвали утечку 
памяти при остановке, перезагрузке или удалении.
-htmlManagerServlet.helpHtmlManager=Справка по приложению Manager
+htmlManagerServlet.helpHtmlManager=Справка для пользователей приложения
 htmlManagerServlet.helpHtmlManagerFile=../docs/html-manager-howto.html
-htmlManagerServlet.helpManager=Справка по API приложения Manager
+htmlManagerServlet.helpManager=Справка по API приложения
 htmlManagerServlet.helpManagerFile=../docs/manager-howto.html
 htmlManagerServlet.jvmFreeMemory=Свободная память:
 htmlManagerServlet.jvmMaxMemory=Максимум памяти:
@@ -123,8 +123,8 @@ managerServlet.deployed=OK - Прило�
 managerServlet.deployedButNotStarted=ОШИБКА - Приложение было развёрнуто в 
контекстном пути [{0}], но не стартовало
 managerServlet.exception=ОШИБКА - Встретилось исключение [{0}]
 managerServlet.findleaksFail=ОШИБКА - Не удалось найти утечки памяти: Host not 
instance of StandardHost
-managerServlet.findleaksList=OK - Найдены потенциальные ошибки в памяти в 
следующих приложениях:
-managerServlet.findleaksNone=OK - Не найдено ошибок в памяти
+managerServlet.findleaksList=OK - Найдены потенциальные утечки памяти в 
следующих приложениях:
+managerServlet.findleaksNone=OK - Не найдено утечек памяти
 managerServlet.inService=ОШИБКА -  Приложение [{0}] уже обслуживается
 managerServlet.invalidCommand=ОШИБКА - Недопустимые параметры,

svn commit: r1853557 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/manager/StatusTransformer.java webapps/docs/changelog.xml

2019-02-13 Thread kkolinko 
Author: kkolinko
Date: Thu Feb 14 05:08:58 2019
New Revision: 1853557

URL: http://svn.apache.org/viewvc?rev=1853557=rev
Log:
Improve display of summary values on the status page of Manager web 
application: separate terms and values with a whitespace.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1853557=1853556=1853557=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java 
Thu Feb 14 05:08:58 2019
@@ -177,19 +177,31 @@ public class StatusTransformer {
 
 writer.print("");
 writer.print( args[0] );
+writer.print(' ');
 writer.print(formatSize(Long.valueOf(result[0]), true));
-writer.print(" " + args[1]);
+writer.print(' ');
+writer.print(args[1]);
+writer.print(' ');
 writer.print(formatSize(Long.valueOf(result[1]), true));
-writer.print(" " + args[2]);
+writer.print(' ');
+writer.print(args[2]);
+writer.print(' ');
 writer.print(formatSize(Long.valueOf(result[2]), true));
-writer.print(" " + args[3]);
+writer.print(' ');
+writer.print(args[3]);
+writer.print(' ');
 writer.print(formatSize(Long.valueOf(result[3]), true));
-writer.print(" " + args[4]);
+writer.print(' ');
+writer.print(args[4]);
+writer.print(' ');
 writer.print(Long.valueOf(result[6]));
 writer.print("");
-writer.print(" " + args[5]);
+writer.print(args[5]);
+writer.print(' ');
 writer.print(formatTime(Long.valueOf(result[11] / 1000), 
true));
-writer.print(" " + args[6]);
+writer.print(' ');
+writer.print(args[6]);
+writer.print(' ');
 writer.print(formatTime(Long.valueOf(result[12] / 1000), 
true));
 writer.print("");
 } else if (mode == 1){
@@ -223,12 +235,17 @@ public class StatusTransformer {
 
 writer.print("");
 writer.print( args[0] );
+writer.print(' ');
 writer.print(formatSize(
 Long.valueOf(Runtime.getRuntime().freeMemory()), true));
-writer.print(" " + args[1] );
+writer.print(' ');
+writer.print(args[1]);
+writer.print(' ');
 writer.print(formatSize(
 Long.valueOf(Runtime.getRuntime().totalMemory()), true));
-writer.print(" " + args[2] );
+writer.print(' ');
+writer.print(args[2]);
+writer.print(' ');
 writer.print(formatSize(
 Long.valueOf(Runtime.getRuntime().maxMemory()), true));
 writer.print("");
@@ -305,14 +322,21 @@ public class StatusTransformer {
 
 writer.print("");
 writer.print( args[0] );
+writer.print(' ');
 writer.print(mBeanServer.getAttribute(tpName, "maxThreads"));
-writer.print(" " + args[1]);
+writer.print(' ');
+writer.print(args[1]);
+writer.print(' ');
 writer.print(mBeanServer.getAttribute(tpName, 
"currentThreadCount"));
-writer.print(" " + args[2]);
+writer.print(' ');
+writer.print(args[2]);
+writer.print(' ');
 writer.print(mBeanServer.getAttribute(tpName, 
"currentThreadsBusy"));
 try {
 Object value = mBeanServer.getAttribute(tpName, 
"keepAliveCount");
-writer.print(" " + args[3]);
+writer.print(' ');
+writer.print(args[3]);
+writer.print(' ');
 writer.print(value);
 } catch (Exception e) {
 // Ignore
@@ -336,19 +360,30 @@ public class StatusTransformer {
 }
 
 writer.print( args[4] );
+writer.print(' ');
 writer.print(formatTime(mBeanServer.getAttribute
 (grpName, "maxTime"), false));
-writer.print(" " + args[5]);
+writer.print(' ');
+writer.print(args[5]);
+writer.print(' ');
 writer.print(formatTime(mBeanServer.getAttribute

svn propchange: r1853508 - svn:log

2019-02-13 Thread kkolinko 
Author: kkolinko
Revision: 1853508
Modified property: svn:log

Modified: svn:log at Thu Feb 14 04:29:37 2019
--
--- svn:log (original)
+++ svn:log Thu Feb 14 04:29:37 2019
@@ -0,0 +1,2 @@
+Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63041
+Revert the changes for BZ 53930 that added support for the CATALINA_OUT_CMD 
environment variable as they prevented correct operation with systemd 
configurations that did not explicitly specify a PID file.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1853555 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/manager/StatusTransformer.java webapps/docs/changelog.xml

2019-02-13 Thread kkolinko 
Author: kkolinko
Date: Thu Feb 14 04:50:56 2019
New Revision: 1853555

URL: http://svn.apache.org/viewvc?rev=1853555=rev
Log:
Improve display of summary values on the status page of Manager web 
application: separate terms and values with a whitespace.

Merged r1853551 from tomcat/trunk.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 14 04:50:56 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

svn commit: r1853554 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/manager/LocalStrings_ru.properties java/org/apache/catalina/manager/host/LocalStrings_ru.properties

2019-02-13 Thread kkolinko 
Author: kkolinko
Date: Thu Feb 14 04:44:31 2019
New Revision: 1853554

URL: http://svn.apache.org/viewvc?rev=1853554=rev
Log:
Improve Russian translations provided for Manager and Host Manager web 
applications.

Merged r1853553 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 Thu Feb 14 04:44:31 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

Tag 9.0.x / 8.5.x

2019-02-13 Thread Mark Thomas 
All,

Thoughts on new 9.0.x and 8.5.x releases due to the regression caused by
BZ 63041?

I'm happy to RM these if the community wants to see them.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Confirming that UTF-7 is not a typo in Tomcat docs

2019-02-13 Thread Konstantin Kolinko 
ср, 13 февр. 2019 г. в 17:57, Christopher Schultz
:
>
> I just wanted to confirm that UTF-7 is not a typo on this page:
>
> http://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#System_Prope
> rties
>
> Under the system property ENFORCE_ENCODING_IN_GET_WRITER.
>
> I'm almost certain that it's *not* a typo because UTF-7 can be
> misinterpreted as ISO-8859-1 by a particularly stupid client, but
> wanted to be sure just in case.
>
> The UTF-7 character encoding is such a rare thing that I think many
> readers might think that UTF-7 is a typo and UTF-8 might be the
> intended encoding.
>
> Since that's not the case, I'd like to add a little note that we
> really mean UTF-7 and not UTF-8 in this context.
>

Yes, UTF-7.

The question is not whether it is really used. The question is whether
a browser is able to interpret some random garbage as UTF-7.

I think none of current browsers are able to use it, as removal of
support for UTF-7 as well as some other encodings is a requirement in
HTML5 specification.

Wikipedia mentions that old IE was vulnerable.

In Firefox support for it was removed in Firefox 5. (Discussion in
414064 cites HTML 5 document and mentions some places where UTF7 was
used at that time, in year 2010).

https://en.wikipedia.org/wiki/UTF-7
https://bugzilla.mozilla.org/show_bug.cgi?id=414064

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Confirming that UTF-7 is not a typo in Tomcat docs

2019-02-13 Thread Mark Thomas 
On 13/02/2019 14:57, Christopher Schultz wrote:
> All,
> 
> I just wanted to confirm that UTF-7 is not a typo on this page:
> 
> http://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#System_Prope
> rties
> 
> Under the system property ENFORCE_ENCODING_IN_GET_WRITER.
> 
> I'm almost certain that it's *not* a typo because UTF-7 can be
> misinterpreted as ISO-8859-1 by a particularly stupid client, but
> wanted to be sure just in case.

It is not a typo. We've rejected XXS vulnerability reports in the past
on the grounds that the client isn't following the specs in this case.

Mark


> 
> The UTF-7 character encoding is such a rare thing that I think many
> readers might think that UTF-7 is a typo and UTF-8 might be the
> intended encoding.
> 
> Since that's not the case, I'd like to add a little note that we
> really mean UTF-7 and not UTF-8 in this context.
> 
> Thanks,
> -chris
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org