diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
| commit | a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc (patch) | |
| tree | b45a5d42d9d2ab47f9f06180e12ca973d289a3cc /ext/standard/string.c | |
| parent | 6c0e1ca4fa31a860a363abecd6376d99edff8833 (diff) | |
| parent | 2104bea5d756dfa40b605a4a2765a3bc4637a76c (diff) | |
| download | php-git-a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
Diffstat (limited to 'ext/standard/string.c')
| -rw-r--r-- | ext/standard/string.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 4389e10702..ec4b021ca2 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1537,7 +1537,7 @@ PHPAPI zend_string *php_basename(const char *s, size_t len, char *suffix, size_t case 0: goto quit_loop; case 1: -#if defined(PHP_WIN32) || defined(NETWARE) +#if defined(PHP_WIN32) if (*c == '/' || *c == '\\') { #else if (*c == '/') { @@ -1546,7 +1546,7 @@ PHPAPI zend_string *php_basename(const char *s, size_t len, char *suffix, size_t state = 0; cend = c; } -#if defined(PHP_WIN32) || defined(NETWARE) +#if defined(PHP_WIN32) /* Catch relative paths in c:file.txt style. They're not to confuse with the NTFS streams. This part ensures also, that no drive letter traversing happens. */ |