kalle Wed Oct 15 18:41:18 2008 UTC
Modified files:
/php-src NEWS php.ini-dist php.ini-recommended
/php-src/ext/standard basic_functions.c basic_functions.h
php_ext_syslog.h syslog.c
/php-src/main main.c
/php-src/win32/build registersyslog.php
Log:
[DOC] Remove define_syslog_variables() and define_syslog_variables ini option
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2167&r2=1.2168&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2167 php-src/NEWS:1.2168
--- php-src/NEWS:1.2167 Mon Sep 1 09:02:22 2008
+++ php-src/NEWS Wed Oct 15 18:41:17 2008
@@ -24,6 +24,8 @@
options. (Pierre)
. Changed get_magic_quotes_gpc(), get_magic_quotes_runtime to always return
false and set_magic_quotes_runtime() to raise an E_CORE_ERROR.
+ . "define_syslog_variables" ini option and define_syslog_variables()
+ (Kalle)
- Removed support for "continue" and "break" operators with non-constant
operands. (Dmitry)
- Removed Freetype 1.x and GD 1.x support from GD extension. (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.279&r2=1.280&diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.279 php-src/php.ini-dist:1.280
--- php-src/php.ini-dist:1.279 Thu Aug 28 05:31:15 2008
+++ php-src/php.ini-dist Wed Oct 15 18:41:17 2008
@@ -648,12 +648,6 @@
;phar.require_hash = On
;phar.cache_list =
-[Syslog]
-; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
-; runtime, you can define these variables by calling define_syslog_variables().
-define_syslog_variables = Off
-
[mail function]
; For Win32 only.
SMTP = localhost
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.229&r2=1.230&diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.229 php-src/php.ini-recommended:1.230
--- php-src/php.ini-recommended:1.229 Thu Aug 28 05:31:15 2008
+++ php-src/php.ini-recommended Wed Oct 15 18:41:17 2008
@@ -685,12 +685,6 @@
;phar.require_hash = On
;phar.cache_list =
-[Syslog]
-; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In
-; runtime, you can define these variables by calling define_syslog_variables().
-define_syslog_variables = Off
-
[mail function]
; For Win32 only.
SMTP = localhost
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.929&r2=1.930&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.929
php-src/ext/standard/basic_functions.c:1.930
--- php-src/ext/standard/basic_functions.c:1.929 Sun Aug 31 00:19:20 2008
+++ php-src/ext/standard/basic_functions.c Wed Oct 15 18:41:18 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.929 2008/08/31 00:19:20 jani Exp $ */
+/* $Id: basic_functions.c,v 1.930 2008/10/15 18:41:18 kalle Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2886,9 +2886,6 @@
/* }}} */
/* {{{ syslog.c */
#ifdef HAVE_SYSLOG_H
-static
-ZEND_BEGIN_ARG_INFO(arginfo_define_syslog_variables, 0)
-ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(arginfo_openlog, 0)
@@ -3702,7 +3699,6 @@
PHP_FE(openlog,
arginfo_openlog)
PHP_FE(syslog,
arginfo_syslog)
PHP_FE(closelog,
arginfo_closelog)
- PHP_FE(define_syslog_variables,
arginfo_define_syslog_variables)
#endif
/* functions from lcg.c */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.h?r1=1.164&r2=1.165&diff_format=u
Index: php-src/ext/standard/basic_functions.h
diff -u php-src/ext/standard/basic_functions.h:1.164
php-src/ext/standard/basic_functions.h:1.165
--- php-src/ext/standard/basic_functions.h:1.164 Sat May 24 14:36:16 2008
+++ php-src/ext/standard/basic_functions.h Wed Oct 15 18:41:18 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.h,v 1.164 2008/05/24 14:36:16 pajoye Exp $ */
+/* $Id: basic_functions.h,v 1.165 2008/10/15 18:41:18 kalle Exp $ */
#ifndef BASIC_FUNCTIONS_H
#define BASIC_FUNCTIONS_H
@@ -200,7 +200,6 @@
zend_bool mt_rand_is_seeded; /* Whether mt_rand() has been seeded */
/* syslog.c */
- int syslog_started;
char *syslog_device;
/* var.c */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_ext_syslog.h?r1=1.17&r2=1.18&diff_format=u
Index: php-src/ext/standard/php_ext_syslog.h
diff -u php-src/ext/standard/php_ext_syslog.h:1.17
php-src/ext/standard/php_ext_syslog.h:1.18
--- php-src/ext/standard/php_ext_syslog.h:1.17 Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/php_ext_syslog.h Wed Oct 15 18:41:18 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ext_syslog.h,v 1.17 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: php_ext_syslog.h,v 1.18 2008/10/15 18:41:18 kalle Exp $ */
#ifndef PHP_EXT_SYSLOG_H
#define PHP_EXT_SYSLOG_H
@@ -35,7 +35,6 @@
PHP_FUNCTION(openlog);
PHP_FUNCTION(syslog);
PHP_FUNCTION(closelog);
-PHP_FUNCTION(define_syslog_variables);
#endif
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/syslog.c?r1=1.59&r2=1.60&diff_format=u
Index: php-src/ext/standard/syslog.c
diff -u php-src/ext/standard/syslog.c:1.59 php-src/ext/standard/syslog.c:1.60
--- php-src/ext/standard/syslog.c:1.59 Thu Feb 28 14:16:14 2008
+++ php-src/ext/standard/syslog.c Wed Oct 15 18:41:18 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: syslog.c,v 1.59 2008/02/28 14:16:14 felipe Exp $ */
+/* $Id: syslog.c,v 1.60 2008/10/15 18:41:18 kalle Exp $ */
#include "php.h"
@@ -105,11 +105,6 @@
PHP_RINIT_FUNCTION(syslog) /* {{{ */
{
- if (INI_INT("define_syslog_variables")) {
- start_syslog(TSRMLS_C);
- } else {
- BG(syslog_started)=0;
- }
BG(syslog_device) = NULL;
return SUCCESS;
}
@@ -134,87 +129,6 @@
}
/* }}} */
-/* {{{ start_syslog
- */
-static void start_syslog(TSRMLS_D)
-{
- /* error levels */
- SET_VAR_LONG("LOG_EMERG", LOG_EMERG); /* system unusable */
- SET_VAR_LONG("LOG_ALERT", LOG_ALERT); /* immediate action required */
- SET_VAR_LONG("LOG_CRIT", LOG_CRIT); /* critical conditions */
- SET_VAR_LONG("LOG_ERR", LOG_ERR);
- SET_VAR_LONG("LOG_WARNING", LOG_WARNING);
- SET_VAR_LONG("LOG_NOTICE", LOG_NOTICE);
- SET_VAR_LONG("LOG_INFO", LOG_INFO);
- SET_VAR_LONG("LOG_DEBUG", LOG_DEBUG);
- /* facility: type of program logging the message */
- SET_VAR_LONG("LOG_KERN", LOG_KERN);
- SET_VAR_LONG("LOG_USER", LOG_USER); /* generic user level */
- SET_VAR_LONG("LOG_MAIL", LOG_MAIL); /* log to email */
- SET_VAR_LONG("LOG_DAEMON", LOG_DAEMON); /* other system daemons */
- SET_VAR_LONG("LOG_AUTH", LOG_AUTH);
-#ifndef NETWARE
- SET_VAR_LONG("LOG_SYSLOG", LOG_SYSLOG);
-#endif
- SET_VAR_LONG("LOG_LPR", LOG_LPR);
-#ifdef LOG_NEWS
- /* No LOG_NEWS on HP-UX */
- SET_VAR_LONG("LOG_NEWS", LOG_NEWS); /* usenet new */
-#endif
-#ifdef LOG_UUCP
- /* No LOG_UUCP on HP-UX */
- SET_VAR_LONG("LOG_UUCP", LOG_UUCP);
-#endif
-#ifdef LOG_CRON
- /* apparently some systems don't have this one */
- SET_VAR_LONG("LOG_CRON", LOG_CRON);
-#endif
-#ifdef LOG_AUTHPRIV
- /* AIX doesn't have LOG_AUTHPRIV */
- SET_VAR_LONG("LOG_AUTHPRIV", LOG_AUTHPRIV);
-#endif
-#if !defined(PHP_WIN32) && !defined(NETWARE)
- SET_VAR_LONG("LOG_LOCAL0", LOG_LOCAL0);
- SET_VAR_LONG("LOG_LOCAL1", LOG_LOCAL1);
- SET_VAR_LONG("LOG_LOCAL2", LOG_LOCAL2);
- SET_VAR_LONG("LOG_LOCAL3", LOG_LOCAL3);
- SET_VAR_LONG("LOG_LOCAL4", LOG_LOCAL4);
- SET_VAR_LONG("LOG_LOCAL5", LOG_LOCAL5);
- SET_VAR_LONG("LOG_LOCAL6", LOG_LOCAL6);
- SET_VAR_LONG("LOG_LOCAL7", LOG_LOCAL7);
-#endif
- /* options */
- SET_VAR_LONG("LOG_PID", LOG_PID);
- SET_VAR_LONG("LOG_CONS", LOG_CONS);
- SET_VAR_LONG("LOG_ODELAY", LOG_ODELAY);
- SET_VAR_LONG("LOG_NDELAY", LOG_NDELAY);
-#ifdef LOG_NOWAIT
- /* BeOS doesn't have LOG_NOWAIT */
- SET_VAR_LONG("LOG_NOWAIT", LOG_NOWAIT);
-#endif
-#ifdef LOG_PERROR
- /* AIX doesn't have LOG_PERROR */
- SET_VAR_LONG("LOG_PERROR", LOG_PERROR); /*log to stderr*/
-#endif
-
- BG(syslog_started)=1;
-}
-/* }}} */
-
-/* {{{ proto void define_syslog_variables(void) U
- Initializes all syslog-related variables */
-PHP_FUNCTION(define_syslog_variables)
-{
- if (zend_parse_parameters_none() == FAILURE) {
- return;
- }
-
- if (!BG(syslog_started)) {
- start_syslog(TSRMLS_C);
- }
-}
-/* }}} */
-
/* {{{ proto bool openlog(string ident, int option, int facility) U
Open connection to system logger */
/*
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.784&r2=1.785&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.784 php-src/main/main.c:1.785
--- php-src/main/main.c:1.784 Tue Sep 2 09:46:00 2008
+++ php-src/main/main.c Wed Oct 15 18:41:18 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.784 2008/09/02 09:46:00 dmitry Exp $ */
+/* $Id: main.c,v 1.785 2008/10/15 18:41:18 kalle Exp $ */
/* {{{ includes
*/
@@ -474,7 +474,6 @@
/* {{{ PHP_INI
*/
PHP_INI_BEGIN()
- PHP_INI_ENTRY_EX("define_syslog_variables", "0",
PHP_INI_ALL, NULL, php_ini_boolean_displayer_cb)
PHP_INI_ENTRY_EX("highlight.comment", HL_COMMENT_COLOR,
PHP_INI_ALL, NULL, php_ini_color_displayer_cb)
PHP_INI_ENTRY_EX("highlight.default", HL_DEFAULT_COLOR,
PHP_INI_ALL, NULL, php_ini_color_displayer_cb)
PHP_INI_ENTRY_EX("highlight.html", HL_HTML_COLOR,
PHP_INI_ALL, NULL, php_ini_color_displayer_cb)
@@ -1935,6 +1934,7 @@
/* Check for deprecated directives */
{
static const char *directives[] = {
+ "define_syslog_variables",
"register_globals",
"register_long_arrays",
"safe_mode",
http://cvs.php.net/viewvc.cgi/php-src/win32/build/registersyslog.php?r1=1.2&r2=1.3&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.3
--- 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:18 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
+);
+
+
+?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
