merge from 3.2.  Minor code style improvements in http.server suggested in Issue13294.