Author: bodewig
Date: Sat Nov 16 06:45:43 2013
New Revision: 1542466
URL: http://svn.apache.org/r1542466
Log:
merge fix for LOG4NET-405 from trunk
Modified:
logging/log4net/branches/log4net-1.2.x/src/ (props changed)
logging/log4net/branches/log4net-1.2.x/src/Appender/SmtpAppender.cs
logging/log4net/branches/log4net-1.2.x/src/site/xdoc/release/release-notes.xml
Propchange: logging/log4net/branches/log4net-1.2.x/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Nov 16 06:45:43 2013
@@ -0,0 +1,4 @@
+/logging/log4net/branches/1.2.12/src:1511686-1520870
+/logging/log4net/tags/1.2.13RC1/src:1539445-1539920
+/logging/log4net/trunk/src:1539083
+/logging/log4net/trunk/src/log4net:1541408
Modified: logging/log4net/branches/log4net-1.2.x/src/Appender/SmtpAppender.cs
URL:
http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/Appender/SmtpAppender.cs?rev=1542466&r1=1542465&r2=1542466&view=diff
==============================================================================
--- logging/log4net/branches/log4net-1.2.x/src/Appender/SmtpAppender.cs
(original)
+++ logging/log4net/branches/log4net-1.2.x/src/Appender/SmtpAppender.cs Sat Nov
16 06:45:43 2013
@@ -591,8 +591,8 @@ namespace log4net.Appender
private string m_from;
private string m_subject;
private string m_smtpHost;
- private Encoding m_subjectEncoding = Encoding.Default;
- private Encoding m_bodyEncoding = Encoding.Default;
+ private Encoding m_subjectEncoding = Encoding.UTF8;
+ private Encoding m_bodyEncoding = Encoding.UTF8;
// authentication fields
private SmtpAuthentication m_authentication =
SmtpAuthentication.None;
Modified:
logging/log4net/branches/log4net-1.2.x/src/site/xdoc/release/release-notes.xml
URL:
http://svn.apache.org/viewvc/logging/log4net/branches/log4net-1.2.x/src/site/xdoc/release/release-notes.xml?rev=1542466&r1=1542465&r2=1542466&view=diff
==============================================================================
---
logging/log4net/branches/log4net-1.2.x/src/site/xdoc/release/release-notes.xml
(original)
+++
logging/log4net/branches/log4net-1.2.x/src/site/xdoc/release/release-notes.xml
Sat Nov 16 06:45:43 2013
@@ -38,6 +38,10 @@ limitations under the License.
</li>
<li>[<a
href='https://issues.apache.org/jira/browse/LOG4NET-399'>LOG4NET-399</a>] -
Does not build for Compact Framework 2.0
</li>
+ <li>[<a
href='https://issues.apache.org/jira/browse/LOG4NET-404'>LOG4NET-404</a>] -
assemblies for .NET 3.5 are missing ILogExtensions
+ </li>
+ <li>[<a
href='https://issues.apache.org/jira/browse/LOG4NET-405'>LOG4NET-405</a>] -
SmtpAppender encoding changes
+ </li>
</ul>
</section>
