summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2020-09-17 12:37:02 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2020-09-17 12:37:02 +0200
commitefdbc3688bd9c72f3f4d7785ff491377366fe5f5 (patch)
treededf860030bd9df3f4535e537b3e1deb8648679a
parent1aab7db6c870441046007c792c7fc5ecdff2ea51 (diff)
downloadphp-git-efdbc3688bd9c72f3f4d7785ff491377366fe5f5.tar.gz
Fix #80115: mysqlnd.debug doesn't recognize absolute paths with slashes
-rw-r--r--NEWS4
-rw-r--r--ext/mysqlnd/mysqlnd_debug.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 05fece0bf5..9d3d53aca1 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 7.3.24
+- MySQLnd:
+ . Fixed bug #80115 (mysqlnd.debug doesn't recognize absolute paths with
+ slashes). (cmb)
+
- OPcache:
. Fixed bug #80083 (Optimizer pass 6 removes variables used for ibm_db2 data
binding). (Nikita)
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c
index 409097a559..17b1d1ac48 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