Allow harmless 'Content-Type' headers on requests

swisspol · swisspol · commit 9524d31b1b9c · 2015-05-04T09:59:03.000-07:00
diff --git a/GCDWebServer/Core/GCDWebServerRequest.m b/GCDWebServer/Core/GCDWebServerRequest.m
@@ -186,6 +186,7 @@ - (instancetype)initWithMethod:(NSString*)method url:(NSURL*)url headers:(NSDict
     if (lengthHeader) {
       NSInteger length = [lengthHeader integerValue];
       if (_chunked || (length < 0)) {
+        GWS_LOG_WARNING(@"Invalid 'Content-Length' header '%@' for '%@' request on \"%@\"", lengthHeader, _method, _url);
         GWS_DNOT_REACHED();
         return nil;
       }
@@ -200,8 +201,8 @@ - (instancetype)initWithMethod:(NSString*)method url:(NSURL*)url headers:(NSDict
       _length = NSUIntegerMax;
     } else {
       if (_type) {
-        GWS_DNOT_REACHED();
-        return nil;
+        GWS_LOG_WARNING(@"Ignoring 'Content-Type' header for '%@' request on \"%@\"", _method, _url);
+        _type = nil;  // Content-Type without Content-Length or chunked-encoding doesn't make sense
       }
       _length = NSUIntegerMax;
     }

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,7 @@ - (instancetype)initWithMethod:(NSString)method url:(NSURL)url headers:(NSDict`
`186`	`186`	`if (lengthHeader) {`
`187`	`187`	`NSInteger length = [lengthHeader integerValue];`
`188`	`188`	`if (_chunked \|\| (length < 0)) {`
	`189`	`+ GWS_LOG_WARNING(@"Invalid 'Content-Length' header '%@' for '%@' request on \"%@\"", lengthHeader, _method, _url);`
`189`	`190`	`GWS_DNOT_REACHED();`
`190`	`191`	`return nil;`
`191`	`192`	`}`
`@@ -200,8 +201,8 @@ - (instancetype)initWithMethod:(NSString)method url:(NSURL)url headers:(NSDict`
`200`	`201`	`_length = NSUIntegerMax;`
`201`	`202`	`} else {`
`202`	`203`	`if (_type) {`
`203`		`- GWS_DNOT_REACHED();`
`204`		`- return nil;`
	`204`	`+ GWS_LOG_WARNING(@"Ignoring 'Content-Type' header for '%@' request on \"%@\"", _method, _url);`
	`205`	`+ _type = nil; // Content-Type without Content-Length or chunked-encoding doesn't make sense`
`205`	`206`	`}`
`206`	`207`	`_length = NSUIntegerMax;`
`207`	`208`	`}`