]> granicus.if.org Git - php/commitdiff
Revert "Remove Windows syslog script and syslog.reg"
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 17 Jul 2019 17:25:36 +0000 (19:25 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 17 Jul 2019 17:36:56 +0000 (19:36 +0200)
This reverts commit cc44bad1f6ded6a62c9bbe4d145b5b418aa775f4, since its
assumptions were not correct.  Actually, the classic event logging is
still used by PHP, because Windows 7 is still to be supported for a
while.  Without the respective registry entries, the event log entries
show an error message regarding missing ID descriptions.

Thanks to ab@php.net for hinting at this!

Obviously, the part depending on ext/win32std has still to be
overhauled, and further improvements are conceivable; we will address
this in due course.

win32/build/Makefile
win32/build/registersyslog.php [new file with mode: 0755]
win32/syslog.reg [new file with mode: 0644]

index a4d82e06fb1fd780c0702e743500757884e93988..26b73b625ac678ac85367d6745c1bd4c4dacff76 100644 (file)
@@ -261,3 +261,6 @@ really-install:
        @type nul > $(BUILD_DIR)\extension_dlls.txt
        @if exist $(BUILD_DIR)\php_*.dll copy $(BUILD_DIR)\php_*.dll $(PHP_PREFIX)\ext /y >nul & dir /b $(BUILD_DIR)\php_*.dll > $(BUILD_DIR)\extension_dlls.txt
        @xcopy $(BUILD_DIR)\*.dll /exclude:$(BUILD_DIR)\extension_dlls.txt $(PHP_PREFIX) /y >nul
+       @echo Registering event source with syslog (requires admin rights)
+       @echo It's okay for this step to fail:
+       -$(PHP_PREFIX)\php.exe -n -dextension_dir=$(PHP_PREFIX) win32/build/registersyslog.php $(PHP_PREFIX)\$(PHPDLL)
diff --git a/win32/build/registersyslog.php b/win32/build/registersyslog.php
new file mode 100755 (executable)
index 0000000..ce28cbf
--- /dev/null
@@ -0,0 +1,44 @@
+<?php
+
+/* This script sets up an event source for use by the php syslog() function. */
+
+if (!extension_loaded("win32std")) {
+       @dl("php_win32std.dll");
+}
+
+$PATH = "SYSTEM\\CurrentControlSet\\Services\\Eventlog\\Application\\PHP-" . phpversion();
+
+$dll = $argv[1];
+
+if (extension_loaded("win32std")) {
+       $key = @reg_create_key(HKEY_LOCAL_MACHINE, $PATH, KEY_ALL_ACCESS);
+
+       if (!$key)
+               $key = reg_open_key(HKEY_LOCAL_MACHINE, $PATH, KEY_ALL_ACCESS);
+
+       if ($key) {
+               reg_set_value($key, "TypesSupported", REG_DWORD, 7) or die("Types");
+               reg_set_value($key, "EventMessageFile", REG_SZ, $dll) or die("EventMessageFile");
+
+               syslog(LOG_NOTICE, "Registered PHP Event source");
+       } else {
+               echo "Could not register event source\n";
+       }
+}
+
+/* let's also generate/update the bundled .reg file */
+
+$dll = addslashes($dll);
+
+file_put_contents("win32/syslog.reg", <<<REG
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\\$PATH]
+"TypesSupported"=dword:00000007
+"EventMessageFile"="$dll"
+
+REG
+);
+
+
+?>
diff --git a/win32/syslog.reg b/win32/syslog.reg
new file mode 100644 (file)
index 0000000..a817b52
--- /dev/null
@@ -0,0 +1,5 @@
+REGEDIT4
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Eventlog\Application\PHP-7.3.0-dev]
+"TypesSupported"=dword:00000007
+"EventMessageFile"="g:\\test\\srctrunkinstall\\php7ts.dll"