Fixes issue #3891

[am0d]

There should be just one commit in here - if not, I'll try to fix that, but I can't really work out how to get rid of all the extra ones.

[am0d]

Argh! Can someone give me a tip on how to git rid of all the extra commits? I read the manuals for git, but it didn't make any sense to me.

[brson]

Thanks!

git rebase mozilla/incoming should eliminate all those merges. When you push again you will have to do push -f because rebasing will change your history. In general I suggest resisting the urge to repeatedly merge from master while working on a development branch, because it results in this kind of noisy history. I typically do the work based off of a single upstream revision and submit the pull request without any merges.

Can you add a test for this? I realize the tests for this module are difficult, using a bunch of conditional compilation, but it's important. Note that every network test needs to use a different port number (or else they will fail randomly by failing to bind the port) and the ones in use aren't obvious.

I see whitespace at the end of lines in this patch which will cause 'make check' to fail.

[am0d]

Thanks @brson for the suggestions.
I can add a test for some of it, but not for the crash, since that could only be triggered by running with debug level logging on the module. I'll get a test written today and push that up with it.

[am0d]

@brson I've fixed the whitespace issues now, and also added a test for the change. I couldn't write a test for the crash, which would only occur with debug level logging turned on - I hope that this is okay though.

[brson]

@am0d that's great! thank you.