iliaa Mon Jul 21 09:37:10 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard url.c
/php-src/ext/standard/tests/strings url_t.phpt
Log:
MFH: Fixed bug #24560 (parse_url() incorrectly handling certain file://
based schemas).
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.289 php-src/NEWS:1.1247.2.290
--- php-src/NEWS:1.1247.2.289 Mon Jul 21 04:43:27 2003
+++ php-src/NEWS Mon Jul 21 09:37:09 2003
@@ -12,6 +12,8 @@
is used for background color. (Pierre-Alain Joye)
- Fixed bug #24640 (var_export and var_dump can't output large float). (Marcus)
- Fixed bug #24573 (debug_backtrace() crashes if $this set to null). (Jani)
+- Fixed bug #24560 (parse_url() incorrectly handling certain file:// based
+ schemas). Ilia
- Fixed bug #24537 (apache2 compile misses some include directories). (Jani)
- Fixed bug #24519 (aggregate_methods_by_list() does not increment refcount).
- Fixed bug #24313 (file_exist() warning on non-existent files when
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.58.2.7 php-src/ext/standard/url.c:1.58.2.8
--- php-src/ext/standard/url.c:1.58.2.7 Mon Apr 28 12:18:34 2003
+++ php-src/ext/standard/url.c Mon Jul 21 09:37:10 2003
@@ -15,7 +15,7 @@
| Author: Jim Winstead <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: url.c,v 1.58.2.7 2003/04/28 16:18:34 sas Exp $ */
+/* $Id: url.c,v 1.58.2.8 2003/07/21 13:37:10 iliaa Exp $ */
#include <stdlib.h>
#include <string.h>
@@ -125,7 +125,9 @@
if (*(e+2) == '/') {
s = e + 3;
if (!strncasecmp("file", ret->scheme, sizeof("file")))
{
- goto nohost;
+ if (*(e + 3) == '/') {
+ goto nohost;
+ }
}
} else {
s = e + 1;
Index: php-src/ext/standard/tests/strings/url_t.phpt
diff -u php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.3
php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.4
--- php-src/ext/standard/tests/strings/url_t.phpt:1.3.2.3 Tue Dec 31 13:54:38
2002
+++ php-src/ext/standard/tests/strings/url_t.phpt Mon Jul 21 09:37:10 2003
@@ -625,11 +625,13 @@
["path"]=>
string(13) "/path/to/file"
}
-array(2) {
+array(3) {
["scheme"]=>
string(4) "file"
+ ["host"]=>
+ string(4) "path"
["path"]=>
- string(12) "path/to/file"
+ string(8) "/to/file"
}
array(2) {
["scheme"]=>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
