Improve extension matching in installer (#1851)

* Improve extension matching in installer As suggested in #1846. * Add examples what shall be matched
DataDog · Jan 12, 2023 · 06d3dad · 06d3dad
1 parent c84dfa1
commit 06d3dad
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/datadog-setup.php b/datadog-setup.php
@@ -226,8 +226,11 @@ function install($options)
             foreach (scandir($phpProperties[INI_SCANDIR]) as $ini) {
                 $path = "{$phpProperties[INI_SCANDIR]}/$ini";
                 if (is_file($path)) {
-                    if (preg_match('(^\s*extension\s*=.+ddtrace\.so)m', file_get_contents($path))) {
-                        $iniFileName = $ini;
+                    // match /path/to/ddtrace.so, plain extension = ddtrace or future extensions like ddtrace.dll
+                    if (preg_match("(^\s*extension\s*=\s*(\S*ddtrace)\b)m", file_get_contents($path), $res)) {
+                        if (basename($res[1]) == "ddtrace") {
+                            $iniFileName = $ini;
+                        }
                     }
                 }
             }