X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=1f94df95a317757f252acb79f417cfe69acdced2;hp=d915b3f832e2cda66de129102afd397686c9f4b7;hb=da1843cf6d0047c118dd052520c2fba230e7f10f;hpb=f3fefe49c3c19564bddacaebd5fecb6de231b988 diff --git a/http_functions.c b/http_functions.c index d915b3f..1f94df9 100644 --- a/http_functions.c +++ b/http_functions.c @@ -56,13 +56,13 @@ PHP_FUNCTION(http_date) } /* }}} */ -/* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE[, array &new_url]]]]) +/* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE|HTTP_URL_FROM_ENV[, array &new_url]]]]) Build an URL. */ PHP_FUNCTION(http_build_url) { char *url_str = NULL; size_t url_len = 0; - long flags = HTTP_URL_REPLACE; + long flags = HTTP_URL_REPLACE|HTTP_URL_FROM_ENV; zval *z_old_url = NULL, *z_new_url = NULL, *z_composed_url = NULL; php_url *old_url = NULL, *new_url = NULL, *composed_url = NULL; @@ -492,7 +492,7 @@ PHP_FUNCTION(http_redirect) } } - URI = http_absolute_url(url); + URI = http_absolute_url_ex(url, HTTP_URL_FROM_ENV); if (query_len) { spprintf(&LOC, 0, "Location: %s?%s", URI, query);