diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-17 12:39:25 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-09-17 12:39:25 +0200 |
commit | f601d7c743e9b704a0ed8dde2b44428e8932fdc7 (patch) | |
tree | fea77c85791c155ebea23620d84918228c2eb022 /ext/mysqlnd/mysqlnd_debug.c | |
parent | 5cb8b04646ed99c794c45f8c24fc5c3c7c59e320 (diff) | |
parent | c3c76dbfb9cd43989423dd94bb9a6342d7adcc2b (diff) | |
download | php-git-f601d7c743e9b704a0ed8dde2b44428e8932fdc7.tar.gz |
Merge branch 'PHP-7.4' into master
* PHP-7.4:
Fix #80115: mysqlnd.debug doesn't recognize absolute paths with slashes
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.c')
-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 ab02d5645a..55590f45c9 100644 --- a/ext/mysqlnd/mysqlnd_debug.c +++ b/ext/mysqlnd/mysqlnd_debug.c @@ -523,7 +523,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 |