kalle Wed Oct 15 18:41:58 2008 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS /php-src/ext/standard syslog.c /php-src/win32/build registersyslog.php Log: [DOC] Deprecate define_syslog_variables() in 5.3 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.344&r2=1.2027.2.547.2.965.2.345&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.344 php-src/NEWS:1.2027.2.547.2.965.2.345 --- php-src/NEWS:1.2027.2.547.2.965.2.344 Tue Oct 14 19:03:36 2008 +++ php-src/NEWS Wed Oct 15 18:41:57 2008 @@ -14,6 +14,8 @@ (Keisial at gmail dot com, Greg) - Added support for using compressed connections with PDO_mysql. (Johannes) +- Deprecated define_syslog_variables(). (Kalle) + - Fixed bug causing the algorithm parameter of mhash() to be modified. (Scott) - Fixed bug #46238 (Segmentation fault on static call with empty string method). http://cvs.php.net/viewvc.cgi/php-src/ext/standard/syslog.c?r1=1.49.2.3.2.2.2.3&r2=1.49.2.3.2.2.2.4&diff_format=u Index: php-src/ext/standard/syslog.c diff -u php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.3 php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.4 --- php-src/ext/standard/syslog.c:1.49.2.3.2.2.2.3 Mon Mar 10 22:12:36 2008 +++ php-src/ext/standard/syslog.c Wed Oct 15 18:41:57 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.49.2.3.2.2.2.3 2008/03/10 22:12:36 felipe Exp $ */ +/* $Id: syslog.c,v 1.49.2.3.2.2.2.4 2008/10/15 18:41:57 kalle Exp $ */ #include "php.h" @@ -207,6 +207,8 @@ return; } + php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, "define_syslog_variables is deprecated, please use the syslog constants instead"); + if (!BG(syslog_started)) { start_syslog(TSRMLS_C); } http://cvs.php.net/viewvc.cgi/php-src/win32/build/registersyslog.php?r1=1.2&r2=1.2.6.1&diff_format=u Index: php-src/win32/build/registersyslog.php diff -u php-src/win32/build/registersyslog.php:1.2 php-src/win32/build/registersyslog.php:1.2.6.1 --- php-src/win32/build/registersyslog.php:1.2 Thu Aug 5 12:15:17 2004 +++ php-src/win32/build/registersyslog.php Wed Oct 15 18:41:57 2008 @@ -1,45 +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"); - - define_syslog_variables(); - 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 -); - - -?> +<?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 +); + + +?>