This repository has been archived by the owner on Apr 24, 2020. It is now read-only.
Resolve merge conflict for x-webkit-deflate-frame #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix a typo in the error message if the user attempts to compile with project without ARC.
…-only-active-arch-for-debug Fix only building active arch in debug.
…rnings Kill Xcode 5.1 warnings
SocketRocket uses the invalid close code -1 as the value in the default close method. In addition to being invalid, it causes issues when communicating with some libraries. See section 11.7 WebSocket Close Code Number Registry in the WebSocket Protocol RFC 6455 for more detail.
[Master] Use Apple's provided base64 implementation.
…onversion-warnings Fix size conversion warnings. Reviewed by @firestone.
…ith key ‘HTTPResponseStatusCode’ in the NSError userInfo dictionary on status codes of >= 400, gives you the ability to see why a connection fails such as a 401 authentication failure
…arnings Fix Xcode 5.1 project warnings.
Update README URLs based on HTTP redirects
…uting Add Contributing.md
…uild - Fix OS X build by checking if OS is iOS 9 only on iOS target OSs.
Respect timeouts set on `NSURLRequest`s passed at init fix facebookincubator#70
Fixed connecting limbo
Make SocketRocket usable as a module from within Swift, especially on OS X
Update close status codes based on spec.
Correct the capitalization of Xcode in README
Issue facebookincubator#156: Prevents crash in handleEvent method
Add tvos as deployment target
frameData is copied before passing to handlers
…onvert NSData to NSString for TEXT messages. This is an optimization for when the server is sending text serialized as JSON. In this case we would turn the string back into NSData before passing it to NSJSONSerialization, which removes 2 data <--> string conversions.
Message handling optimization
# Conflicts: # SocketRocket/SRWebSocket.m
- Created during this merge commit: 3b4da5d - Resolves merge conflict on an open Pull Request (facebookincubator#107)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This Pull Requests was made to resolve merge conflicts so that the following PR into Square's repository can be made: facebookincubator#107. The merge was very clean, with only two conflicts that were very simple to resolve.
There were two merge conflicts, both within
SRWebSocket.m.deallocmethod a new commit caused by the line that addsinflateEnd(&_inflator);to have a conflict with this commit in master: facebookincubator@018abc7