@@ -60,11 +60,11 @@
 	OFHTTPClient *_client;
 	OFHTTPRequest *_request;
 	unsigned int _redirects;
 	bool _firstLine;
 	OFString *_version;
-	int _status;
+	short _status;
 	OFMutableDictionary OF_GENERIC(OFString *, OFString *) *_serverHeaders;
 }
 
 - (instancetype)initWithClient: (OFHTTPClient *)client
 		       request: (OFHTTPRequest *)request
@@ -239,11 +239,11 @@
 		str++;
 	}
 }
 
 static bool
-defaultShouldFollow(of_http_request_method_t method, int statusCode)
+defaultShouldFollow(of_http_request_method_t method, short statusCode)
 {
 	bool follow;
 
 	/*
 	 * 301, 302 and 307 should only redirect with user confirmation if the
@@ -469,11 +469,11 @@
 	status = [line substringWithRange: of_range(9, 3)].longLongValue;
 
 	if (status < 0 || status > 599)
 		@throw [OFInvalidServerReplyException exception];
 
-	_status = (int)status;
+	_status = (short)status;
 
 	return true;
 }
 
 - (bool)handleServerHeader: (OFString *)line
@@ -1180,11 +1180,11 @@
 			     request: request];
 }
 
 -      (void)client: (OFHTTPClient *)client
   didReceiveHeaders: (OFDictionary OF_GENERIC(OFString *, OFString *) *)headers
-	 statusCode: (int)statusCode
+	 statusCode: (short)statusCode
 	    request: (OFHTTPRequest *)request
 {
 	if ([_delegate respondsToSelector:
 	    @selector(client:didReceiveHeaders:statusCode:request:)])
 		[_delegate     client: client
@@ -1193,11 +1193,11 @@
 			      request: request];
 }
 
 -	  (bool)client: (OFHTTPClient *)client
   shouldFollowRedirect: (OFURL *)URL
-	    statusCode: (int)statusCode
+	    statusCode: (short)statusCode
 	       request: (OFHTTPRequest *)request
 	      response: (OFHTTPResponse *)response
 {
 	if ([_delegate respondsToSelector: @selector(client:
 	    shouldFollowRedirect:statusCode:request:response:)])