Skip to content

Handle IPv6 host in Request Headers #522

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

Open
madlymad wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Handle IPv6 host in Request Headers #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed70f90
Handle IPv6 host in Request Headers
madlymad Jul 6, 2017
17e89d9
Missed the port url check
madlymad Jul 6, 2017
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
6 changes: 5 additions & 1 deletion SocketRocket/Internal/Utilities/SRHTTPConnectMessage.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
{
NSString *host = url.host;
if (url.port) {
host = [host stringByAppendingFormat:@":%@", url.port];
if ([host containsString:@":"]) {
host = [NSString stringWithFormat:@"[%@]:%@", host, url.port];
} else {
host = [host stringByAppendingFormat:@":%@", url.port];
}
}
return host;
}
Expand Down
8 changes: 7 additions & 1 deletion SocketRocket/Internal/Utilities/SRURLUtilities.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@
} else if ([scheme isEqualToString:@"ws"]) {
scheme = @"http";
}
[origin appendFormat:@"%@://%@", scheme, url.host];

NSString * host = url.host;
if ([host containsString:@":"]) {
host = [NSString stringWithFormat:@"[%@]", host];
}

[origin appendFormat:@"%@://%@", scheme, host];

NSNumber *port = url.port;
BOOL portIsDefault = (!port ||
Expand Down