Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make copying optional when receiving data #428

Merged
merged 10 commits into from
Oct 31, 2016
Merged

Make copying optional when receiving data #428

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8539cf9
Reduce memory usage
michaelmorton Sep 24, 2015
912a417
Delegate methods expect `self`
erikprice Apr 26, 2016
8d76c66
Add `-sendWithoutCopyingData:error:`
erikprice Jun 27, 2016
7b6e366
Add `-webSocket:shouldCopyReceivedData:`
erikprice Jun 27, 2016
a7c035b
Fix error messages
erikprice Jun 28, 2016
8a2ce54
Remove `-webSocket:shouldCopyReceivedData:`
erikprice Jun 28, 2016
30a9a95
Revert "Fix error messages"
erikprice Jun 28, 2016
8057c63
Fix typo
erikprice Jun 28, 2016
f9b63d0
Copy only control frames
erikprice Jun 28, 2016
e95367b
Fix error message
erikprice Jun 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions SocketRocket/SRWebSocket.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,19 +791,19 @@ - (void)closeConnection;

- (void)_handleFrameWithData:(NSData *)frameData opCode:(NSInteger)opcode;
{
//frameData will be copied before passing to handlers
//otherwise there can be misbehaviours when value at the pointer is changed
frameData = [frameData copy];

// Check that the current data is valid UTF8

BOOL isControlFrame = (opcode == SROpCodePing || opcode == SROpCodePong || opcode == SROpCodeConnectionClose);
if (!isControlFrame) {
[self _readFrameNew];
} else {
if (isControlFrame) {
//frameData will be copied before passing to handlers
//otherwise there can be misbehaviours when value at the pointer is changed
frameData = [frameData copy];

dispatch_async(_workQueue, ^{
[self _readFrameContinue];
});
} else {
[self _readFrameNew];
}

switch (opcode) {
Expand Down