diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-17 12:37:57 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-17 12:38:16 +0200 |
| commit | c3c76dbfb9cd43989423dd94bb9a6342d7adcc2b (patch) | |
| tree | e6704a15f4c6e37fdd8926981dfd6c330cc931f0 /ext/mysqlnd | |
| parent | d591e1c4f5114cd5ebf3a68ea07741b0bd598e7f (diff) | |
| parent | efdbc3688bd9c72f3f4d7785ff491377366fe5f5 (diff) | |
| download | php-git-c3c76dbfb9cd43989423dd94bb9a6342d7adcc2b.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #80115: mysqlnd.debug doesn't recognize absolute paths with slashes
Diffstat (limited to 'ext/mysqlnd')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c index cb512e1e9e..37a1a594a4 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -524,7 +524,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const if (i + 1 < mode_len && mode[i+1] == ',') { unsigned int j = i + 2; #ifdef PHP_WIN32 - if (i+4 < mode_len && mode[i+3] == ':' && (mode[i+4] == '\\' || mode[i+5] == '/')) { + if (i+4 < mode_len && mode[i+3] == ':' && (mode[i+4] == '\\' || mode[i+4] == '/')) { j = i + 5; } #endif |