Added 2 commits

Added a commit from foreign repo, smarthtt-localonly, and a commit
from here.

Signed-off-by: ghzyabin3 <senyorzyabin@bk.ru>