make it compatiable with nginx-1.7.3
update test cases
Merge commit 'origin/master'