s/http-server: fix cleanup routines Fixes: bdd71f18 ("s/http-server: graceful cleanup") (cherry picked from commit afdccee9b3648a76e119fb4d5f922191cd09d748)