dmitry                                   Mon, 21 Sep 2009 09:52:19 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=288515

Log:
Fixed tests

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt
    U   php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_make.phpt
    U   php/php-src/branches/PHP_5_3/ext/exif/tests/exif006.phpt
    U   php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt
    U   php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt
    U   php/php-src/branches/PHP_5_3/ext/pcre/tests/bug33200.phpt
    U   php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access.phpt
    U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_modes.phpt
    U   
php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_wrongparams.phpt
    U   php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_safemode.phpt
    U   php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mkfifo_safemode.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/001.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/003.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/004.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/005.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/006.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/007.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/008-php4.2.3.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/009.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/012.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/013.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt
    U   php/php-src/branches/PHP_5_3/ext/session/tests/019.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error1.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error2.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/misc/syslog_vars_variation1.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation.phpt
    U   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt
    U   php/php-src/branches/PHP_5_3/main/main.c
    U   php/php-src/branches/PHP_5_3/tests/basic/bug46313-win.phpt
    U   php/php-src/branches/PHP_5_3/tests/basic/bug46313.phpt

Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic001.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -27,7 +27,7 @@
 var_dump( $curl_content );
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
 *** Testing curl_setopt with CURLOPT_FOLLOWLOCATION in safemode

 Warning: curl_setopt(): CURLOPT_FOLLOWLOCATION cannot be activated when in safe_mode or an open_basedir is set in %s on line %d

Modified: php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_make.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_make.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/dba/tests/dba_cdb_make.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -33,7 +33,7 @@
 	}
 ?>
 --EXPECT--
-PHP Warning:  Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
 database handler: cdb_make
 string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"
 string(32) "12fc5ba2b9dcfef2480e5324eeb5f3e5"

