Really commit server.c bits of 2010-08-09's change...