Merged revision 1631817 from tomcat/trunk:
Fix client subprotocol handling (pass protocol names from the annotation).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1632223 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1631818 from tomcat/trunk:
Use constant strings for header names.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1632224 13f79535-47bb-0310-9956-ffa450edef68
Remove the unnecessary registration of context.xml as a redeploy resource. 
The context.xml having an external docBase has already been registered as a redeploy resource at first.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1632229 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1631992 from tomcat/trunk:
Correct version of Java WebSocket mentioned in documentation
Followup to r1631839

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