Modified: php/php-src/branches/PHP_5_3/ext/exif/tests/exif006.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/exif/tests/exif006.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/exif/tests/exif006.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -20,7 +20,7 @@
 var_dump(exif_read_data(dirname(__FILE__).'/test6.jpg','',true,false));
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'magic_quotes_runtime' is deprecated in PHP 5.3 and greater in Unknown on line 0
 array(5) {
   ["FILE"]=>
   array(6) {

Modified: php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/filter/tests/bug39763.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -12,6 +12,6 @@
 echo $val . "\n";
 ?>
 --EXPECT--
-PHP Warning:  Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
 \"probably a bug\"
 \"probably a bug\"
\ No newline at end of file

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/oci8safemode.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -15,7 +15,7 @@
 echo "Done\n";
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0

 Warning: oci_connect(): Privileged connect is disabled in Safe Mode in %s on line %d


Modified: php/php-src/branches/PHP_5_3/ext/pcre/tests/bug33200.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pcre/tests/bug33200.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/pcre/tests/bug33200.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -9,5 +9,5 @@
 echo $str . "\r\n";
 ?>
 --EXPECT--
-PHP Warning:  Directive 'magic_quotes_sybase' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'magic_quotes_sybase' is deprecated in PHP 5.3 and greater in Unknown on line 0
 SOME '$SAMPLE' TEXT

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -43,7 +43,7 @@
 unlink($filename);
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
+Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
 bool(true)
 bool(true)
 bool(true)

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_modes.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_modes.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_modes.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -37,7 +37,7 @@
 unlink($filename);
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line %d
+Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line %d
 bool(false)
 bool(false)
 bool(false)

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_wrongparams.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_wrongparams.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_error_wrongparams.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -28,7 +28,7 @@
 ?>
 ===DONE===
 --EXPECTF--
-PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0

 Warning: posix_access() expects at least 1 parameter, 0 given in %s on line %d
 bool(false)

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_safemode.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_safemode.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_access_safemode.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -19,6 +19,6 @@
 ?>
 ===DONE===
 --EXPECTF--
-PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
+Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
 bool(false)
 ===DONE===

Modified: php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mkfifo_safemode.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mkfifo_safemode.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/posix/tests/posix_mkfifo_safemode.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -36,7 +36,7 @@
 rmdir($dir);
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d
+Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in %s on line %d

 Warning: posix_mkfifo(): SAFE MODE Restriction in effect.  The script whose uid is %d is not allowed to access /tmp owned by uid %d in %s on line %d
 bool(false)

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/001.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/001.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/001.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -31,7 +31,7 @@

 session_destroy();
 --EXPECTF--
-PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0

 Deprecated: Function session_register() is deprecated in %s on line %d


Modified: php/php-src/branches/PHP_5_3/ext/session/tests/003.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/003.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/003.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -28,7 +28,7 @@
 var_dump($arr);
 session_destroy();
 --EXPECT--
-PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
 object(foo)#1 (2) {
   ["bar"]=>
   string(2) "ok"

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/004.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/004.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/004.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -73,7 +73,7 @@
 session_destroy();
 ?>
 --EXPECT--
-PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
 OPEN: PHPSESSID
 READ: abtest
 object(foo)#2 (2) {

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/005.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/005.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/005.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -85,7 +85,7 @@
 session_destroy();
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
 OPEN: PHPSESSID
 READ: abtest
 object(foo)#2 (2) {

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/006.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/006.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/006.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -45,7 +45,7 @@
 var_dump($a,$b);
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
 original values:
 object(a)#%d (1) {
   ["test"]=>

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/007.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/007.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/007.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -50,9 +50,10 @@
 session_destroy();
 ?>
 --EXPECTF--
-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
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0

+Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
+
 Deprecated: Function session_register() is deprecated in %s on line %d
 float(3.14)
 array(1) {

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/008-php4.2.3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/008-php4.2.3.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/008-php4.2.3.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -58,7 +58,7 @@
 session_destroy();
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
 NULL
 session_write_close(): Your script possibly relies on a session side-effect which existed until PHP 4.2.3. Please be advised that the session extension does not consider global variables as a source of data, unless register_globals is enabled. You can disable this functionality and this warning by setting session.bug_compat_42 or session.bug_compat_warn to off, respectively
 array(1) {

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/009.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/009.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/009.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -43,7 +43,7 @@
 session_destroy();
 ?>
 --EXPECT--
-PHP Warning:  Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
 array(0) {
 }
 array(1) {

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/012.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/012.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/012.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -32,7 +32,7 @@
 print "I live\n";
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0

 Deprecated: Function session_register() is deprecated in %s on line %d
 I live

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/013.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/013.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/013.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -24,5 +24,5 @@
 print "I live\n";
 ?>
 --EXPECT--
-PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
 I live

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/014.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -33,7 +33,7 @@
 session_destroy();
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
 <a href="/link?PHPSESSID=abtest">

 Warning: ini_set(): A session is active. You cannot change the session module's ini settings at this time in %s on line %d

Modified: php/php-src/branches/PHP_5_3/ext/session/tests/019.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/session/tests/019.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/session/tests/019.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -47,7 +47,7 @@
 session_destroy();
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0

 Deprecated: Function session_register() is deprecated in %s on line %d
 array(2) {

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/get_cfg_var_variation8.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -14,7 +14,7 @@

 ?>
 --EXPECTF--
-PHP Warning:  Directive 'register_globals' is deprecated in PHP 5.3 and greater in %s on line 0
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in %s on line 0
 *** Test by calling method or function with deprecated option ***
 string(1) "1"


Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error1.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error1.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -16,7 +16,7 @@
 ?>
 ==DONE==
 --EXPECTF--
-PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0

 Warning: putenv(): Safe Mode warning: Cannot set environment variable 'FOO' - it's not in the allowed list in %s on line %d


Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error2.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/putenv_error2.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -12,7 +12,7 @@
 ?>
 ==DONE==
 --EXPECTF--
-PHP Warning:  Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'safe_mode' is deprecated in PHP 5.3 and greater in Unknown on line 0

 Warning: putenv(): Safe Mode warning: Cannot override protected environment variable 'FOO' in %s on line %d


Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/misc/syslog_vars_variation1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/misc/syslog_vars_variation1.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/misc/syslog_vars_variation1.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -7,5 +7,5 @@
 var_dump(isset($LOG_ERR));
 ?>
 --EXPECTF--
-PHP Warning:  Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
 bool(true)

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation-win32.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -94,4 +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
+Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/network/define_syslog_variables_variation.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -91,7 +91,7 @@
 ?>
 ===DONE===
 --EXPECT--
-PHP Warning:  Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'define_syslog_variables' is deprecated in PHP 5.3 and greater in Unknown on line 0
 *** Testing define_syslog_variables() : variation ***
 PASSED
 ===DONE===

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/parse_str_basic3.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -91,7 +91,7 @@
 ?>
 ===DONE===
 --EXPECTF--
-PHP Warning:  Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0
 *** Testing parse_str() : basic functionality ***

 Test string with array values

Modified: php/php-src/branches/PHP_5_3/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/main.c	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/main/main.c	2009-09-21 09:52:19 UTC (rev 288515)
@@ -2015,11 +2015,7 @@
 #endif

 	module_initialized = 1;
-	sapi_deactivate(TSRMLS_C);
-	module_startup = 0;

-	shutdown_memory_manager(1, 0 TSRMLS_CC);
-
 	/* Check for deprecated directives */
 	{
 		static const char *directives[] = {
@@ -2047,7 +2043,12 @@
 			zend_error(E_ERROR, "zend.ze1_compatibility_mode is no longer supported in PHP 5.3 and greater");
 		}
 	}
+
+	sapi_deactivate(TSRMLS_C);
+	module_startup = 0;

+	shutdown_memory_manager(1, 0 TSRMLS_CC);
+
 	/* we're done */
 	return SUCCESS;
 }

Modified: php/php-src/branches/PHP_5_3/tests/basic/bug46313-win.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/basic/bug46313-win.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/tests/basic/bug46313-win.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -60,6 +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
+Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0
+Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0


Modified: php/php-src/branches/PHP_5_3/tests/basic/bug46313.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/basic/bug46313.phpt	2009-09-21 09:35:23 UTC (rev 288514)
+++ php/php-src/branches/PHP_5_3/tests/basic/bug46313.phpt	2009-09-21 09:52:19 UTC (rev 288515)
@@ -6,6 +6,7 @@
 magic_quotes_gpc=1
 file_uploads=1
 register_globals=1
+display_errors=0
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737
 -----------------------------20896060251896012921717172737
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to