fixed clobbered
Merge branch 'master' into dev
detect http_host name
using server_name instead of http_host
getenv stuff