Re: svn commit: r1825734 - /tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java

2018-03-06 Thread Christopher Schultz 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 3/2/18 2:13 PM, Mark Thomas wrote:
> On 02/03/18 19:01, Christopher Schultz wrote:
> 
> 
> 
>> Would it be better to do this instead:
>> 
>> response.setContentType("text/plain;charset=" +
>> response.getCharacterEncoding());
>> 
>> Even if the encoding is *supposed* to be UTF-8 (like the
>> constant suggests), in case it isn't for whatever reason, we
>> should use the encoding that is actually being used, instead of
>> what we expect to be used.
> 
> We should be in full control of the response so it can be any
> encoding we want. Can't it?

Sure, but I think it would be better if everything were
self-consistent. Sure, the code is self-consistent, but it could
diverge in the future. Using setContentType(getCharacterEncoding())
removes the possibility of a future bug.

Also, there are filters and other things that might cause the
character encoding to change to be something unexpected in this part
of the code. Pulling the *actual* character encoding prevents the
response from becoming inconsistent with itself.

- -chris
-BEGIN PGP SIGNATURE-
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQJRBAEBCAA7FiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlqfDCMdHGNocmlzQGNo
cmlzdG9waGVyc2NodWx0ei5uZXQACgkQHPApP6U8pFjN9w//YtxZJ6vo7UMyTqMH
4lrQtjmduGVk6DzqrtKN4myRNLx5kdjtjgNprzxEUylT6o4XKtz0EDG+6NB4qzS4
oPEfS12XWzznyWGgkadNeo0azUHkbXhh8G61p/Hv2TktPnJou1mAINp9FFciMA8O
aXCDoF/03JEQRe/VUivmtmzfG8cWV82DR0dpNNabK8Yfm327Zxl9Qb2UJpnaomIq
u3OKJoS48Hk/d3NjN0hJZ7k+GLs7+pWwMQ/youAcGGW8BBgOnJG8HLiZKf851gS5
0J5GNg/osMmNsUmTcCBJ94q4TfAysa2oN/ZFem6RQItGdjUFyoz5JyQVHeYANQ2N
Prw374Z5g+LCJpkcMoJVqBx1qv2MeVy8QYv2fcaOtOd6rSnX8wnfCGIwDDwz/u5i
iXlUpOjHKwYomxmsXS9viBdEGT8fZkh14IVhrfSVL2qLOAepinmawin7Iu1Jstpq
puBDiN+V0B1UJZ5IInB+GOSSSMDfk7Ub1Sa2OEl7y9Z8kqwwQ9CTrJgkMhhW08tE
VpeakcXCf0dJHO8ktHJQfE5SjonEiDE3fYc7gmfYPSoFBBccixKRNZE7nSfsrCqK
+TCKfAtj/GptaGEHphFe1Fbq0plD35xzI6JVB87ZQKx6uVeFFkhO21V+AlMNJjKB
N5V+EJ3ueeT1NvI8TJgHU9a8LAk=
=Wbfk
-END PGP SIGNATURE-

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

[Bug 62160] Property values linking

2018-03-06 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62160

Remy Maucherat  changed:

   What|Removed |Added

 Resolution|--- |WONTFIX
 Status|REOPENED|RESOLVED

--- Comment #3 from Remy Maucherat  ---
I have reverted my patch and will leave it at that since I do not agree with
the reasoning or your expected result.

-- 
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: r1826049 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2018-03-06 Thread remm 
Author: remm
Date: Tue Mar  6 21:16:08 2018
New Revision: 1826049

URL: http://svn.apache.org/viewvc?rev=1826049=rev
Log:
Revert 62160

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 21:16:08 2018
@@ -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: r1826048 - in /tomcat/trunk: java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2018-03-06 Thread remm 
Author: remm
Date: Tue Mar  6 21:14:17 2018
New Revision: 1826048

