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

Changes to fix issues pointed out by Fred and RFM

Browse source
This commit is contained in:
Gregory John Casamento 2020-04-01 10:08:44 -04:00
parent bc614d4bd8
commit fd354f4167
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/NSURL.m
View file

@ -72,8 +72,7 @@ function may be incorrect
NSRange _rangeOfQuery; \
NSRange _rangeOfQueryItems; \
NSRange _rangeOfScheme; \
NSRange _rangeOfUser; \
BOOL _update;
NSRange _rangeOfUser;
#import "common.h"
#define EXPOSE_NSURL_IVARS 1
@ -2363,7 +2362,6 @@ GS_PRIVATE_INTERNAL(NSURLComponents)
internal->_rangeOfQuery = NSMakeRange(NSNotFound, 0);
internal->_rangeOfScheme = NSMakeRange(NSNotFound, 0);
internal->_rangeOfUser = NSMakeRange(NSNotFound, 0);
internal->_update = NO;
}
return self;
}
@ -2595,9 +2593,6 @@ GS_PRIVATE_INTERNAL(NSURLComponents)
- (void) setQuery: (NSString *)query
{
ASSIGNCOPY(internal->_query, query);
ASSIGNCOPY(internal->_percentEncodedQuery,
[query stringByAddingPercentEncodingWithAllowedCharacters:
[NSCharacterSet URLQueryAllowedCharacterSet]]);
if (query != nil)
{
NSMutableArray *result = [NSMutableArray arrayWithCapacity: 5];
@ -2632,7 +2627,7 @@ GS_PRIVATE_INTERNAL(NSURLComponents)
while ((item = (NSURLQueryItem *)[en nextObject]) != nil)
{
NSString *name = [item name];
NSString *value = [item value];
NSString *value = [[item value] _stringByAddingPercentEscapesForQuery];
NSString *itemString = [NSString stringWithFormat: @"%@=%@",name,value];
query = [query stringByAppendingString: itemString];
if (item != [queryItems lastObject])
@ -2642,6 +2637,7 @@ GS_PRIVATE_INTERNAL(NSURLComponents)
}
ASSIGNCOPY(internal->_query, query); // add query string...
ASSIGNCOPY(internal->_percentEncodedQuery, query);
ASSIGNCOPY(internal->_queryItems, queryItems);
}