From eb4e27f356a21de529c1ae96aad19a1d34b7a876 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Wed, 19 Feb 2003 00:49:38 +0000 Subject: [PATCH] MFH --- ext/standard/http_fopen_wrapper.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index 096819c058..6b701656ba 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -352,8 +352,13 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, ch *new_path='\0'; if (strlen(location)<8 || (strncasecmp(location, "http://", sizeof("http://")-1) && strncasecmp(location, "https://", sizeof("https://")-1))) { if (*location != '/') { - if (*(location+1) != '\0') { - php_dirname(resource->path, strlen(resource->path)); + if (*(location+1) != '\0' && resource->path) { + char *s = strrchr(resource->path, '/'); + if (!s) { + s = resource->path; + *s = '/'; + } + s[1] = '\0'; if (resource->path && *(resource->path) == '/' && *(resource->path + 1) == '\0') { snprintf(loc_path, sizeof(loc_path) - 1, "%s%s", resource->path, location); } else { -- 2.40.0