fix #131: correct handling of empty http request headers

Author: tjanczuk

Diff for: src/iisnode/chttpprotocol.cpp

@@ -50,7 +50,7 @@ HRESULT CHttpProtocol::Append(IHttpContext* context, const char* content, DWORD
 {
 	HRESULT hr;
 
-	if (contentLength == 0)
+	if (contentLength == 0 && NULL != content)
 	{
 		contentLength = strlen(content);
 	}
@@ -75,8 +75,11 @@ HRESULT CHttpProtocol::Append(IHttpContext* context, const char* content, DWORD
 		*bufferLength = newBufferLength;
 	}
 
-	memcpy((char*)*buffer + *offset, content, contentLength);
-	*offset += contentLength;
+	if (contentLength > 0)
+	{
+		memcpy((char*)*buffer + *offset, content, contentLength);
+		*offset += contentLength;
+	}
 
 	return S_OK;
 Error:

Diff for: test/functional/tests/115_customheaders.js

@@ -0,0 +1,11 @@
+/*
+Custom request and response headers are processed correctly
+*/
+
+var iisnodeassert = require("iisnodeassert");
+
+iisnodeassert.sequence([
+    iisnodeassert.post(10000, "/115_customheaders/hello.js", { headers: { 'x-foo': 'foobar'} }, 200, "Hello, world", { 'x-bar': 'foobar', 'x-got-foo': 'true' }),
+    iisnodeassert.post(2000, "/115_customheaders/hello.js", { headers: { 'x-foo': ''} }, 200, "Hello, world", { 'x-bar': '', 'x-got-foo': 'true' }),
+    iisnodeassert.post(2000, "/115_customheaders/hello.js", { headers: { 'x-foo': '', 'x-baz': 'foobar' } }, 200, "Hello, world", { 'x-bar': '', 'x-got-foo': 'true' })
+]);

Diff for: test/functional/tests/node_modules/iisnodeassert.js

@@ -0,0 +1,12 @@
+var http = require('http');
+
+http.createServer(function (req, res) {
+    console.log(JSON.stringify(req.headers));
+    res.setHeader('Content-Type', 'text/html');
+    if (req.headers.hasOwnProperty('x-foo')) {
+        res.setHeader('x-bar', req.headers['x-foo']);
+        res.setHeader('x-got-foo', 'true');
+    }
+    res.writeHead(200);
+    res.end('Hello, world');
+}).listen(process.env.PORT);  

Diff for: test/functional/www/115_customheaders/hello.js

@@ -0,0 +1,7 @@
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="iisnode" path="hello.js" verb="*" modules="iisnode" />
+    </handlers>
+  </system.webServer>
+</configuration>