Merge branch 'http_uri_parse'

diff --cc http.c
Simple merge

diff --cc include/event2/http.h
Simple merge

diff --cc test/regress_http.c
Simple merge