Add changelog entry for r1539177
This change was in 7.0.48.
https://issues.apache.org/bugzilla/show_bug.cgi?id=55735

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1563532 13f79535-47bb-0310-9956-ffa450edef68
Consistent text in rtext

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1563818 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1563989 from tomcat/trunk: Fix typo.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1563990 13f79535-47bb-0310-9956-ffa450edef68
Merged revisions r1564309, r1564312 from tomcat/trunk:
Fix javadoc markup (reviewing r1561778, r1561773).
Do not include unrelated text into the value of @version, @param.
Fix typo and unclosed <b> tag

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1564317 13f79535-47bb-0310-9956-ffa450edef68
Merged r1564398 from tomcat/trunk:
Move class Javadoc to the correct place

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1564399 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56096
Merged revisions 1564299, 1564414 from tomcat/trunk:
When creating JMXConnectorServer use the correct rmiBindAddress. Patch provided by Jim Talbut.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1564417 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1564461 from tomcat/trunk:
According to JavaEE specification (EE.5.4.1.3) when an env entry is specified in the web deployment descriptor and with annotation then the definition in the web deployment descriptor is with priority.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1564660 13f79535-47bb-0310-9956-ffa450edef68
Merged revisions r1562597,r1564742-r1564746 from tomcat/trunk:
Make the xmlBlockExternal option in Catalina and Jasper to be true by default.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1564747 13f79535-47bb-0310-9956-ffa450edef68
Fix CVE-2014-0050 DoS with malformed Content-Type header and multipart request processing.
Update to latest code (r1565163) from Commons FileUpload

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1565169 13f79535-47bb-0310-9956-ffa450edef68
Merged revisions r1565300-r1565416 from tomcat/trunk:
Improve handling of file upload errors. Display a message instead of error 500 page.
Simplify parts handling code, as it is known that Tomcat takes care of them when recycling a request.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1565419 13f79535-47bb-0310-9956-ffa450edef68
Merged revisions r1562458, r1565451 from tomcat/trunk:
Provide more info if test fails in access log valve check.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1565458 13f79535-47bb-0310-9956-ffa450edef68