2014-09-25 0:06 GMT+04:00 <violet...@apache.org>: > Author: violetagg > Date: Wed Sep 24 20:06:01 2014 > New Revision: 1627409 > > URL: http://svn.apache.org/r1627409 > Log: > Merged revision 1626765 from tomcat/trunk: > Update WebSocket implementation to version 1.1 of the spec > > Modified: > tomcat/tc7.0.x/trunk/ (props changed) > tomcat/tc7.0.x/trunk/java/javax/websocket/Session.java > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/Util.java > tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsSession.java > tomcat/tc7.0.x/trunk/res/META-INF/websocket-api.jar.manifest > tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml > > Propchange: tomcat/tc7.0.x/trunk/ > ------------------------------------------------------------------------------ > Merged /tomcat/trunk:r1626765
> Modified: tomcat/tc7.0.x/trunk/res/META-INF/websocket-api.jar.manifest > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/META-INF/websocket-api.jar.manifest?rev=1627409&r1=1627408&r2=1627409&view=diff > ============================================================================== > --- tomcat/tc7.0.x/trunk/res/META-INF/websocket-api.jar.manifest (original) > +++ tomcat/tc7.0.x/trunk/res/META-INF/websocket-api.jar.manifest Wed Sep 24 > 20:06:01 2014 > @@ -4,8 +4,8 @@ X-Compile-Target-JDK: @target.jdk@ > > Name: javax/el/ There have been two commits just before r1626765 that fixed typos in manifest files. For example, the above line in this manifest file is wrong. > Specification-Title: WebSocket > -Specification-Version: 1.0 > +Specification-Version: 1.1 > Specification-Vendor: Oracle, Inc. > Implementation-Title: javax.net.websocket > -Implementation-Version: 1.0.@websocket.revision@ > +Implementation-Version: 1.1.@websocket.revision@ > Implementation-Vendor: Apache Software Foundation > > Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml > URL: > http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1627409&r1=1627408&r2=1627409&view=diff > ============================================================================== > --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) > +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Sep 24 20:06:01 2014 > @@ -276,6 +276,10 @@ > <bug>56982</bug>: Return the actual negotiated extensions rather > than an > empty list for <code>Session.getNegotiatedExtensions()</code>. > (markt) > </fix> > + <update> > + Update the WebSocket implementation to support the Java WebSocket > + specification version 1.1. (markt) > + </update> > </changelog> > </subsection> > <subsection name="Web applications"> > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
