Skip to content

Commit 84831f7

Browse files
committed
Fix double encoded issue in query.
1 parent ec08bfd commit 84831f7

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

STNetTaskQueue/STHTTPNetTaskQueueHandler.m

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,11 @@ - (NSString *)queryStringFromParameters:(NSDictionary *)parameters
291291
[parameters enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) {
292292
if ([value isKindOfClass:[NSArray class]]) {
293293
for (id element in value) {
294-
[self appendToQueryString:queryString withKey:key value:[element description]];
294+
[self appendKeyValueToString:queryString withKey:key value:[element description]];
295295
}
296296
}
297297
else {
298-
[self appendToQueryString:queryString withKey:key value:[value description]];
298+
[self appendKeyValueToString:queryString withKey:key value:[value description]];
299299
}
300300
}];
301301
[queryString deleteCharactersInRange:NSMakeRange(queryString.length - 1, 1)];
@@ -323,11 +323,11 @@ - (NSData *)bodyDataFromParameters:(NSDictionary *)parameters requestType:(STHTT
323323
[parameters enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) {
324324
if ([value isKindOfClass:[NSArray class]]) {
325325
for (id element in value) {
326-
[self appendToBodyString:bodyString withKey:key value:[element description]];
326+
[self appendKeyValueToString:bodyString withKey:key value:[element description]];
327327
}
328328
}
329329
else {
330-
[self appendToBodyString:bodyString withKey:key value:[value description]];
330+
[self appendKeyValueToString:bodyString withKey:key value:[value description]];
331331
}
332332
}];
333333
[bodyString deleteCharactersInRange:NSMakeRange(bodyString.length - 1, 1)];
@@ -367,15 +367,9 @@ - (NSData *)formDataFromParameters:(NSDictionary *)parameters datas:(NSDictionar
367367
return formData;
368368
}
369369

370-
- (void)appendToQueryString:(NSMutableString *)queryString withKey:(NSString *)key value:(NSString *)value
370+
- (void)appendKeyValueToString:(NSMutableString *)string withKey:(NSString *)key value:(NSString *)value
371371
{
372-
value = [value stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
373-
[queryString appendFormat:@"%@=%@&", key, value];
374-
}
375-
376-
- (void)appendToBodyString:(NSMutableString *)bodyString withKey:(NSString *)key value:(NSString *)value
377-
{
378-
[bodyString appendFormat:@"%@=%@&", key, value];
372+
[string appendFormat:@"%@=%@&", key, value];
379373
}
380374

381375
- (void)appendToFormData:(NSMutableData *)formData withKey:(NSString *)key value:(NSString *)value

0 commit comments

Comments
 (0)