解决冲突
Merge branch 'master' of https://github.com/yinchuandong/curl
暨南大学--》有问题