diff options
| author | Anatol Belski <ab@php.net> | 2014-04-01 10:12:06 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-01 10:12:06 +0200 |
| commit | eb84d5d0a605b89778627de6c7facf6b4c0d57da (patch) | |
| tree | 8f7deb784fca6ecae70049e242a5b553a94e13f9 /ext/dom | |
| parent | 60fb57d4f672d08b8aaa39469c4eba92af08265b (diff) | |
| parent | f244513fc059a9b7ee2b91ad65f1a2f013b5d588 (diff) | |
| download | php-git-eb84d5d0a605b89778627de6c7facf6b4c0d57da.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated NEWS
added test for bug #53965
Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
Diffstat (limited to 'ext/dom')
| -rw-r--r-- | ext/dom/document.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/dom/document.c b/ext/dom/document.c index 73bc8c1c62..095f96dc09 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -1509,6 +1509,12 @@ char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_p if (uri->scheme != NULL) { /* absolute file uris - libxml only supports localhost or empty host */ +#ifdef PHP_WIN32 + if (strncasecmp(source, "file://",7) == 0 && ':' == source[8]) { + isFileUri = 1; + source += 7; + } else +#endif if (strncasecmp(source, "file:///",8) == 0) { isFileUri = 1; #ifdef PHP_WIN32 |