Author: violetagg
Date: Wed Apr 27 06:01:48 2016
New Revision: 1741148
URL: http://svn.apache.org/viewvc?rev=1741148&view=rev
Log:
Merged revision 1741147 from tomcat/trunk:
Fix typos
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 27 06:01:48 2016
@@ -1 +1 @@
-/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,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,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
+/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,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,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
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1741148&r1=1741147&r2=1741148&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Apr 27 06:01:48 2016
@@ -139,7 +139,7 @@
</add>
<fix>
<bug>59284</bug>: Allow the Tomcat provided JASPIC
- <code>SimpleServerAuthConfig</code> to pick up module confiuration
+ <code>SimpleServerAuthConfig</code> to pick up module configuration
properties from either the property set passed to its constructor or
from the properties passed in the call to <code>getAuthContext</code>.
Based on a patch by Thomas Maslen. (markt)
@@ -194,8 +194,8 @@
situations. (remm)
</fix>
<fix>
- <bug>59295</bug>: Use <code>Locale.toLangaugeTag()</code> to construct
- the <code>Content-Langauge</code> HTTP header to ensure the locale is
+ <bug>59295</bug>: Use <code>Locale.toLanguageTag()</code> to construct
+ the <code>Content-Language</code> HTTP header to ensure the locale is
correctly represented. Patch provided by zikfat. (markt)
</fix>
<update>
@@ -205,7 +205,7 @@
<fix>
Make the TLS certificate chain available to clients when using
JSSE+OpenSSL with the certificate chain stored in a Java KeyStore.
- (markt)
+ (markt)
</fix>
</changelog>
</subsection>
@@ -225,7 +225,7 @@
<fix>
Fix a regression caused by the connector refactoring and ensure that
the
thread context class loader is set to the to the web application
- classloder when processing WebSocket messages on the server. (markt)
+ classloader when processing WebSocket messages on the server. (markt)
</fix>
<fix>
Ensure that a client disconnection triggers the error handling for the
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
