Skip to content
This repository was archived by the owner on May 14, 2024. It is now read-only.

[FIX] URL Encode params handshake #214

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion SocketIO.m
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,25 @@ - (void) connectToHost:(NSString *)host
// create a query parameters string
NSMutableString *query = [[NSMutableString alloc] initWithString:@""];
[params enumerateKeysAndObjectsUsingBlock: ^(id key, id value, BOOL *stop) {
[query appendFormat:@"&%@=%@", key, value];
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_7_0
NSCharacterSet *allowedCharacters = [[NSCharacterSet characterSetWithCharactersInString:@"!*'();:@&=+$,/?%#[]\" "] invertedSet];

NSString *keyString = [[NSString stringWithFormat:@"%@", key] stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacters];
NSString *valueString = [[NSString stringWithFormat:@"%@", value] stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacters];
#else
NSString *keyString = CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(NULL,
(__bridge CFStringRef) [NSString stringWithFormat:@"%@", key],
NULL,
CFSTR("!*'();:@&=+$,/?%#[]\" "),
kCFStringEncodingUTF8));
NSString *valueString = CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(NULL,
(__bridge CFStringRef) [NSString stringWithFormat:@"%@", value],
NULL,
CFSTR("!*'();:@&=+$,/?%#[]\" "),
kCFStringEncodingUTF8));
#endif

[query appendFormat:@"&%@=%@", keyString, valueString];
}];

// do handshake via HTTP request
Expand Down