URL: http://svn.apache.org/viewvc?rev=1826048=rev
Log:
Revert 62160 following veto.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1826048=1826047=1826048=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue Mar  6 
21:14:17 2018
@@ -1924,14 +1924,10 @@ public class Digester extends DefaultHan
 for (int i = 0; i < nAttributes; ++i) {
 String value = newAttrs.getValue(i);
 try {
-String newValue = value;
-do {
-value = newValue;
-newValue = IntrospectionUtils.replaceProperties(value, 
null, source);
-if (!value.equals(newValue)) {
-newAttrs.setValue(i, newValue);
-}
-} while (!value.equals(newValue));
+String newValue = IntrospectionUtils.replaceProperties(value, 
null, source);
+if (value != newValue) {
+newAttrs.setValue(i, newValue);
+}
 } catch (Exception e) {
 log.warn(sm.getString("digester.failedToUpdateAttributes", 
newAttrs.getLocalName(i), value), e);
 }
@@ -1949,17 +1945,14 @@ public class Digester extends DefaultHan
  */
 private StringBuilder updateBodyText(StringBuilder bodyText) {
 String in = bodyText.toString();
-String out = in;
+String out;
 try {
-do {
-in = out;
-out = IntrospectionUtils.replaceProperties(in, null, source);
-} while (!out.equals(in));
+out = IntrospectionUtils.replaceProperties(in, null, source);
 } catch (Exception e) {
 return bodyText; // return unchanged data
 }
 
-if (out.equals(in)) {
+if (out == in) {
 // No substitutions required. Don't waste memory creating
 // a new buffer
 return bodyText;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1826048=1826047=1826048=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar  6 21:14:17 2018
@@ -59,10 +59,6 @@
   
 Avoid potential loop in APR/Native poller. (markt)
   
-  
-62160: Allow more flexible linked property replacement
-using the configured property source and system properties. (remm)
-  
 
   
   



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

svn commit: r25508 - /dev/tomcat/tomcat-connectors/jk/ /dev/tomcat/tomcat-connectors/jk/binaries/windows/ /dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/ /release/tomcat/tomcat-connectors/j

2018-03-06 Thread markt 
Author: markt
Date: Tue Mar  6 21:01:07 2018
New Revision: 25508

Log:
Release Tomcat Connectors 1.2.43

Added:

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-i386-symbols.zip
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-i386-symbols.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-i386-symbols.zip.asc
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-i386-symbols.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-i386-symbols.zip.sha1
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-i386-symbols.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-i386-symbols.zip.sha512
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-i386-symbols.zip.sha512

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-x86_64-symbols.zip
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-x86_64-symbols.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-x86_64-symbols.zip.asc
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-x86_64-symbols.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-x86_64-symbols.zip.sha1
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-x86_64-symbols.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-x86_64-symbols.zip.sha512
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/symbols/tomcat-connectors-1.2.43-windows-x86_64-symbols.zip.sha512

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-i386-iis.zip
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-i386-iis.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-i386-iis.zip.asc
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-i386-iis.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-i386-iis.zip.sha1
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-i386-iis.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-i386-iis.zip.sha512
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-i386-iis.zip.sha512

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-x86_64-iis.zip
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-x86_64-iis.zip

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-x86_64-iis.zip.asc
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-x86_64-iis.zip.asc

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-x86_64-iis.zip.sha1
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-x86_64-iis.zip.sha1

release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-x86_64-iis.zip.sha512
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.43-windows-x86_64-iis.zip.sha512
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.43-src.tar.gz
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.43-src.tar.gz
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.43-src.tar.gz.asc
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.43-src.tar.gz.asc
release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.43-src.tar.gz.sha1
  - copied unchanged from r25507, 
dev/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.43-src.tar.gz.sha1

release/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.43-src.tar.gz.sha512
  - copied unchanged from r25507,

[Bug 62160] Property values linking

2018-03-06 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62160

Konstantin Kolinko  changed:

   What|Removed |Added

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

--- Comment #2 from Konstantin Kolinko  ---
I am OK with the feature, but I am -1 on the approach implemented in this patch
(r1825989).

1). Consider the following properties:
first=${
second=bar}
bar=baz

If you have value="${first}${second}" my expectation is that result of
substitution will be value="${bar}". Your algorithm will yield value="baz".

I think the replacement loop should be inside of
IntrospectionUtils.replaceProperties(),
looking for replacements in the value of a property.

Instead of looping over resulting value.

2). It would be better to have some hard limit on recursion depth. E.g. 20.
(Not a showstopper requirement, but a "nice to have" one).

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

[VOTE][RESULT] Release JK 1.2.43

2018-03-06 Thread Mark Thomas 
The following votes were cast:

Binding:
+1: markt, kfujino, rjung

No other voters were cast.

The vote therefore passes. I'll move the bits now. I'll update the
website and announce once the mirrors catch up.

Thanks to everyone who contributed to this release.

Mark

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

Re: [VOTE] Release Apache Tomcat 9.0.6

2018-03-06 Thread Violeta Georgieva 
Hi,

2018-03-05 12:53 GMT+02:00 Mark Thomas :
>
> The proposed Apache Tomcat 9.0.6 release is now available for voting.
>
> The major changes compared to the 9.0.5 release are:
>
> - TLS stability improvements.
>
> - Add the ability to specify static HTML responses for specific error
>   codes and/or exception types with the ErrorReportValve.
>
> - Add async HTTP/2 parser for NIO2.
>
> - Add documentation for the Host Manager web application.
>   Patch provided by Marek Czernek.
>
> Along with lots of other bug fixes and improvements.
>
> For full details, see the changelog:
> http://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-9/v9.0.6/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1174/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tags/TOMCAT_9_0_6/
>
> The proposed 9.0.6 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 9.0.6

+1

Regards,
Violeta

Re: [VOTE] Release Apache Tomcat 8.5.29

2018-03-06 Thread Violeta Georgieva 
Hi,

2018-03-05 15:51 GMT+02:00 Mark Thomas :
>
> The proposed Apache Tomcat 8.5.29 release is now available for voting.
>
> The major changes compared to the 8.5.28 release are:
>
> - TLS stability improvements.
>
> - Correct a regression in the fix for 60276 that meant that compression
>   was applied to all MIME types.
>   Patch provided by Stefan Knoblich.
>
> - Add documentation for the Host Manager web application.
>   Patch provided by Marek Czernek.
>
> Along with lots of other bug fixes and improvements.
>
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.29/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1175/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_29/
>
> The proposed 8.5.29 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 8.5.29

+1

Regards,
Violeta

[Bug 62160] Property values linking

2018-03-06 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62160

Remy Maucherat  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Remy Maucherat  ---
After playing it a bit, it looked better to me. The update will be in 9.0.7 and
8.5.30, unless someone complains about it.

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

svn commit: r1825989 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2018-03-06 Thread remm 
Author: remm
Date: Tue Mar  6 14:10:12 2018
New Revision: 1825989

URL: http://svn.apache.org/viewvc?rev=1825989=rev
Log:
62160: Allow more flexible linked property replacement using the configured 
property source and system properties.

Modified:
tomcat/tc8.5.x/trunk/   (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  6 14:10:12 2018
@@ -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: r1825987 - in /tomcat/trunk: java/org/apache/tomcat/util/digester/Digester.java webapps/docs/changelog.xml

2018-03-06 Thread remm 
Author: remm
Date: Tue Mar  6 14:00:04 2018
New Revision: 1825987

URL: http://svn.apache.org/viewvc?rev=1825987=rev
Log:
62160: Allow more flexible linked property replacement using the configured 
property source and system properties.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1825987=1825986=1825987=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue Mar  6 
14:00:04 2018
@@ -1924,10 +1924,14 @@ public class Digester extends DefaultHan
 for (int i = 0; i < nAttributes; ++i) {
 String value = newAttrs.getValue(i);
 try {
-String newValue = IntrospectionUtils.replaceProperties(value, 
null, source);
-if (value != newValue) {
-newAttrs.setValue(i, newValue);
-}
+String newValue = value;
+do {
+value = newValue;
+newValue = IntrospectionUtils.replaceProperties(value, 
null, source);
+if (!value.equals(newValue)) {
+newAttrs.setValue(i, newValue);
+}
+} while (!value.equals(newValue));
 } catch (Exception e) {
 log.warn(sm.getString("digester.failedToUpdateAttributes", 
newAttrs.getLocalName(i), value), e);
 }
@@ -1945,14 +1949,17 @@ public class Digester extends DefaultHan
  */
 private StringBuilder updateBodyText(StringBuilder bodyText) {
 String in = bodyText.toString();
-String out;
+String out = in;
 try {
-out = IntrospectionUtils.replaceProperties(in, null, source);
+do {
+in = out;
+out = IntrospectionUtils.replaceProperties(in, null, source);
+} while (!out.equals(in));
 } catch (Exception e) {
 return bodyText; // return unchanged data
 }
 
-if (out == in) {
+if (out.equals(in)) {
 // No substitutions required. Don't waste memory creating
 // a new buffer
 return bodyText;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1825987=1825986=1825987=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar  6 14:00:04 2018
@@ -59,6 +59,10 @@
   
 Avoid potential loop in APR/Native poller. (markt)
   
+  
+62160: Allow more flexible linked property replacement
+using the configured property source and system properties. (remm)
+  
 
   
   



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

svn commit: r1825985 - /tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java

2018-03-06 Thread markt 
Author: markt
Date: Tue Mar  6 13:38:08 2018
New Revision: 1825985

URL: http://svn.apache.org/viewvc?rev=1825985=rev
Log:
Fix typo

Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java?rev=1825985=1825984=1825985=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java Tue Mar  
6 13:38:08 2018
@@ -29,7 +29,7 @@ import org.apache.juli.logging.LogFactor
  */
 public final class SecurityConfig{
 
-private static final Object singeltonLock = new Object();
+private static final Object singletonLock = new Object();
 private static volatile SecurityConfig singleton = null;
 
 private static final Log log = LogFactory.getLog(SecurityConfig.class);
@@ -86,7 +86,7 @@ public final class SecurityConfig{
  */
 public static SecurityConfig newInstance(){
 if (singleton == null) {
-synchronized (singeltonLock) {
+synchronized (singletonLock) {
 if (singleton == null) {
 singleton = new SecurityConfig();
 }



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

Re: svn commit: r1825978 - /tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java

2018-03-06 Thread Mark Thomas 
On 06/03/18 13:26, Andrei Ivanov wrote:
> On Tue, Mar 6, 2018 at 1:32 PM,  wrote:
> 
>> Author: markt
>> Date: Tue Mar  6 11:32:42 2018
>> New Revision: 1825978
>>
>> URL: http://svn.apache.org/viewvc?rev=1825978=rev
>> Log:
>> SpotBugs
>> Correctly construct singleton in a thread-safe manner
>>
>> Modified:
>> tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
>>
>> Modified: tomcat/trunk/java/org/apache/catalina/security/
>> SecurityConfig.java
>> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/
>> catalina/security/SecurityConfig.java?rev=1825978=1825977=1825978&
>> view=diff
>> 
>> ==
>> --- tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
>> (original)
>> +++ tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
>> Tue Mar  6 11:32:42 2018
>> @@ -28,7 +28,9 @@ import org.apache.juli.logging.LogFactor
>>   * @author the Catalina.java authors
>>   */
>>  public final class SecurityConfig{
>> -private static SecurityConfig singleton = null;
>> +
>> +private static final Object singeltonLock = new Object();
>> +private static volatile SecurityConfig singleton = null;
>>
>>  private static final Log log = LogFactory.getLog(
>> SecurityConfig.class);
>>
>> @@ -83,8 +85,12 @@ public final class SecurityConfig{
>>   * @return an instance of that class.
>>   */
>>  public static SecurityConfig newInstance(){
>> -if (singleton == null){
>> -singleton = new SecurityConfig();
>> +if (singleton == null) {
>> +synchronized (singeltonLock) {
>> +if (singleton == null) {
>> +singleton = new SecurityConfig();
>> +}
>> +}
>>  }
>>  return singleton;
>>  }
>>
> 
> Hi,
> There's a typo on singeltonLock.

Thanks. I'll fix that.

Mark

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

Re: svn commit: r1825978 - /tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java

2018-03-06 Thread Andrei Ivanov 
On Tue, Mar 6, 2018 at 1:32 PM,  wrote:

> Author: markt
> Date: Tue Mar  6 11:32:42 2018
> New Revision: 1825978
>
> URL: http://svn.apache.org/viewvc?rev=1825978=rev
> Log:
> SpotBugs
> Correctly construct singleton in a thread-safe manner
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
>
> Modified: tomcat/trunk/java/org/apache/catalina/security/
> SecurityConfig.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/
> catalina/security/SecurityConfig.java?rev=1825978=1825977=1825978&
> view=diff
> 
> ==
> --- tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
> Tue Mar  6 11:32:42 2018
> @@ -28,7 +28,9 @@ import org.apache.juli.logging.LogFactor
>   * @author the Catalina.java authors
>   */
>  public final class SecurityConfig{
> -private static SecurityConfig singleton = null;
> +
> +private static final Object singeltonLock = new Object();
> +private static volatile SecurityConfig singleton = null;
>
>  private static final Log log = LogFactory.getLog(
> SecurityConfig.class);
>
> @@ -83,8 +85,12 @@ public final class SecurityConfig{
>   * @return an instance of that class.
>   */
>  public static SecurityConfig newInstance(){
> -if (singleton == null){
> -singleton = new SecurityConfig();
> +if (singleton == null) {
> +synchronized (singeltonLock) {
> +if (singleton == null) {
> +singleton = new SecurityConfig();
> +}
> +}
>  }
>  return singleton;
>  }
>

Hi,
There's a typo on singeltonLock.

buildbot success in on tomcat-trunk

2018-03-06 Thread buildbot 
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/3105

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] 1825978
Blamelist: markt

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1825978 - /tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java

2018-03-06 Thread markt 
Author: markt
Date: Tue Mar  6 11:32:42 2018
New Revision: 1825978

URL: http://svn.apache.org/viewvc?rev=1825978=rev
Log:
SpotBugs
Correctly construct singleton in a thread-safe manner

Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java?rev=1825978=1825977=1825978=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java Tue Mar  
6 11:32:42 2018
@@ -28,7 +28,9 @@ import org.apache.juli.logging.LogFactor
  * @author the Catalina.java authors
  */
 public final class SecurityConfig{
-private static SecurityConfig singleton = null;
+
+private static final Object singeltonLock = new Object();
+private static volatile SecurityConfig singleton = null;
 
 private static final Log log = LogFactory.getLog(SecurityConfig.class);
 
@@ -83,8 +85,12 @@ public final class SecurityConfig{
  * @return an instance of that class.
  */
 public static SecurityConfig newInstance(){
-if (singleton == null){
-singleton = new SecurityConfig();
+if (singleton == null) {
+synchronized (singeltonLock) {
+if (singleton == null) {
+singleton = new SecurityConfig();
+}
+}
 }
 return singleton;
 }



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

Re: [VOTE] Release JK 1.2.43

2018-03-06 Thread Rainer Jung 

Am 01.03.2018 um 19:15 schrieb Mark Thomas:

Tag:
http://svn.apache.org/viewvc/tomcat/jk/tags/JK_1_2_43/


Source:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/jk/


This is a maintenance release with a handful of bug fixes. It also
includes Windows binaries for IIS.


The proposed JK 1.2.43 release is:
[ ] Broken - do not release
[X] Stable - go ahead and release as 1.2.43


+1 and thanks for RM!

Regards,

Rainer


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

svn commit: r1825960 - /tomcat/jk/trunk/xdocs/news/20180301.xml

2018-03-06 Thread rjung 
Author: rjung
Date: Tue Mar  6 08:36:34 2018
New Revision: 1825960

URL: http://svn.apache.org/viewvc?rev=1825960=rev
Log:
Fix year number copy error in HTML page title.

Modified:
tomcat/jk/trunk/xdocs/news/20180301.xml

Modified: tomcat/jk/trunk/xdocs/news/20180301.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20180301.xml?rev=1825960=1825959=1825960=diff
==
--- tomcat/jk/trunk/xdocs/news/20180301.xml (original)
+++ tomcat/jk/trunk/xdocs/news/20180301.xml Tue Mar  6 08:36:34 2018
@@ -24,7 +24,7 @@
 
   
 Apache Tomcat Connectors 
Project
-2016 News  Status
+2018 News  Status
   
 
 



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