gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Build the string instead of the URL.

Browse source 
Build the URL on the fly.
This commit is contained in:
fredkiefer 2020-04-04 20:33:55 +02:00
parent bc0be86d46
commit b0c763de36
2 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Source/NSURL.m
View file

@ -45,7 +45,7 @@ function may be incorrect
NSString *_value;
#define GS_NSURLComponents_IVARS \
NSURL *_url; \
NSString *_string; \
NSString *_fragment; \
NSString *_host; \
NSString *_password; \
@ -2386,7 +2386,7 @@ GS_PRIVATE_INTERNAL(NSURLComponents)
- (void) dealloc
{
RELEASE(internal->_url);
RELEASE(internal->_string);
RELEASE(internal->_fragment);
RELEASE(internal->_host);
RELEASE(internal->_password);
@ -2408,7 +2408,6 @@ GS_PRIVATE_INTERNAL(NSURLComponents)
// Regenerate URL when components are changed...
- (void) _regenerateURL
{
NSURL *u;
NSMutableString *urlString;
NSString *component;
NSUInteger location;
@ -2518,27 +2517,16 @@ GS_PRIVATE_INTERNAL(NSURLComponents)
location += len;
}
u = [[NSURL alloc] initWithScheme: [self scheme]
user: [self user]
password: [self password]
host: [self host]
port: [self port]
fullPath: [self path]
parameterString: nil
query: [self percentEncodedQuery]
fragment: [self fragment]];
ASSIGNCOPY(internal->_url, u);
RELEASE(u);
// ASSIGNCOPY(internal->_url, [NSURL URLWithString: urlString]);
internal->_dirty = NO;
ASSIGNCOPY(internal->_string, urlString);
RELEASE(urlString);
internal->_dirty = NO;
}
// Getting the URL
- (NSString *) string
{
return [[self URL] absoluteString];
[self _regenerateURL];
return internal->_string;
}
- (void) setString: (NSString *)urlString
@ -2549,8 +2537,15 @@ GS_PRIVATE_INTERNAL(NSURLComponents)
- (NSURL *) URL
{
[self _regenerateURL];
return internal->_url;
return AUTORELEASE([[NSURL alloc] initWithScheme: [self scheme]
user: [self user]
password: [self password]
host: [self host]
port: [self port]
fullPath: [self path]
parameterString: nil
query: [self percentEncodedQuery]
fragment: [self fragment]]);
}
- (void) setURL: (NSURL *)url

4
Tests/base/NSURL/components.m
View file

@ -17,10 +17,8 @@ int main()
[NSURLQueryItem queryItemWithName:@"uri" value:[[NSURL URLWithString:@"https://some.url.com/path?param1=one&param2=two"] absoluteString]], nil]];
// URL
PASS([[components string] isEqualToString:
@"https://user:password@some.host.com/?lang=en&response_type=code&uri=https://some.url.com/path?param1%3Done%26param2%3Dtwo"],
@"https://user:password@some.host.com?lang=en&response_type=code&uri=https://some.url.com/path?param1%3Done%26param2%3Dtwo"],
"URL string is correct");
// NOTE: The slash behind the .com is strictly legal, but this is NOT what is produced by macOS. I would like to correct this in a
// future release.
// encoded...
PASS([[components percentEncodedQuery] isEqualToString: