archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Further fixes related to bug #21267.

Browse source
This commit is contained in:
Ilia Alshanetsky 2003-01-03 17:05:16 +00:00
parent 2e52c112df
commit c52cdad25a
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/standard/http_fopen_wrapper.c
View file

@ -346,7 +346,11 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, ch
if (*location != '/') { if (*location != '/') {
if (*(location+1) != '\0') { if (*(location+1) != '\0') {
php_dirname(resource->path, strlen(resource->path)); php_dirname(resource->path, strlen(resource->path));
if (resource->path && *(resource->path) == '/' && *(resource->path + 1) == '\0') {
snprintf(loc_path, sizeof(loc_path) - 1, "%s%s", resource->path, location); snprintf(loc_path, sizeof(loc_path) - 1, "%s%s", resource->path, location);
} else {
snprintf(loc_path, sizeof(loc_path) - 1, "%s/%s", resource->path, location);
}
} else { } else {
snprintf(loc_path, sizeof(loc_path) - 1, "/%s", location); snprintf(loc_path, sizeof(loc_path) - 1, "/%s", location);
} }
@ -358,8 +362,7 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, ch
} else { } else {
snprintf(new_path, sizeof(new_path) - 1, "%s://%s%s", resource->scheme, resource->host, loc_path); snprintf(new_path, sizeof(new_path) - 1, "%s://%s%s", resource->scheme, resource->host, loc_path);
} }
} } else {
else {
strlcpy(new_path, location, sizeof(new_path)); strlcpy(new_path, location, sizeof(new_path));
} }
stream = php_stream_url_wrap_http(NULL, new_path, mode, options, opened_path, context STREAMS_CC TSRMLS_CC); stream = php_stream_url_wrap_http(NULL, new_path, mode, options, opened_path, context STREAMS_CC TSRMLS_CC);