Skip to content

Commit 86d52d1

Browse files
committed
Setting custom headers right before creating session task, to make sure all headers can be overwritten.
1 parent 65ba170 commit 86d52d1

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

STNetTaskQueue/STHTTPNetTaskQueueHandler.m

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ - (void)start
121121
NSMutableURLRequest *request = [NSMutableURLRequest new];
122122
request.HTTPMethod = STHTTPNetTaskMethodMap[@(_task.method)];
123123

124-
for (NSString *headerField in headers) {
125-
[request setValue:headers[headerField] forHTTPHeaderField:headerField];
126-
}
127-
128124
if (_baseURL.user.length || _baseURL.password.length) {
129125
NSString *credentials = [NSString stringWithFormat:@"%@:%@", _baseURL.user, _baseURL.password];
130126
[request setValue:[NSString stringWithFormat:@"Basic %@", STBase64String(credentials)] forHTTPHeaderField:@"Authorization"];
@@ -140,7 +136,6 @@ - (void)start
140136
urlComponents.query = [self queryStringFromParameters:parameters];
141137
}
142138
request.URL = urlComponents.URL;
143-
sessionTask = [_session dataTaskWithRequest:request];
144139
}
145140
break;
146141
case STHTTPNetTaskPost:
@@ -157,7 +152,6 @@ - (void)start
157152
NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@", STHTTPNetTaskFormDataBoundary];
158153
[request setValue:contentType forHTTPHeaderField: @"Content-Type"];
159154
}
160-
sessionTask = [_session dataTaskWithRequest:request];
161155
}
162156
break;
163157
default: {
@@ -166,6 +160,11 @@ - (void)start
166160
break;
167161
}
168162

163+
for (NSString *headerField in headers) {
164+
[request setValue:headers[headerField] forHTTPHeaderField:headerField];
165+
}
166+
sessionTask = [_session dataTaskWithRequest:request];
167+
169168
[STHTTPNetTaskToSessionTask setObject:sessionTask forKey:_task];
170169

171170
sessionTask.operation = self;

0 commit comments

Comments
 (0)