From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 3 Jan 2003 17:05:16 +0000 (+0000)
Subject: Further fixes related to bug #21267.
X-Git-Tag: PHP_5_0_dev_before_13561_fix~485
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c52cdad25a7ac680fba05fa68b552a15e484f88e;p=php

Further fixes related to bug #21267.
---

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index f13bf5f69a..c3f10fd3e9 100644
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -346,7 +346,11 @@ php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, ch
 				if (*location != '/') {
 					if (*(location+1) != '\0') {				
 						php_dirname(resource->path, strlen(resource->path));
-						snprintf(loc_path, sizeof(loc_path) - 1, "%s%s", resource->path, location);
+						if (resource->path && *(resource->path) == '/' && *(resource->path + 1) == '\0') {
+							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 {
 						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 {
 					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));
 			}
 			stream = php_stream_url_wrap_http(NULL, new_path, mode, options, opened_path, context STREAMS_CC TSRMLS_CC);