I believe this addresses everything mentioned in the previous reviews
(sorry if I missed anything).  In addition I have extended
web-server.c to implement a fairly realistic test scenario.

Alexander: It would be useful if you could test this filter in your
code as well so we can be sure it really fixes your problem.

Rich.