Fixing bugs after changing http-server API
Autocommit Tue Aug 05 11:37:06 EST 2014