Add null body handling for content headers

Author: Matt Mason

src/WebJobs.Script/Binding/HttpBinding.cs

@@ -289,57 +289,63 @@ internal static void AddResponseHeader(HttpResponseMessage response, KeyValuePai
                     // content header collection
                     case "content-type":
                         MediaTypeHeaderValue mediaType = null;
-                        if (MediaTypeHeaderValue.TryParse(header.Value.ToString(), out mediaType))
+                        if (response.Content != null && MediaTypeHeaderValue.TryParse(header.Value.ToString(), out mediaType))
                         {
                             response.Content.Headers.ContentType = mediaType;
                         }
                         break;
                     case "content-length":
                         long contentLength;
-                        if (long.TryParse(header.Value.ToString(), out contentLength))
+                        if (response.Content != null && long.TryParse(header.Value.ToString(), out contentLength))
                         {
                             response.Content.Headers.ContentLength = contentLength;
                         }
                         break;
                     case "content-disposition":
                         ContentDispositionHeaderValue contentDisposition = null;
-                        if (ContentDispositionHeaderValue.TryParse(header.Value.ToString(), out contentDisposition))
+                        if (response.Content != null && ContentDispositionHeaderValue.TryParse(header.Value.ToString(), out contentDisposition))
                         {
                             response.Content.Headers.ContentDisposition = contentDisposition;
                         }
                         break;
                     case "content-encoding":
                     case "content-language":
                     case "content-range":
-                        response.Content.Headers.Add(header.Key, header.Value.ToString());
+                        if (response.Content != null)
+                        {
+                            response.Content.Headers.Add(header.Key, header.Value.ToString());
+                        }
                         break;
                     case "content-location":
                         Uri uri;
-                        if (Uri.TryCreate(header.Value.ToString(), UriKind.Absolute, out uri))
+                        if (response.Content != null && Uri.TryCreate(header.Value.ToString(), UriKind.Absolute, out uri))
                         {
                             response.Content.Headers.ContentLocation = uri;
                         }
                         break;
                     case "content-md5":
                         byte[] value;
-                        if (header.Value is string)
-                        {
-                            value = Convert.FromBase64String((string)header.Value);
-                        }
-                        else
+                        if (response.Content != null)
                         {
-                            value = header.Value as byte[];
+                            if (header.Value is string)
+                            {
+                                value = Convert.FromBase64String((string)header.Value);
+                            }
+                            else
+                            {
+                                value = header.Value as byte[];
+                            }
+                            response.Content.Headers.ContentMD5 = value;
                         }
-                        response.Content.Headers.ContentMD5 = value;
                         break;
                     case "expires":
-                        if (DateTimeOffset.TryParse(header.Value.ToString(), out dateTimeOffset))
+                        if (response.Content != null && DateTimeOffset.TryParse(header.Value.ToString(), out dateTimeOffset))
                         {
                             response.Content.Headers.Expires = dateTimeOffset;
                         }
                         break;
                     case "last-modified":
-                        if (DateTimeOffset.TryParse(header.Value.ToString(), out dateTimeOffset))
+                        if (response.Content != null && DateTimeOffset.TryParse(header.Value.ToString(), out dateTimeOffset))
                         {
                             response.Content.Headers.LastModified = dateTimeOffset;
                         }

test/WebJobs.Script.Tests.Integration/NodeEndToEndTests.cs

@@ -605,6 +605,27 @@ public async Task HttpTrigger_Scenarios_ResBinding()
             Assert.Equal("test", await response.Content.ReadAsAsync<string>());
         }
 
+        [Fact]
+        public async Task HttpTrigger_Scenarios_NullBody()
+        {
+            HttpRequestMessage request = new HttpRequestMessage
+            {
+                RequestUri = new Uri(string.Format("http://localhost/api/httptrigger-scenarios")),
+                Method = HttpMethod.Post,
+            };
+            request.SetConfiguration(new HttpConfiguration());
+            request.Headers.Add("scenario", "nullbody");
+            Dictionary<string, object> arguments = new Dictionary<string, object>
+            {
+                { "req", request }
+            };
+            await Fixture.Host.CallAsync("HttpTrigger-Scenarios", arguments);
+
+            HttpResponseMessage response = (HttpResponseMessage)request.Properties[ScriptConstants.AzureFunctionsHttpResponseKey];
+            Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
+            Assert.Null(response.Content);
+        }
+
         [Fact]
         public async Task HttpTrigger_Scenarios_ScalarReturn_InBody()
         {

test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTrigger-Scenarios/index.js

@@ -45,6 +45,10 @@ module.exports = function (context, req) {
             context.bindings.res = { status: 202, body: "test" };
             break;
 
+        case "nullbody":
+            context.res = { status: 204, body: null, headers: { 'content-type': 'application/json' } };
+            break;
+
         default:
             context.res = {
                 status: 400