iliaa Fri Jan 3 12:05:17 2003 EDT
Modified files:
/php4/ext/standard http_fopen_wrapper.c
Log:
Further fixes related to bug #21267.
Index: php4/ext/standard/http_fopen_wrapper.c
diff -u php4/ext/standard/http_fopen_wrapper.c:1.56
php4/ext/standard/http_fopen_wrapper.c:1.57
--- php4/ext/standard/http_fopen_wrapper.c:1.56 Tue Dec 31 11:07:42 2002
+++ php4/ext/standard/http_fopen_wrapper.c Fri Jan 3 12:05:16 2003
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.56 2002/12/31 16:07:42 sebastian Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.57 2003/01/03 17:05:16 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -346,7 +346,11 @@
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 @@
} 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
