修复nginx https bug
Merge branch 'master' into brahma