Index: src/OFHTTPRequest.m
==================================================================
--- src/OFHTTPRequest.m
+++ src/OFHTTPRequest.m
@@ -34,10 +34,11 @@
 #import "OFInvalidFormatException.h"
 #import "OFInvalidServerReplyException.h"
 #import "OFOutOfRangeException.h"
 #import "OFTruncatedDataException.h"
 #import "OFUnsupportedProtocolException.h"
+#import "OFUnsupportedVersionException.h"
 
 #import "macros.h"
 
 Class of_http_request_tls_socket_class = Nil;
 
@@ -188,11 +189,11 @@
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFString *scheme = [URL scheme];
 	OFTCPSocket *sock;
 	OFHTTPRequestResult *result;
-	OFString *line, *path;
+	OFString *line, *path, *version;
 	OFMutableDictionary *serverHeaders;
 	OFDataArray *data;
 	OFEnumerator *keyEnumerator, *objectEnumerator;
 	OFString *key, *object, *contentLengthHeader;
 	int status;
@@ -285,13 +286,19 @@
 	} @catch (OFInvalidEncodingException *e) {
 		@throw [OFInvalidServerReplyException
 		    exceptionWithClass: [self class]];
 	}
 
-	if (![line hasPrefix: @"HTTP/1.0 "] && ![line hasPrefix: @"HTTP/1.1 "])
+	if (![line hasPrefix: @"HTTP/"] || [line characterAtIndex: 8] != ' ')
 		@throw [OFInvalidServerReplyException
 		    exceptionWithClass: [self class]];
+
+	version = [line substringWithRange: of_range(5, 3)];
+	if (![version isEqual: @"1.0"] && ![version isEqual: @"1.1"])
+		@throw [OFUnsupportedVersionException
+		    exceptionWithClass: [self class]
+			       version: version];
 
 	status = (int)[[line substringWithRange: of_range(9, 3)] decimalValue];
 
 	serverHeaders = [OFMutableDictionary dictionary];