Added combine_url functiion and combine_url_basic.phpt
Merge branch 'master' into php-src-url