Skip to content

Commit a93842b

Browse files
committed
Merge pull request TooTallNate#45 from Davidiusdadi/master
fixes for TooTallNate#43 TooTallNate#44
2 parents 7e47ee2 + 103f87f commit a93842b

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/net/tootallnate/websocket/drafts/Draft_10.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,11 @@ else if( payloadlength == 126 ){
113113
throw new RuntimeException ( "Payloadsize is to big..." );
114114
}
115115
}
116-
int maskskeystart = realpacketsize;
117-
int payloadstart = realpacketsize += ( MASK ? 4 : 0 );
116+
int maskskeystart = foff + realpacketsize;
117+
realpacketsize += ( MASK ? 4 : 0 );
118+
int payloadstart = foff + realpacketsize;
118119
realpacketsize += payloadlength;
120+
119121
if( maxpacketsize < realpacketsize )
120122
throw new IncompleteException( realpacketsize );
121123

src/net/tootallnate/websocket/drafts/Draft_76.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ public Handshakedata translateHandshake( byte[] buffer , int readcount ) throws
3232
return super.translateHandshake( buffer , readcount );
3333
}
3434

35-
public List<ByteBuffer> createHandshake( Handshakedata handshakedata , Role ownrole ){
36-
return createHandshake( handshakedata , ownrole , false );
37-
}
38-
3935
@Override
4036
public HandshakeState acceptHandshakeAsClient( Handshakedata request , Handshakedata response ) {
4137
if( failed ){

0 commit comments

Comments
 (0)