kalle Mon, 12 Apr 2010 01:52:55 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=297852
Log:
* Changed the way removed ini directives are shown so its easier to add new ones
* Removed define_syslog_variables and its associated functions
Changed paths:
U php/php-src/trunk/Makefile.global
U php/php-src/trunk/ext/standard/basic_functions.c
U php/php-src/trunk/ext/standard/basic_functions.h
U php/php-src/trunk/ext/standard/php_ext_syslog.h
U php/php-src/trunk/ext/standard/syslog.c
D php/php-src/trunk/ext/standard/tests/misc/syslog_vars_variation1.phpt
D php/php-src/trunk/ext/standard/tests/misc/syslog_vars_variation2.phpt
D
php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_basic-win32.phpt
D
php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_basic.phpt
D
php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_error.phpt
D
php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation.phpt
D
php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation2-win32.phpt
D
php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation2.phpt
U php/php-src/trunk/main/main.c
U php/php-src/trunk/php.ini-development
U php/php-src/trunk/php.ini-production
Modified: php/php-src/trunk/Makefile.global
===================================================================
--- php/php-src/trunk/Makefile.global 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/Makefile.global 2010-04-12 01:52:55 UTC (rev 297852)
@@ -79,7 +79,7 @@
. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
done; \
fi`
-PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
+PHP_DEPRECATED_DIRECTIVES_REGEX = '^(register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
test: all
-...@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===================================================================
--- php/php-src/trunk/ext/standard/basic_functions.c 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/basic_functions.c 2010-04-12 01:52:55 UTC (rev 297852)
@@ -2464,9 +2464,6 @@
/* }}} */
/* {{{ syslog.c */
#ifdef HAVE_SYSLOG_H
-ZEND_BEGIN_ARG_INFO(arginfo_define_syslog_variables, 0)
-ZEND_END_ARG_INFO()
-
ZEND_BEGIN_ARG_INFO(arginfo_openlog, 0)
ZEND_ARG_INFO(0, ident)
ZEND_ARG_INFO(0, option)
@@ -3221,7 +3218,6 @@
PHP_FE(openlog, arginfo_openlog)
PHP_FE(syslog, arginfo_syslog)
PHP_FE(closelog, arginfo_closelog)
- PHP_DEP_FE(define_syslog_variables, arginfo_define_syslog_variables)
#endif
/* functions from lcg.c */
Modified: php/php-src/trunk/ext/standard/basic_functions.h
===================================================================
--- php/php-src/trunk/ext/standard/basic_functions.h 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/basic_functions.h 2010-04-12 01:52:55 UTC (rev 297852)
@@ -202,7 +202,6 @@
zend_bool mt_rand_is_seeded; /* Whether mt_rand() has been seeded */
/* syslog.c */
- int syslog_started;
char *syslog_device;
/* var.c */
Modified: php/php-src/trunk/ext/standard/php_ext_syslog.h
===================================================================
--- php/php-src/trunk/ext/standard/php_ext_syslog.h 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/php_ext_syslog.h 2010-04-12 01:52:55 UTC (rev 297852)
@@ -35,7 +35,6 @@
PHP_FUNCTION(openlog);
PHP_FUNCTION(syslog);
PHP_FUNCTION(closelog);
-PHP_FUNCTION(define_syslog_variables);
#endif
Modified: php/php-src/trunk/ext/standard/syslog.c
===================================================================
--- php/php-src/trunk/ext/standard/syslog.c 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/syslog.c 2010-04-12 01:52:55 UTC (rev 297852)
@@ -36,8 +36,6 @@
#include "basic_functions.h"
#include "php_ext_syslog.h"
-static void start_syslog(TSRMLS_D);
-
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_MINIT_FUNCTION(syslog)
@@ -105,11 +103,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;
}
@@ -132,87 +125,6 @@
return SUCCESS;
}
-/* {{{ 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)
- 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)
Open connection to system logger */
/*
Deleted: php/php-src/trunk/ext/standard/tests/misc/syslog_vars_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/misc/syslog_vars_variation1.phpt 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/tests/misc/syslog_vars_variation1.phpt 2010-04-12 01:52:55 UTC (rev 297852)
@@ -1,11 +0,0 @@
---TEST--
-define_syslog_variables() variation 1
---INI--
-define_syslog_variables=On
---FILE--
-<?php
-var_dump(isset($LOG_ERR));
-?>
---EXPECTF--
-Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
-bool(true)
Deleted: php/php-src/trunk/ext/standard/tests/misc/syslog_vars_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/misc/syslog_vars_variation2.phpt 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/tests/misc/syslog_vars_variation2.phpt 2010-04-12 01:52:55 UTC (rev 297852)
@@ -1,52 +0,0 @@
---TEST--
-define_syslog_variables() variation 2
---FILE--
-<?php
-define_syslog_variables();
-
-$standard_types = Array(
- 'LOG_EMERG',
- 'LOG_ALERT',
- 'LOG_CRIT',
- 'LOG_ERR',
- 'LOG_WARNING',
- 'LOG_NOTICE',
- 'LOG_INFO',
- 'LOG_DEBUG',
- 'LOG_KERN',
- 'LOG_USER',
- 'LOG_MAIL',
- 'LOG_DAEMON',
- 'LOG_AUTH',
- 'LOG_LPR',
- 'LOG_PID',
- 'LOG_CONS',
- 'LOG_ODELAY',
- 'LOG_NDELAY'
- );
-
-foreach($standard_types as $logtype)
-{
- var_dump(isset(${$logtype}));
-}
-?>
---EXPECTF--
-Deprecated: Function define_syslog_variables() is deprecated in %s on line %d
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
Deleted: php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_basic-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_basic-win32.phpt 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_basic-win32.phpt 2010-04-12 01:52:55 UTC (rev 297852)
@@ -1,107 +0,0 @@
---TEST--
-Test define_syslog_variables() function : basic functionality
---SKIPIF--
-<?php
-if(substr(PHP_OS, 0, 3) != "WIN")
- die("skip Only run on Windows");
-?>
---FILE--
-<?php
-/* Prototype : void define_syslog_variables(void)
- * Description: Initializes all syslog-related variables
- * Source code: ext/standard/syslog.c
- * Alias to functions:
- */
-
-echo "*** Testing define_syslog_variables() : basic functionality ***\n";
-
-$log_constants = array(
- LOG_EMERG,
- LOG_ALERT,
- LOG_CRIT,
- LOG_ERR,
- LOG_WARNING,
- LOG_NOTICE,
- LOG_INFO,
- LOG_DEBUG,
- LOG_KERN,
- LOG_USER,
- LOG_MAIL,
- LOG_DAEMON,
- LOG_AUTH,
- LOG_SYSLOG,
- LOG_LPR,
- LOG_NEWS,
- LOG_UUCP,
- LOG_CRON,
- LOG_AUTHPRIV,
- LOG_PID,
- LOG_CONS,
- LOG_ODELAY,
- LOG_NDELAY,
- LOG_NOWAIT,
- LOG_PERROR,
-);
-
-
-$log_variables = array(
- "LOG_EMERG",
- "LOG_ALERT",
- "LOG_CRIT",
- "LOG_ERR",
- "LOG_WARNING",
- "LOG_NOTICE",
- "LOG_INFO",
- "LOG_DEBUG",
- "LOG_KERN",
- "LOG_USER",
- "LOG_MAIL",
- "LOG_DAEMON",
- "LOG_AUTH",
- "LOG_SYSLOG",
- "LOG_LPR",
- "LOG_NEWS",
- "LOG_UUCP",
- "LOG_CRON",
- "LOG_AUTHPRIV",
- "LOG_PID",
- "LOG_CONS",
- "LOG_ODELAY",
- "LOG_NDELAY",
- "LOG_NOWAIT",
- "LOG_PERROR",
-);
-
-error_reporting(E_ALL);
-$failed = false;
-
-// show variables not defined
-foreach($log_variables as $log_var) {
- if (isset($$log_var)) {
- $failed = true;
- echo "FAILED: variable defined\n";
- }
-}
-
-var_dump( define_syslog_variables() );
-
-// show variables defined
-for ($t = 0; $t < count($log_variables); $t++) {
- if (isset($$log_variables[$t]) === false || $$log_variables[$t] != $log_constants[$t]) {
- $failed = true;
- echo "FAILED: $log_variables[$t] doesn't contain the correct value\n";
- }
-}
-
-if ($failed == false) {
- echo "PASSED\n";
-}
-?>
-===DONE===
---EXPECTF--
-*** Testing define_syslog_variables() : basic functionality ***
-
-Deprecated: Function define_syslog_variables() is deprecated in %s on line %d
-NULL
-PASSED
-===DONE===
Deleted: php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_basic.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_basic.phpt 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_basic.phpt 2010-04-12 01:52:55 UTC (rev 297852)
@@ -1,126 +0,0 @@
---TEST--
-Test define_syslog_variables() function : basic functionality
---SKIPIF--
-<?php
-if(substr(PHP_OS, 0, 3) == "WIN")
- die("skip don't run on Windows");
-?>
---FILE--
-<?php
-/* Prototype : void define_syslog_variables(void)
- * Description: Initializes all syslog-related variables
- * Source code: ext/standard/syslog.c
- * Alias to functions:
- */
-
-echo "*** Testing define_syslog_variables() : basic functionality ***\n";
-
-$log_constants = array(
- LOG_EMERG,
- LOG_ALERT,
- LOG_CRIT,
- LOG_ERR,
- LOG_WARNING,
- LOG_NOTICE,
- LOG_INFO,
- LOG_DEBUG,
- LOG_KERN,
- LOG_USER,
- LOG_MAIL,
- LOG_DAEMON,
- LOG_AUTH,
- LOG_SYSLOG,
- LOG_LPR,
- LOG_NEWS,
- LOG_UUCP,
- LOG_CRON,
- LOG_AUTHPRIV,
- LOG_PID,
- LOG_CONS,
- LOG_ODELAY,
- LOG_NDELAY,
- LOG_NOWAIT,
- LOG_PERROR,
-
- LOG_LOCAL0,
- LOG_LOCAL1,
- LOG_LOCAL2,
- LOG_LOCAL3,
- LOG_LOCAL4,
- LOG_LOCAL5,
- LOG_LOCAL6,
- LOG_LOCAL7
-
-);
-
-
-$log_variables = array(
- "LOG_EMERG",
- "LOG_ALERT",
- "LOG_CRIT",
- "LOG_ERR",
- "LOG_WARNING",
- "LOG_NOTICE",
- "LOG_INFO",
- "LOG_DEBUG",
- "LOG_KERN",
- "LOG_USER",
- "LOG_MAIL",
- "LOG_DAEMON",
- "LOG_AUTH",
- "LOG_SYSLOG",
- "LOG_LPR",
- "LOG_NEWS",
- "LOG_UUCP",
- "LOG_CRON",
- "LOG_AUTHPRIV",
- "LOG_PID",
- "LOG_CONS",
- "LOG_ODELAY",
- "LOG_NDELAY",
- "LOG_NOWAIT",
- "LOG_PERROR",
-
- "LOG_LOCAL0",
- "LOG_LOCAL1",
- "LOG_LOCAL2",
- "LOG_LOCAL3",
- "LOG_LOCAL4",
- "LOG_LOCAL5",
- "LOG_LOCAL6",
- "LOG_LOCAL7"
-);
-
-error_reporting(E_ALL);
-$failed = false;
-
-// show variables not defined
-foreach($log_variables as $log_var) {
- if (isset($$log_var)) {
- $failed = true;
- echo "FAILED: variable defined\n";
- }
-}
-
-var_dump( define_syslog_variables() );
-
-// show variables now defined
-for ($t = 0; $t < count($log_variables); $t++) {
- if (isset($$log_variables[$t]) === false || $$log_variables[$t] != $log_constants[$t]) {
- $failed = true;
- echo "FAILED: $log_variables[$t] doesn't contain the correct value\n";
- }
-}
-
-if ($failed == false) {
- echo "PASSED\n";
-}
-?>
-===DONE===
---EXPECTF--
-*** Testing define_syslog_variables() : basic functionality ***
-
-Deprecated: Function define_syslog_variables() is deprecated in %s on line %d
-NULL
-PASSED
-===DONE===
Deleted: php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_error.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_error.phpt 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_error.phpt 2010-04-12 01:52:55 UTC (rev 297852)
@@ -1,29 +0,0 @@
---TEST--
-Test define_syslog_variables() function : error conditions
---FILE--
-<?php
-/* Prototype : void define_syslog_variables(void)
- * Description: Initializes all syslog-related variables
- * Source code: ext/standard/syslog.c
- * Alias to functions:
- */
-
-echo "*** Testing define_syslog_variables() : error conditions ***\n";
-
-// One argument
-echo "\n-- Testing define_syslog_variables() function with one argument --\n";
-$extra_arg = 10;
-var_dump( define_syslog_variables($extra_arg) );
-
-?>
-===DONE===
---EXPECTF--
-*** Testing define_syslog_variables() : error conditions ***
-
--- Testing define_syslog_variables() function with one argument --
-
-Deprecated: Function define_syslog_variables() is deprecated in %s on line %d
-
-Warning: define_syslog_variables() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
-===DONE===
Deleted: php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation.phpt 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation.phpt 2010-04-12 01:52:55 UTC (rev 297852)
@@ -1,92 +0,0 @@
---TEST--
-Test define_syslog_variables() function : variation
---FILE--
-<?php
-/* Prototype : void define_syslog_variables(void)
- * Description: Initializes all syslog-related variables
- * Source code: ext/standard/syslog.c
- * Alias to functions:
- */
-
-define_syslog_variables();
-
-echo "*** Testing define_syslog_variables() : variation ***\n";
-
-$log_constants = array(
- LOG_EMERG,
- LOG_ALERT,
- LOG_CRIT,
- LOG_ERR,
- LOG_WARNING,
- LOG_NOTICE,
- LOG_INFO,
- LOG_DEBUG,
- LOG_KERN,
- LOG_USER,
- LOG_MAIL,
- LOG_DAEMON,
- LOG_AUTH,
- LOG_SYSLOG,
- LOG_LPR,
- LOG_NEWS,
- LOG_UUCP,
- LOG_CRON,
- LOG_AUTHPRIV,
- LOG_PID,
- LOG_CONS,
- LOG_ODELAY,
- LOG_NDELAY,
- LOG_NOWAIT,
- LOG_PERROR,
-);
-
-
-$log_variables = array(
- "LOG_EMERG",
- "LOG_ALERT",
- "LOG_CRIT",
- "LOG_ERR",
- "LOG_WARNING",
- "LOG_NOTICE",
- "LOG_INFO",
- "LOG_DEBUG",
- "LOG_KERN",
- "LOG_USER",
- "LOG_MAIL",
- "LOG_DAEMON",
- "LOG_AUTH",
- "LOG_SYSLOG",
- "LOG_LPR",
- "LOG_NEWS",
- "LOG_UUCP",
- "LOG_CRON",
- "LOG_AUTHPRIV",
- "LOG_PID",
- "LOG_CONS",
- "LOG_ODELAY",
- "LOG_NDELAY",
- "LOG_NOWAIT",
- "LOG_PERROR",
-);
-
-error_reporting(E_ALL);
-$failed = false;
-
-// show variables defined
-for ($t = 0; $t < count($log_variables); $t++) {
- if (isset($$log_variables[$t]) === false || $$log_variables[$t] != $log_constants[$t]) {
- $failed = true;
- echo "FAILED: $log_variables[$t] doesn't contain the correct value\n";
- }
-}
-
-if ($failed == false) {
- echo "PASSED\n";
-}
-?>
-===DONE===
---EXPECTF--
-Deprecated: Function define_syslog_variables() is deprecated in %s on line %d
-*** Testing define_syslog_variables() : variation ***
-PASSED
-===DONE===
Deleted: php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation2-win32.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation2-win32.phpt 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation2-win32.phpt 2010-04-12 01:52:55 UTC (rev 297852)
@@ -1,96 +0,0 @@
---TEST--
-Test define_syslog_variables() function : variation
---INI--
-define_syslog_variables = false
---SKIPIF--
-<?php
-if(substr(PHP_OS, 0, 3) != "WIN")
- die("skip Only run on Windows");
-?>
---FILE--
-<?php
-/* Prototype : void define_syslog_variables(void)
- * Description: Initializes all syslog-related variables
- * Source code: ext/standard/syslog.c
- * Alias to functions:
- */
-
-echo "*** Testing define_syslog_variables() : variation ***\n";
-
-$log_constants = array(
- LOG_EMERG,
- LOG_ALERT,
- LOG_CRIT,
- LOG_ERR,
- LOG_WARNING,
- LOG_NOTICE,
- LOG_INFO,
- LOG_DEBUG,
- LOG_KERN,
- LOG_USER,
- LOG_MAIL,
- LOG_DAEMON,
- LOG_AUTH,
- LOG_SYSLOG,
- LOG_LPR,
- LOG_NEWS,
- LOG_UUCP,
- LOG_CRON,
- LOG_AUTHPRIV,
- LOG_PID,
- LOG_CONS,
- LOG_ODELAY,
- LOG_NDELAY,
- LOG_NOWAIT,
- LOG_PERROR,
-);
-
-
-$log_variables = array(
- "LOG_EMERG",
- "LOG_ALERT",
- "LOG_CRIT",
- "LOG_ERR",
- "LOG_WARNING",
- "LOG_NOTICE",
- "LOG_INFO",
- "LOG_DEBUG",
- "LOG_KERN",
- "LOG_USER",
- "LOG_MAIL",
- "LOG_DAEMON",
- "LOG_AUTH",
- "LOG_SYSLOG",
- "LOG_LPR",
- "LOG_NEWS",
- "LOG_UUCP",
- "LOG_CRON",
- "LOG_AUTHPRIV",
- "LOG_PID",
- "LOG_CONS",
- "LOG_ODELAY",
- "LOG_NDELAY",
- "LOG_NOWAIT",
- "LOG_PERROR",
-);
-
-error_reporting(E_ALL);
-$failed = false;
-
-// show variables not defined
-foreach($log_variables as $log_var) {
- if (isset($$log_var)) {
- $failed = true;
- echo "FAILED: variable defined\n";
- }
-}
-
-if ($failed == false) {
- echo "PASSED\n";
-}
-?>
-===DONE===
---EXPECT--
-*** Testing define_syslog_variables() : variation ***
-PASSED
-===DONE===
Deleted: php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation2.phpt 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/ext/standard/tests/network/define_syslog_variables_variation2.phpt 2010-04-12 01:52:55 UTC (rev 297852)
@@ -1,96 +0,0 @@
---TEST--
-Test define_syslog_variables() function : variation
---SKIPIF--
-<?php
-if(substr(PHP_OS, 0, 3) == "WIN")
- die("skip don't run on Windows");
-?>
---INI--
-define_syslog_variables = false
---FILE--
-<?php
-/* Prototype : void define_syslog_variables(void)
- * Description: Initializes all syslog-related variables
- * Source code: ext/standard/syslog.c
- * Alias to functions:
- */
-
-echo "*** Testing define_syslog_variables() : variation ***\n";
-
-$log_constants = array(
- LOG_EMERG,
- LOG_ALERT,
- LOG_CRIT,
- LOG_ERR,
- LOG_WARNING,
- LOG_NOTICE,
- LOG_INFO,
- LOG_DEBUG,
- LOG_KERN,
- LOG_USER,
- LOG_MAIL,
- LOG_DAEMON,
- LOG_AUTH,
- LOG_SYSLOG,
- LOG_LPR,
- LOG_NEWS,
- LOG_UUCP,
- LOG_CRON,
- LOG_AUTHPRIV,
- LOG_PID,
- LOG_CONS,
- LOG_ODELAY,
- LOG_NDELAY,
- LOG_NOWAIT,
- LOG_PERROR,
-);
-
-
-$log_variables = array(
- "LOG_EMERG",
- "LOG_ALERT",
- "LOG_CRIT",
- "LOG_ERR",
- "LOG_WARNING",
- "LOG_NOTICE",
- "LOG_INFO",
- "LOG_DEBUG",
- "LOG_KERN",
- "LOG_USER",
- "LOG_MAIL",
- "LOG_DAEMON",
- "LOG_AUTH",
- "LOG_SYSLOG",
- "LOG_LPR",
- "LOG_NEWS",
- "LOG_UUCP",
- "LOG_CRON",
- "LOG_AUTHPRIV",
- "LOG_PID",
- "LOG_CONS",
- "LOG_ODELAY",
- "LOG_NDELAY",
- "LOG_NOWAIT",
- "LOG_PERROR",
-);
-
-error_reporting(E_ALL);
-$failed = false;
-
-// show variables not defined
-foreach($log_variables as $log_var) {
- if (isset($$log_var)) {
- $failed = true;
- echo "FAILED: variable defined\n";
- }
-}
-
-if ($failed == false) {
- echo "PASSED\n";
-}
-?>
-===DONE===
---EXPECT--
-*** Testing define_syslog_variables() : variation ***
-PASSED
-===DONE===
Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/main/main.c 2010-04-12 01:52:55 UTC (rev 297852)
@@ -425,7 +425,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.bg", HL_BG_COLOR, PHP_INI_ALL, NULL, php_ini_color_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)
@@ -2061,30 +2060,51 @@
/* Check for deprecated directives */
/* NOTE: If you add anything here, remember to add it also in Makefile.global! */
{
- static const char *directives[] = {
- "define_syslog_variables",
- "register_globals",
- "register_long_arrays",
- "safe_mode",
- "magic_quotes_gpc",
- "magic_quotes_runtime",
- "magic_quotes_sybase",
- NULL
+ struct {
+ const long error_level;
+ const char *phrase;
+ const char *directives[7]; /* Remember to change this if the number of directives change */
+ } directives[] = {
+ {
+ E_CORE_WARNING,
+ "Directive '%s' is deprecated in PHP 5.3 and greater",
+ {
+ "register_globals",
+ "register_long_arrays",
+ "safe_mode",
+ "magic_quotes_gpc",
+ "magic_quotes_runtime",
+ "magic_quotes_sybase",
+ NULL
+ }
+ },
+ {
+ E_CORE_ERROR,
+ "Directive '%s' is no longer available in PHP",
+ {
+ "define_syslog_variables",
+ "zend.ze1_compatibility_mode",
+ NULL
+ }
+ }
};
- const char **p = directives;
- long val;
- while (*p) {
- if (cfg_get_long((char*)*p, &val) == SUCCESS && val) {
- zend_error(E_WARNING, "Directive '%s' is deprecated in PHP 5.3 and greater", *p);
+ unsigned int i;
+
+ /* 2 = Count of deprecation structs */
+ for (i = 0; i < 2; i++) {
+ const char **p = directives[i].directives;
+
+ while(*p) {
+ long value;
+
+ if (cfg_get_long((char*)*p, &value) == SUCCESS && value) {
+ zend_error(directives[i].error_level, directives[i].phrase, *p);
+ }
+
+ ++p;
}
- ++p;
}
-
- /* This is not too nice, but since its the only one theres no need for extra stuff here */
- if (cfg_get_long("zend.ze1_compatibility_mode", &val) == SUCCESS && val) {
- zend_error(E_ERROR, "zend.ze1_compatibility_mode is no longer supported in PHP 5.3 and greater");
- }
}
sapi_deactivate(TSRMLS_C);
Modified: php/php-src/trunk/php.ini-development
===================================================================
--- php/php-src/trunk/php.ini-development 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/php.ini-development 2010-04-12 01:52:55 UTC (rev 297852)
@@ -1071,13 +1071,6 @@
;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().
-; http://php.net/define-syslog-variables
-define_syslog_variables = Off
-
[mail function]
; For Win32 only.
; http://php.net/smtp
Modified: php/php-src/trunk/php.ini-production
===================================================================
--- php/php-src/trunk/php.ini-production 2010-04-12 01:31:13 UTC (rev 297851)
+++ php/php-src/trunk/php.ini-production 2010-04-12 01:52:55 UTC (rev 297852)
@@ -1071,13 +1071,6 @@
;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().
-; http://php.net/define-syslog-variables
-define_syslog_variables = Off
-
[mail function]
; For Win32 only.
; http://php.net/smtp
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
