kalle Mon May 4 21:18:22 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/php-src/ext/filter/tests bug39763.phpt bug42718-2.phpt
/php-src/ext/pcre/tests bug33200.phpt
/php-src/ext/session/tests 001.phpt 003.phpt 004.phpt 005.phpt
006.phpt 007.phpt 008-php4.2.3.phpt
009.phpt 012.phpt 013.phpt 014.phpt
019.phpt
/php-src/ext/standard/tests/general_functions putenv_error1.phpt
putenv_error2.phpt
/php-src/ext/standard/tests/misc syslog_vars_variation1.phpt
/php-src/ext/standard/tests/network
define_syslog_variables_variation-win32.phpt
/php-src/main main.c
/php-src/tests/basic bug46313-win.phpt
/php-src/tests/security magic_quotes_gpc.phpt
Log:
Added E_DEPRECATED startup notice (5.3 only)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.582&r2=1.2027.2.547.2.965.2.583&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.582
php-src/NEWS:1.2027.2.547.2.965.2.583
--- php-src/NEWS:1.2027.2.547.2.965.2.582 Mon May 4 21:11:40 2009
+++ php-src/NEWS Mon May 4 21:18:21 2009
@@ -1,4 +1,4 @@
-PHP NEWS
+PHP
NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 200?, PHP 5.3.0 RC 2
- Upgraded bundled sqlite to version 3.6.13. (Ilia)
@@ -26,6 +26,7 @@
disable this behaviour using "http"=>array("auto_decode"=>0) in stream
context. (Dmitry)
- Added ability to throw exceptions from SQLite3 instead of warnings. (Scott)
+- Added startup notices for deprecated ini settings. (Kalle)
- Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)
- Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug39763.phpt?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u
Index: php-src/ext/filter/tests/bug39763.phpt
diff -u php-src/ext/filter/tests/bug39763.phpt:1.1.2.3
php-src/ext/filter/tests/bug39763.phpt:1.1.2.3.2.1
--- php-src/ext/filter/tests/bug39763.phpt:1.1.2.3 Mon May 7 18:03:01 2007
+++ php-src/ext/filter/tests/bug39763.phpt Mon May 4 21:18:21 2009
@@ -14,3 +14,4 @@
--EXPECT--
\"probably a bug\"
\"probably a bug\"
+PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and
greater in Unknown on line 0
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug42718-2.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/filter/tests/bug42718-2.phpt
diff -u php-src/ext/filter/tests/bug42718-2.phpt:1.1.4.2
php-src/ext/filter/tests/bug42718-2.phpt:1.1.4.3
--- php-src/ext/filter/tests/bug42718-2.phpt:1.1.4.2 Sun Nov 2 22:22:43 2008
+++ php-src/ext/filter/tests/bug42718-2.phpt Mon May 4 21:18:21 2009
@@ -18,3 +18,4 @@
unsafe_raw
1\0
+PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug33200.phpt?r1=1.1&r2=1.1.10.1&diff_format=u
Index: php-src/ext/pcre/tests/bug33200.phpt
diff -u php-src/ext/pcre/tests/bug33200.phpt:1.1
php-src/ext/pcre/tests/bug33200.phpt:1.1.10.1
--- php-src/ext/pcre/tests/bug33200.phpt:1.1 Tue May 31 12:54:56 2005
+++ php-src/ext/pcre/tests/bug33200.phpt Mon May 4 21:18:21 2009
@@ -6,7 +6,8 @@
<?php
$str = 'some \'$sample\' text';
$str = preg_replace("/(some.*text)/e", "strtoupper('\\1')", $str);
-echo $str;
+echo $str . "\r\n";
?>
--EXPECT--
SOME '$SAMPLE' TEXT
+PHP Warning: Directive 'magic_quotes_sybase' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/001.phpt?r1=1.12.6.1&r2=1.12.6.2&diff_format=u
Index: php-src/ext/session/tests/001.phpt
diff -u php-src/ext/session/tests/001.phpt:1.12.6.1
php-src/ext/session/tests/001.phpt:1.12.6.2
--- php-src/ext/session/tests/001.phpt:1.12.6.1 Tue Dec 9 14:03:58 2008
+++ php-src/ext/session/tests/001.phpt Mon May 4 21:18:21 2009
@@ -35,4 +35,4 @@
Deprecated: Function session_register() is deprecated in %s on line %d
baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";s:4:"done";}}
-
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/003.phpt?r1=1.14&r2=1.14.6.1&diff_format=u
Index: php-src/ext/session/tests/003.phpt
diff -u php-src/ext/session/tests/003.phpt:1.14
php-src/ext/session/tests/003.phpt:1.14.6.1
--- php-src/ext/session/tests/003.phpt:1.14 Mon Jul 4 13:09:14 2005
+++ php-src/ext/session/tests/003.phpt Mon May 4 21:18:21 2009
@@ -43,3 +43,4 @@
int(2)
}
}
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/004.phpt?r1=1.16.6.1&r2=1.16.6.1.2.1&diff_format=u
Index: php-src/ext/session/tests/004.phpt
diff -u php-src/ext/session/tests/004.phpt:1.16.6.1
php-src/ext/session/tests/004.phpt:1.16.6.1.2.1
--- php-src/ext/session/tests/004.phpt:1.16.6.1 Thu Aug 23 11:42:21 2007
+++ php-src/ext/session/tests/004.phpt Mon May 4 21:18:21 2009
@@ -109,3 +109,4 @@
}
}
DESTROY: abtest
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/005.phpt?r1=1.14.8.1&r2=1.14.8.2&diff_format=u
Index: php-src/ext/session/tests/005.phpt
diff -u php-src/ext/session/tests/005.phpt:1.14.8.1
php-src/ext/session/tests/005.phpt:1.14.8.2
--- php-src/ext/session/tests/005.phpt:1.14.8.1 Tue Dec 9 14:03:58 2008
+++ php-src/ext/session/tests/005.phpt Mon May 4 21:18:21 2009
@@ -146,3 +146,4 @@
int(123)
DESTROY: abtest
CLOSE
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/006.phpt?r1=1.14.6.1&r2=1.14.6.2&diff_format=u
Index: php-src/ext/session/tests/006.phpt
diff -u php-src/ext/session/tests/006.phpt:1.14.6.1
php-src/ext/session/tests/006.phpt:1.14.6.2
--- php-src/ext/session/tests/006.phpt:1.14.6.1 Tue Dec 9 14:03:58 2008
+++ php-src/ext/session/tests/006.phpt Mon May 4 21:18:21 2009
@@ -77,3 +77,4 @@
string(5) "hallo"
}
}
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/007.phpt?r1=1.9.4.1.2.1&r2=1.9.4.1.2.2&diff_format=u
Index: php-src/ext/session/tests/007.phpt
diff -u php-src/ext/session/tests/007.phpt:1.9.4.1.2.1
php-src/ext/session/tests/007.phpt:1.9.4.1.2.2
--- php-src/ext/session/tests/007.phpt:1.9.4.1.2.1 Tue Dec 9 14:03:58 2008
+++ php-src/ext/session/tests/007.phpt Mon May 4 21:18:21 2009
@@ -61,3 +61,5 @@
["c"]=>
&float(3.14)
}
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
+PHP Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/008-php4.2.3.phpt?r1=1.7.4.2.2.1&r2=1.7.4.2.2.2&diff_format=u
Index: php-src/ext/session/tests/008-php4.2.3.phpt
diff -u php-src/ext/session/tests/008-php4.2.3.phpt:1.7.4.2.2.1
php-src/ext/session/tests/008-php4.2.3.phpt:1.7.4.2.2.2
--- php-src/ext/session/tests/008-php4.2.3.phpt:1.7.4.2.2.1 Wed Aug 6
05:53:31 2008
+++ php-src/ext/session/tests/008-php4.2.3.phpt Mon May 4 21:18:21 2009
@@ -69,3 +69,4 @@
["c"]=>
float(3.14)
}
+PHP Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/009.phpt?r1=1.5&r2=1.5.6.1&diff_format=u
Index: php-src/ext/session/tests/009.phpt
diff -u php-src/ext/session/tests/009.phpt:1.5
php-src/ext/session/tests/009.phpt:1.5.6.1
--- php-src/ext/session/tests/009.phpt:1.5 Mon Jul 4 13:09:14 2005
+++ php-src/ext/session/tests/009.phpt Mon May 4 21:18:21 2009
@@ -57,3 +57,4 @@
}
array(0) {
}
+PHP Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/012.phpt?r1=1.4.6.1&r2=1.4.6.2&diff_format=u
Index: php-src/ext/session/tests/012.phpt
diff -u php-src/ext/session/tests/012.phpt:1.4.6.1
php-src/ext/session/tests/012.phpt:1.4.6.2
--- php-src/ext/session/tests/012.phpt:1.4.6.1 Tue Dec 9 14:03:58 2008
+++ php-src/ext/session/tests/012.phpt Mon May 4 21:18:21 2009
@@ -34,3 +34,4 @@
--EXPECTF--
Deprecated: Function session_register() is deprecated in %s on line %d
I live
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/013.phpt?r1=1.4&r2=1.4.6.1&diff_format=u
Index: php-src/ext/session/tests/013.phpt
diff -u php-src/ext/session/tests/013.phpt:1.4
php-src/ext/session/tests/013.phpt:1.4.6.1
--- php-src/ext/session/tests/013.phpt:1.4 Mon Jul 4 13:09:14 2005
+++ php-src/ext/session/tests/013.phpt Mon May 4 21:18:21 2009
@@ -25,3 +25,4 @@
?>
--EXPECT--
I live
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/014.phpt?r1=1.7.6.1&r2=1.7.6.2&diff_format=u
Index: php-src/ext/session/tests/014.phpt
diff -u php-src/ext/session/tests/014.phpt:1.7.6.1
php-src/ext/session/tests/014.phpt:1.7.6.2
--- php-src/ext/session/tests/014.phpt:1.7.6.1 Wed Aug 6 05:53:31 2008
+++ php-src/ext/session/tests/014.phpt Mon May 4 21:18:21 2009
@@ -40,3 +40,4 @@
Warning: ini_set(): A session is active. You cannot change the session
module's ini settings at this time in %s on line %d
<a href="/link?PHPSESSID=abtest">
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/session/tests/019.phpt?r1=1.10.6.1&r2=1.10.6.2&diff_format=u
Index: php-src/ext/session/tests/019.phpt
diff -u php-src/ext/session/tests/019.phpt:1.10.6.1
php-src/ext/session/tests/019.phpt:1.10.6.2
--- php-src/ext/session/tests/019.phpt:1.10.6.1 Tue Dec 9 14:03:58 2008
+++ php-src/ext/session/tests/019.phpt Mon May 4 21:18:21 2009
@@ -72,3 +72,4 @@
int(44)
}
}
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/putenv_error1.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/putenv_error1.phpt
diff -u php-src/ext/standard/tests/general_functions/putenv_error1.phpt:1.1.2.1
php-src/ext/standard/tests/general_functions/putenv_error1.phpt:1.1.2.2
--- php-src/ext/standard/tests/general_functions/putenv_error1.phpt:1.1.2.1
Thu Jun 12 22:36:43 2008
+++ php-src/ext/standard/tests/general_functions/putenv_error1.phpt Mon May
4 21:18:21 2009
@@ -22,3 +22,4 @@
it worked
it worked
==DONE==
+PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in
Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/putenv_error2.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/general_functions/putenv_error2.phpt
diff -u php-src/ext/standard/tests/general_functions/putenv_error2.phpt:1.1.2.1
php-src/ext/standard/tests/general_functions/putenv_error2.phpt:1.1.2.2
--- php-src/ext/standard/tests/general_functions/putenv_error2.phpt:1.1.2.1
Thu Jun 12 22:36:43 2008
+++ php-src/ext/standard/tests/general_functions/putenv_error2.phpt Mon May
4 21:18:21 2009
@@ -16,3 +16,4 @@
Warning: putenv(): Safe Mode warning: Cannot override protected environment
variable 'BAZ' in %s on line %d
==DONE==
+PHP Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in
Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt
diff -u php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt:1.1.2.1
php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt:1.1.2.2
--- php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt:1.1.2.1 Wed Nov
5 09:58:51 2008
+++ php-src/ext/standard/tests/misc/syslog_vars_variation1.phpt Mon May 4
21:18:21 2009
@@ -8,3 +8,4 @@
?>
--EXPECTF--
bool(true)
+PHP Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index:
php-src/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt
diff -u
php-src/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt:1.1.2.1
php-src/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt:1.1.2.2
---
php-src/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt:1.1.2.1
Fri Jan 23 15:34:19 2009
+++
php-src/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt
Mon May 4 21:18:21 2009
@@ -94,3 +94,4 @@
*** Testing define_syslog_variables() : variation ***
PASSED
===DONE===
+PHP Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and
greater in Unknown on line 0
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.51&r2=1.640.2.23.2.57.2.52&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.51
php-src/main/main.c:1.640.2.23.2.57.2.52
--- php-src/main/main.c:1.640.2.23.2.57.2.51 Mon May 4 19:55:47 2009
+++ php-src/main/main.c Mon May 4 21:18:21 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.57.2.51 2009/05/04 19:55:47 derick Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.52 2009/05/04 21:18:21 kalle Exp $ */
/* {{{ includes
*/
@@ -1901,17 +1901,28 @@
/* Check for deprecated directives */
{
static const char *directives[] = {
- "zend.ze1_compatibility_mode",
+ "define_syslog_variables",
+ "register_globals",
+ "register_long_arrays",
+ "safe_mode",
+ "magic_quotes_gpc",
+ "magic_quotes_runtime",
+ "magic_quotes_sybase",
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 no
longer supported in PHP 5.3 and greater", *p);
+ zend_error(E_WARNING, "Directive '%s' is
deprecated in PHP 5.3 and greater", *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");
+ }
}
/* Register PHP core ini entries */
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug46313-win.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/tests/basic/bug46313-win.phpt
diff -u php-src/tests/basic/bug46313-win.phpt:1.1.2.1
php-src/tests/basic/bug46313-win.phpt:1.1.2.2
--- php-src/tests/basic/bug46313-win.phpt:1.1.2.1 Mon Oct 20 17:09:10 2008
+++ php-src/tests/basic/bug46313-win.phpt Mon May 4 21:18:21 2009
@@ -60,3 +60,6 @@
bool(true)
string(%d) "%s"
bool(true)
+PHP Warning: Directive 'register_globals' is deprecated in PHP 5.3 and
greater in Unknown on line 0
+PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and
greater in Unknown on line 0
+
http://cvs.php.net/viewvc.cgi/php-src/tests/security/magic_quotes_gpc.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/tests/security/magic_quotes_gpc.phpt
diff -u php-src/tests/security/magic_quotes_gpc.phpt:1.1.2.1
php-src/tests/security/magic_quotes_gpc.phpt:1.1.2.2
--- php-src/tests/security/magic_quotes_gpc.phpt:1.1.2.1 Thu Dec 11
13:05:52 2008
+++ php-src/tests/security/magic_quotes_gpc.phpt Mon May 4 21:18:22 2009
@@ -10,3 +10,4 @@
?>
--EXPECT--
abc\'\"\0123
+PHP Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and
greater in Unknown on line 0
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
