[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[jetty-commit] [Git@Eclipse] Jetty: primary project repository branch jetty-9 updated. jetty-8.1.5.v20120716-627-g57f16d7

The branch, jetty-9 has been updated
       via  57f16d750d0120d02d9d60828c71daaaf4d83a3f (commit)
       via  9b49e889dd6de60a8d96ae2b98ecd96b8833e216 (commit)
       via  000657ddb52a8432743453749ce366796355974e (commit)
       via  01c40b529087f20110116c23772fee735cd30987 (commit)
      from  8d0ad9f3b006639358834690078ad634ebfb9150 (commit)


- Log -----------------------------------------------------------------
commit 57f16d750d0120d02d9d60828c71daaaf4d83a3f
Merge: 9b49e88 8d0ad9f
Author: Joakim Erdfelt <joakim.erdfelt@xxxxxxxxx>
Date:   Thu Aug 2 15:25:33 2012 -0700

    Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9

commit 9b49e889dd6de60a8d96ae2b98ecd96b8833e216
Author: Joakim Erdfelt <joakim.erdfelt@xxxxxxxxx>
Date:   Thu Aug 2 15:25:18 2012 -0700

    Fixing big buffer flush issue (thanks simone)

commit 000657ddb52a8432743453749ce366796355974e
Author: Joakim Erdfelt <joakim.erdfelt@xxxxxxxxx>
Date:   Thu Aug 2 13:02:54 2012 -0700

    Fixing various Parser bugs identified by test cases
    
    + Mask bytes were read backwards during slow parse
    + Bad continuation frame detection added
    + Bad fragmented data frame detection added
    + Correcting WebSocketFrame copy constructor and FIN bit

commit 01c40b529087f20110116c23772fee735cd30987
Author: Joakim Erdfelt <joakim.erdfelt@xxxxxxxxx>
Date:   Thu Aug 2 10:31:37 2012 -0700

    Fixing Parsing of masking bytes on slow testcase (would read in reverse order under certain conditions)

-----------------------------------------------------------------------

Summary of changes:
 .../java/org/eclipse/jetty/util/BufferUtil.java    |    2 +-
 .../extensions/fragment/FragmentExtension.java     |    2 +-
 .../jetty/websocket/io/ControlFrameBytes.java      |    6 +-
 .../org/eclipse/jetty/websocket/io/FrameBytes.java |    2 +-
 .../websocket/io/WebSocketAsyncConnection.java     |    9 +-
 .../eclipse/jetty/websocket/protocol/Parser.java   |   51 ++++++--
 .../jetty/websocket/protocol/WebSocketFrame.java   |    3 +-
 .../extensions/DeflateFrameExtensionTest.java      |    2 +-
 .../extensions/FragmentExtensionTest.java          |    2 +-
 .../jetty/websocket/protocol/GeneratorTest.java    |   39 +-----
 .../jetty/websocket/protocol/ParserTest.java       |  138 +++++++++++++++++++-
 .../jetty/websocket/protocol/UnitGenerator.java    |   35 +++++
 .../jetty/websocket/protocol/UnitParser.java       |   29 ++++
 .../src/test/resources/jetty-logging.properties    |    3 +-
 .../websocket/server/DeflateExtensionTest.java     |    2 +-
 .../websocket/server/WebSocketServletRFCTest.java  |    2 +
 .../jetty/websocket/server/ab/TestABCase1.java     |    7 -
 .../jetty/websocket/server/ab/TestABCase5.java     |    5 +-
 .../jetty/websocket/server/ab/TestABCase6.java     |   60 ++++-----
 .../src/test/resources/jetty-logging.properties    |    3 +
 20 files changed, 292 insertions(+), 110 deletions(-)
 create mode 100644 jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/protocol/UnitParser.java


hooks/post-receive
-- 
Jetty: primary project repository