Merged revision(s) 1532437 from tomcat/trunk:
- Do not use a extra Thread for the room as synchronizing access to the Room's internals should suffice.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1532441 13f79535-47bb-0310-9956-ffa450edef68
Add xhtml file extension to list of text file types

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