[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/basic/bug51709_1.phpt branches/PHP_5_4/tests/basic/bug51709_1.phpt trunk/tests/basic/bug51709_1.phpt
pajoye Thu, 01 Sep 2011 11:40:23 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315970 Log: - consider that bison 2.x is used. updated our ci boxes accordingly (windows too), which were using 1.4 Changed paths: U php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt U php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt U php/php-src/trunk/tests/basic/bug51709_1.phpt Modified: php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt === --- php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt2011-09-01 11:27:14 UTC (rev 315969) +++ php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt2011-09-01 11:40:23 UTC (rev 315970) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: %s error, %s(T_STRING)%s in %sbug51709_1.php on line %d +Parse error: syntax error, unexpected 'for' (T_FOR), expecting identifier (T_STRING) in %sbug51709_1.php on line %d Modified: php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt === --- php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt2011-09-01 11:27:14 UTC (rev 315969) +++ php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt2011-09-01 11:40:23 UTC (rev 315970) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: %s error, %s(T_STRING)%s in %sbug51709_1.php on line %d +Parse error: syntax error, unexpected 'for' (T_FOR), expecting identifier (T_STRING) in %sbug51709_1.php on line %d Modified: php/php-src/trunk/tests/basic/bug51709_1.phpt === --- php/php-src/trunk/tests/basic/bug51709_1.phpt 2011-09-01 11:27:14 UTC (rev 315969) +++ php/php-src/trunk/tests/basic/bug51709_1.phpt 2011-09-01 11:40:23 UTC (rev 315970) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: %s error, %s(T_STRING)%s in %sbug51709_1.php on line %d +Parse error: syntax error, unexpected 'for' (T_FOR), expecting identifier (T_STRING) in %sbug51709_1.php on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/basic/bug51709_2.phpt branches/PHP_5_4/tests/basic/bug51709_2.phpt trunk/tests/basic/bug51709_2.phpt
pajoye Thu, 01 Sep 2011 11:40:37 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315971 Log: - consider that bison 2.x is used. updated our ci boxes accordingly (windows too), which were using 1.4 Changed paths: U php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt U php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt U php/php-src/trunk/tests/basic/bug51709_2.phpt Modified: php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt === --- php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt2011-09-01 11:40:23 UTC (rev 315970) +++ php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt2011-09-01 11:40:37 UTC (rev 315971) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: %s error, %s(T_STRING)%s in %sbug51709_2.php on line %d +Parse error: syntax error, unexpected 'goto' (T_GOTO), expecting identifier (T_STRING) in %sbug51709_2.php on line %d Modified: php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt === --- php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt2011-09-01 11:40:23 UTC (rev 315970) +++ php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt2011-09-01 11:40:37 UTC (rev 315971) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: %s error, %s(T_STRING)%s in %sbug51709_2.php on line %d +Parse error: syntax error, unexpected 'goto' (T_GOTO), expecting identifier (T_STRING) in %sbug51709_2.php on line %d Modified: php/php-src/trunk/tests/basic/bug51709_2.phpt === --- php/php-src/trunk/tests/basic/bug51709_2.phpt 2011-09-01 11:40:23 UTC (rev 315970) +++ php/php-src/trunk/tests/basic/bug51709_2.phpt 2011-09-01 11:40:37 UTC (rev 315971) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: %s error, %s(T_STRING)%s in %sbug51709_2.php on line %d +Parse error: syntax error, unexpected 'goto' (T_GOTO), expecting identifier (T_STRING) in %sbug51709_2.php on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/run-test/test010.phpt branches/PHP_5_4/tests/run-test/test010.phpt trunk/tests/run-test/test010.phpt
pajoye Thu, 01 Sep 2011 12:35:41 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315978 Log: - force LF eol style as this test depends on it Changed paths: _U php/php-src/branches/PHP_5_3/tests/run-test/test010.phpt _U php/php-src/branches/PHP_5_4/tests/run-test/test010.phpt _U php/php-src/trunk/tests/run-test/test010.phpt Property changes on: php/php-src/branches/PHP_5_3/tests/run-test/test010.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/tests/run-test/test010.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/tests/run-test/test010.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/security/open_basedir_glob.phpt branches/PHP_5_4/tests/security/open_basedir_glob-win32.phpt branches/PHP_5_4/tests/security/open_basedir_glob.phpt
pajoye Thu, 01 Sep 2011 12:42:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315979
Log:
- win and nux work the same way
Changed paths:
U php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob.phpt
D php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob-win32.phpt
U php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob.phpt
U php/php-src/trunk/tests/security/open_basedir_glob.phpt
Modified: php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob.phpt
===
--- php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob.phpt
2011-09-01 12:35:41 UTC (rev 315978)
+++ php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob.phpt
2011-09-01 12:42:54 UTC (rev 315979)
@@ -1,11 +1,5 @@
--TEST--
Test open_basedir configuration
---SKIPIF--
-?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-die('skip Not for Windows variation');
-}
-?
--INI--
open_basedir=.
--FILE--
Deleted:
php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob-win32.phpt
===
--- php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob-win32.phpt
2011-09-01 12:35:41 UTC (rev 315978)
+++ php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob-win32.phpt
2011-09-01 12:42:54 UTC (rev 315979)
@@ -1,59 +0,0 @@
---TEST--
-Test open_basedir configuration
---SKIPIF--
-?php
-if (substr(PHP_OS, 0, 3) != 'WIN') {
-die('skip Windows only variation');
-}
-?
---INI--
-open_basedir=.
---FILE--
-?php
-require_once open_basedir.inc;
-test_open_basedir(glob);
-?
---CLEAN--
-?php
-require_once open_basedir.inc;
-delete_directories();
-?
---EXPECTF--
-*** Testing open_basedir configuration [glob] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(false)
-array(0) {
-}
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-array(1) {
- [0]=
- string(5) ../ok
-}
-array(1) {
- [0]=
- string(6) ok.txt
-}
-array(1) {
- [0]=
- string(12) ../ok/ok.txt
-}
-array(1) {
- [0]=
- string(%d) %s/test/ok/ok.txt
-}
-array(1) {
- [0]=
- string(%d) %s/test/ok/../ok/ok.txt
-}
-*** Finished testing open_basedir configuration [glob] ***
-
Modified: php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob.phpt
===
--- php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob.phpt
2011-09-01 12:35:41 UTC (rev 315978)
+++ php/php-src/branches/PHP_5_4/tests/security/open_basedir_glob.phpt
2011-09-01 12:42:54 UTC (rev 315979)
@@ -1,11 +1,5 @@
--TEST--
Test open_basedir configuration
---SKIPIF--
-?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-die('skip Not for Windows variation');
-}
-?
--INI--
open_basedir=.
--FILE--
Modified: php/php-src/trunk/tests/security/open_basedir_glob.phpt
===
--- php/php-src/trunk/tests/security/open_basedir_glob.phpt 2011-09-01
12:35:41 UTC (rev 315978)
+++ php/php-src/trunk/tests/security/open_basedir_glob.phpt 2011-09-01
12:42:54 UTC (rev 315979)
@@ -1,11 +1,5 @@
--TEST--
Test open_basedir configuration
---SKIPIF--
-?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-die('skip Not for Windows variation');
-}
-?
--INI--
open_basedir=.
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/tests/security/ open_basedir_glob-win32.phpt
pajoye Thu, 01 Sep 2011 12:43:12 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315980
Log:
- win and nux work the same way
Changed paths:
D php/php-src/trunk/tests/security/open_basedir_glob-win32.phpt
Deleted: php/php-src/trunk/tests/security/open_basedir_glob-win32.phpt
===
--- php/php-src/trunk/tests/security/open_basedir_glob-win32.phpt
2011-09-01 12:42:54 UTC (rev 315979)
+++ php/php-src/trunk/tests/security/open_basedir_glob-win32.phpt
2011-09-01 12:43:12 UTC (rev 315980)
@@ -1,59 +0,0 @@
---TEST--
-Test open_basedir configuration
---SKIPIF--
-?php
-if (substr(PHP_OS, 0, 3) != 'WIN') {
-die('skip Windows only variation');
-}
-?
---INI--
-open_basedir=.
---FILE--
-?php
-require_once open_basedir.inc;
-test_open_basedir(glob);
-?
---CLEAN--
-?php
-require_once open_basedir.inc;
-delete_directories();
-?
---EXPECTF--
-*** Testing open_basedir configuration [glob] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(false)
-array(0) {
-}
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-array(1) {
- [0]=
- string(5) ../ok
-}
-array(1) {
- [0]=
- string(6) ok.txt
-}
-array(1) {
- [0]=
- string(12) ../ok/ok.txt
-}
-array(1) {
- [0]=
- string(%d) %s/test/ok/ok.txt
-}
-array(1) {
- [0]=
- string(%d) %s/test/ok/../ok/ok.txt
-}
-*** Finished testing open_basedir configuration [glob] ***
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/tests/security/open_basedir_parse_ini_file.phpt trunk/tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 01 Sep 2011 12:49:26 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315981
Log:
- fix test
Changed paths:
U
php/php-src/branches/PHP_5_4/tests/security/open_basedir_parse_ini_file.phpt
U php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt
Modified: php/php-src/branches/PHP_5_4/tests/security/open_basedir_parse_ini_file.phpt
===
--- php/php-src/branches/PHP_5_4/tests/security/open_basedir_parse_ini_file.phpt 2011-09-01 12:43:12 UTC (rev 315980)
+++ php/php-src/branches/PHP_5_4/tests/security/open_basedir_parse_ini_file.phpt 2011-09-01 12:49:26 UTC (rev 315981)
@@ -37,46 +37,39 @@
bool(true)
bool(true)
-Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test\bad) is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test\bad) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 6
-Warning: parse_ini_file(%s\test\bad): failed to open stream: %s in %s on line %d
-array(0) {
-}
+Warning: parse_ini_file(G:\php-sdk\php-src\branches\PHP_5_4\test\bad): failed to open stream: Operation not permitted in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 6
+bool(false)
-Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test\bad\bad.txt) is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test\bad\bad.txt) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 7
-Warning: parse_ini_file(%s\test\bad\bad.txt): failed to open stream: %s in %s on line %d
-array(0) {
-}
+Warning: parse_ini_file(G:\php-sdk\php-src\branches\PHP_5_4\test\bad\bad.txt): failed to open stream: Operation not permitted in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 7
+bool(false)
-Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test) is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 8
-Warning: parse_ini_file(%s\test): failed to open stream: %s in %s on line %d
-array(0) {
-}
+Warning: parse_ini_file(G:\php-sdk\php-src\branches\PHP_5_4\test): failed to open stream: Operation not permitted in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 8
+bool(false)
-Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test) is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 9
-Warning: parse_ini_file(%s\test): failed to open stream: %s in %s on line %d
-array(0) {
-}
+Warning: parse_ini_file(G:\php-sdk\php-src\branches\PHP_5_4\test): failed to open stream: Operation not permitted in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 9
+bool(false)
-Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test\bad) is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test\bad) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 10
-Warning: parse_ini_file(%s\test\bad): failed to open stream: %s in %s on line %d
-array(0) {
-}
+Warning: parse_ini_file(G:\php-sdk\php-src\branches\PHP_5_4\test\bad): failed to open stream: Operation not permitted in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 10
+bool(false)
-Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test\bad\bad.txt) is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test\bad\bad.txt) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 11
-Warning: parse_ini_file(%s\test\bad\bad.txt): failed to open stream: %s in %s on line %d
-array(0) {
-}
+Warning: parse_ini_file(G:\php-sdk\php-src\branches\PHP_5_4\test\bad\bad.txt): failed to open stream: Operation not permitted in
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/tests/security/open_basedir_parse_ini_file.phpt trunk/tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 01 Sep 2011 13:28:00 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315987 Log: - use %s, bad c/p Changed paths: U php/php-src/branches/PHP_5_4/tests/security/open_basedir_parse_ini_file.phpt U php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt Modified: php/php-src/branches/PHP_5_4/tests/security/open_basedir_parse_ini_file.phpt === --- php/php-src/branches/PHP_5_4/tests/security/open_basedir_parse_ini_file.phpt 2011-09-01 13:27:14 UTC (rev 315986) +++ php/php-src/branches/PHP_5_4/tests/security/open_basedir_parse_ini_file.phpt 2011-09-01 13:28:00 UTC (rev 315987) @@ -37,39 +37,39 @@ bool(true) bool(true) -Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test\bad) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 6 +Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest\bad) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 6 -Warning: parse_ini_file(G:\php-sdk\php-src\branches\PHP_5_4\test\bad): failed to open stream: Operation not permitted in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 6 +Warning: parse_ini_file(%stest\bad): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 6 bool(false) -Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test\bad\bad.txt) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 7 +Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest\bad\bad.txt) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 7 -Warning: parse_ini_file(G:\php-sdk\php-src\branches\PHP_5_4\test\bad\bad.txt): failed to open stream: Operation not permitted in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 7 +Warning: parse_ini_file(%stest\bad\bad.txt): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 7 bool(false) -Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 8 +Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 8 -Warning: parse_ini_file(G:\php-sdk\php-src\branches\PHP_5_4\test): failed to open stream: Operation not permitted in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 8 +Warning: parse_ini_file(%stest): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 8 bool(false) -Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 9 +Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 9 -Warning: parse_ini_file(G:\php-sdk\php-src\branches\PHP_5_4\test): failed to open stream: Operation not permitted in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 9 +Warning: parse_ini_file(%stest): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 9 bool(false) -Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test\bad) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 10 +Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest\bad) is not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on line 10 -Warning: parse_ini_file(G:\php-sdk\php-src\branches\PHP_5_4\test\bad): failed to open stream: Operation not permitted in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 10 +Warning: parse_ini_file(%stest\bad): failed to open stream: Operation not permitted in %sopen_basedir_parse_ini_file.php on line 10 bool(false) -Warning: parse_ini_file(): open_basedir restriction in effect. File(G:\php-sdk\php-src\branches\PHP_5_4\test\bad\bad.txt) is not within the allowed path(s): (.) in G:\php-sdk\php-src\branches\PHP_5_4\tests\security\open_basedir_parse_ini_file.php on line 11 +Warning: parse_ini_file(): open_basedir restriction in effect.
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/tests/security/ open_basedir_glob-win32.phpt open_basedir_parse_ini_file.phpt
pajoye Thu, 01 Sep 2011 13:28:12 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315988
Log:
- use %s, bad c/p
Changed paths:
D php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob-win32.phpt
U
php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt
Deleted:
php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob-win32.phpt
===
--- php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob-win32.phpt
2011-09-01 13:28:00 UTC (rev 315987)
+++ php/php-src/branches/PHP_5_3/tests/security/open_basedir_glob-win32.phpt
2011-09-01 13:28:12 UTC (rev 315988)
@@ -1,59 +0,0 @@
---TEST--
-Test open_basedir configuration
---SKIPIF--
-?php
-if (substr(PHP_OS, 0, 3) != 'WIN') {
-die('skip Windows only variation');
-}
-?
---INI--
-open_basedir=.
---FILE--
-?php
-require_once open_basedir.inc;
-test_open_basedir(glob);
-?
---CLEAN--
-?php
-require_once open_basedir.inc;
-delete_directories();
-?
---EXPECTF--
-*** Testing open_basedir configuration [glob] ***
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(false)
-array(0) {
-}
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-bool(false)
-array(1) {
- [0]=
- string(5) ../ok
-}
-array(1) {
- [0]=
- string(6) ok.txt
-}
-array(1) {
- [0]=
- string(12) ../ok/ok.txt
-}
-array(1) {
- [0]=
- string(%d) %s/test/ok/ok.txt
-}
-array(1) {
- [0]=
- string(%d) %s/test/ok/../ok/ok.txt
-}
-*** Finished testing open_basedir configuration [glob] ***
-
Modified:
php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt
===
---
php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt
2011-09-01 13:28:00 UTC (rev 315987)
+++
php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt
2011-09-01 13:28:12 UTC (rev 315988)
@@ -37,46 +37,39 @@
bool(true)
bool(true)
-Warning: parse_ini_file(): open_basedir restriction in effect.
File(%s\test\bad) is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect.
File(%stest\bad) is not within the allowed path(s): (.) in
%sopen_basedir_parse_ini_file.php on line 6
-Warning: parse_ini_file(%s\test\bad): failed to open stream: %s in %s on line
%d
-array(0) {
-}
+Warning: parse_ini_file(%stest\bad): failed to open stream: Operation not
permitted in %sopen_basedir_parse_ini_file.php on line 6
+bool(false)
-Warning: parse_ini_file(): open_basedir restriction in effect.
File(%s\test\bad\bad.txt) is not within the allowed path(s): (.) in %s on line
%d
+Warning: parse_ini_file(): open_basedir restriction in effect.
File(%stest\bad\bad.txt) is not within the allowed path(s): (.) in
%sopen_basedir_parse_ini_file.php on line 7
-Warning: parse_ini_file(%s\test\bad\bad.txt): failed to open stream: %s in %s
on line %d
-array(0) {
-}
+Warning: parse_ini_file(%stest\bad\bad.txt): failed to open stream: Operation
not permitted in %sopen_basedir_parse_ini_file.php on line 7
+bool(false)
-Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test)
is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is
not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on
line 8
-Warning: parse_ini_file(%s\test): failed to open stream: %s in %s on line %d
-array(0) {
-}
+Warning: parse_ini_file(%stest): failed to open stream: Operation not
permitted in %sopen_basedir_parse_ini_file.php on line 8
+bool(false)
-Warning: parse_ini_file(): open_basedir restriction in effect. File(%s\test)
is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect. File(%stest) is
not within the allowed path(s): (.) in %sopen_basedir_parse_ini_file.php on
line 9
-Warning: parse_ini_file(%s\test): failed to open stream: %s in %s on line %d
-array(0) {
-}
+Warning: parse_ini_file(%stest): failed to open stream: Operation not
permitted in %sopen_basedir_parse_ini_file.php on line 9
+bool(false)
-Warning: parse_ini_file(): open_basedir restriction in effect.
File(%s\test\bad) is not within the allowed path(s): (.) in %s on line %d
+Warning: parse_ini_file(): open_basedir restriction in effect.
File(%stest\bad) is not within the allowed path(s): (.) in
%sopen_basedir_parse_ini_file.php on line 10
-Warning: parse_ini_file(%s\test\bad): failed to open stream: %s in %s on line
%d
-array(0) {
-}
+Warning: parse_ini_file(%stest\bad): failed to open stream: Operation not
permitted in %sopen_basedir_parse_ini_file.php on line 10
+bool(false)
-Warning: parse_ini_file(): open_basedir restriction in effect.
File(%s\test\bad\bad.txt) is not within the allowed path(s): (.) in %s on
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/tests/lang/ bug21820.phpt
You just made the exact opposite of what you wanted to achieve. If you can't test with both versions then please don't touch that part... On Sep 2, 2011 12:45 AM, Ferenc Kovacs tyr...@php.net wrote: tyrael Thu, 01 Sep 2011 22:45:18 + Revision: http://svn.php.net/viewvc?view=revisionrevision=316015 Log: revert to the previous good revision, as the new improved parse error syntax only used in version = 5.4 Changed paths: U php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt Modified: php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt === --- php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt 2011-09-01 22:43:24 UTC (rev 316014) +++ php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt 2011-09-01 22:45:18 UTC (rev 316015) @@ -9,5 +9,5 @@ echo $arr['foo']; ? ---EXPECTF-- -Parse error: %s error, %s(T_STRING)%s(T_VARIABLE)%s(T_NUM_STRING)%s in %sbug21820.php on line %d +--EXPECTREGEX-- +Parse error: (parse|syntax) error, .*expecting `?T_STRING'? or `?T_VARIABLE'? or `?T_NUM_STRING'? in .*bug21820.php on line .*
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/tests/bug48930.phpt branches/PHP_5_4/Zend/tests/bug48930.phpt trunk/Zend/tests/bug48930.phpt
pajoye Wed, 31 Aug 2011 08:35:57 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315864 Log: - force LF eol style as this test depends on it (size) Changed paths: _U php/php-src/branches/PHP_5_3/Zend/tests/bug48930.phpt _U php/php-src/branches/PHP_5_4/Zend/tests/bug48930.phpt _U php/php-src/trunk/Zend/tests/bug48930.phpt Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/bug48930.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/bug48930.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/Zend/tests/bug48930.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/tests/bug48693.phpt branches/PHP_5_4/Zend/tests/bug48693.phpt trunk/Zend/tests/bug48693.phpt
pajoye Wed, 31 Aug 2011 10:05:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315869 Log: - make it parser version independent Changed paths: U php/php-src/branches/PHP_5_3/Zend/tests/bug48693.phpt U php/php-src/branches/PHP_5_4/Zend/tests/bug48693.phpt U php/php-src/trunk/Zend/tests/bug48693.phpt Modified: php/php-src/branches/PHP_5_3/Zend/tests/bug48693.phpt === --- php/php-src/branches/PHP_5_3/Zend/tests/bug48693.phpt 2011-08-31 09:16:04 UTC (rev 315868) +++ php/php-src/branches/PHP_5_3/Zend/tests/bug48693.phpt 2011-08-31 10:05:54 UTC (rev 315869) @@ -18,9 +18,9 @@ ? --EXPECTF-- -Parse error: syntax error, unexpected '}' in %s(%d) : runtime-created function on line 1 +Parse error: %s in %s(%d) : runtime-created function on line 1 -Parse error: syntax error, unexpected $end in %s(%d) : runtime-created function on line 1 +Parse error: %s %s(%d) : runtime-created function on line 1 bool(false) int(2) bool(false) Modified: php/php-src/branches/PHP_5_4/Zend/tests/bug48693.phpt === --- php/php-src/branches/PHP_5_4/Zend/tests/bug48693.phpt 2011-08-31 09:16:04 UTC (rev 315868) +++ php/php-src/branches/PHP_5_4/Zend/tests/bug48693.phpt 2011-08-31 10:05:54 UTC (rev 315869) @@ -18,9 +18,9 @@ ? --EXPECTF-- -Parse error: syntax error, unexpected '}' in %s(%d) : runtime-created function on line 1 +Parse error: %s in %s(%d) : runtime-created function on line 1 -Parse error: syntax error, unexpected end of file in %s(%d) : runtime-created function on line 1 +Parse error: %s %s(%d) : runtime-created function on line 1 bool(false) int(2) bool(false) Modified: php/php-src/trunk/Zend/tests/bug48693.phpt === --- php/php-src/trunk/Zend/tests/bug48693.phpt 2011-08-31 09:16:04 UTC (rev 315868) +++ php/php-src/trunk/Zend/tests/bug48693.phpt 2011-08-31 10:05:54 UTC (rev 315869) @@ -18,9 +18,9 @@ ? --EXPECTF-- -Parse error: syntax error, unexpected '}' in %s(%d) : runtime-created function on line 1 +Parse error: %s in %s(%d) : runtime-created function on line 1 -Parse error: syntax error, unexpected end of file in %s(%d) : runtime-created function on line 1 +Parse error: %s %s(%d) : runtime-created function on line 1 bool(false) int(2) bool(false) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/tests/bug35655.phpt branches/PHP_5_4/Zend/tests/bug35655.phpt trunk/Zend/tests/bug35655.phpt
pajoye Wed, 31 Aug 2011 10:08:55 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315870 Log: - force LF eol style as this test depends on it (size) Changed paths: _U php/php-src/branches/PHP_5_3/Zend/tests/bug35655.phpt _U php/php-src/branches/PHP_5_4/Zend/tests/bug35655.phpt _U php/php-src/trunk/Zend/tests/bug35655.phpt Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/bug35655.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/bug35655.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/Zend/tests/bug35655.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/bug52041.phpt trunk/Zend/tests/bug52041.phpt
pajoye Wed, 31 Aug 2011 10:22:18 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315872 Log: - use only test name Changed paths: U php/php-src/branches/PHP_5_4/Zend/tests/bug52041.phpt U php/php-src/trunk/Zend/tests/bug52041.phpt Modified: php/php-src/branches/PHP_5_4/Zend/tests/bug52041.phpt === --- php/php-src/branches/PHP_5_4/Zend/tests/bug52041.phpt 2011-08-31 10:09:54 UTC (rev 315871) +++ php/php-src/branches/PHP_5_4/Zend/tests/bug52041.phpt 2011-08-31 10:22:18 UTC (rev 315872) @@ -51,7 +51,7 @@ Notice: Undefined variable: x in %sbug52041.php on line 3 -Notice: Undefined variable: x in %stests/bug52041.php on line 3 +Notice: Undefined variable: x in %sbug52041.php on line 3 Notice: Undefined offset: 0 in %sbug52041.php on line 15 Modified: php/php-src/trunk/Zend/tests/bug52041.phpt === --- php/php-src/trunk/Zend/tests/bug52041.phpt 2011-08-31 10:09:54 UTC (rev 315871) +++ php/php-src/trunk/Zend/tests/bug52041.phpt 2011-08-31 10:22:18 UTC (rev 315872) @@ -51,7 +51,7 @@ Notice: Undefined variable: x in %sbug52041.php on line 3 -Notice: Undefined variable: x in %stests/bug52041.php on line 3 +Notice: Undefined variable: x in %sbug52041.php on line 3 Notice: Undefined offset: 0 in %sbug52041.php on line 15 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/tests/bug54262.phpt branches/PHP_5_4/Zend/tests/bug54262.phpt trunk/Zend/tests/bug54262.phpt
pajoye Wed, 31 Aug 2011 10:30:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315873 Log: - use only the test name Changed paths: U php/php-src/branches/PHP_5_3/Zend/tests/bug54262.phpt U php/php-src/branches/PHP_5_4/Zend/tests/bug54262.phpt U php/php-src/trunk/Zend/tests/bug54262.phpt Modified: php/php-src/branches/PHP_5_3/Zend/tests/bug54262.phpt === --- php/php-src/branches/PHP_5_3/Zend/tests/bug54262.phpt 2011-08-31 10:22:18 UTC (rev 315872) +++ php/php-src/branches/PHP_5_3/Zend/tests/bug54262.phpt 2011-08-31 10:30:39 UTC (rev 315873) @@ -11,7 +11,7 @@ --EXPECTF-- bool(true) -Warning: Attempt to modify property of non-object in %s/Zend/tests/bug54262.php on line 4 +Warning: Attempt to modify property of non-object in %sbug54262.php on line 4 -Warning: Cannot use a scalar value as an array in %s/Zend/tests/bug54262.php on line 5 -ok \ No newline at end of file +Warning: Cannot use a scalar value as an array in %sbug54262.php on line 5 +ok Modified: php/php-src/branches/PHP_5_4/Zend/tests/bug54262.phpt === --- php/php-src/branches/PHP_5_4/Zend/tests/bug54262.phpt 2011-08-31 10:22:18 UTC (rev 315872) +++ php/php-src/branches/PHP_5_4/Zend/tests/bug54262.phpt 2011-08-31 10:30:39 UTC (rev 315873) @@ -11,7 +11,7 @@ --EXPECTF-- bool(true) -Warning: Attempt to modify property of non-object in %s/Zend/tests/bug54262.php on line 4 +Warning: Attempt to modify property of non-object in %sbug54262.php on line 4 -Warning: Cannot use a scalar value as an array in %s/Zend/tests/bug54262.php on line 5 -ok \ No newline at end of file +Warning: Cannot use a scalar value as an array in %sbug54262.php on line 5 +ok Modified: php/php-src/trunk/Zend/tests/bug54262.phpt === --- php/php-src/trunk/Zend/tests/bug54262.phpt 2011-08-31 10:22:18 UTC (rev 315872) +++ php/php-src/trunk/Zend/tests/bug54262.phpt 2011-08-31 10:30:39 UTC (rev 315873) @@ -11,7 +11,7 @@ --EXPECTF-- bool(true) -Warning: Attempt to modify property of non-object in %s/Zend/tests/bug54262.php on line 4 +Warning: Attempt to modify property of non-object in %sbug54262.php on line 4 -Warning: Cannot use a scalar value as an array in %s/Zend/tests/bug54262.php on line 5 -ok \ No newline at end of file +Warning: Cannot use a scalar value as an array in %sbug54262.php on line 5 +ok -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/debug_backtrace_limit.phpt trunk/Zend/tests/debug_backtrace_limit.phpt
pajoye Wed, 31 Aug 2011 10:43:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315875 Log: - use only the test name Changed paths: U php/php-src/branches/PHP_5_4/Zend/tests/debug_backtrace_limit.phpt U php/php-src/trunk/Zend/tests/debug_backtrace_limit.phpt Modified: php/php-src/branches/PHP_5_4/Zend/tests/debug_backtrace_limit.phpt === --- php/php-src/branches/PHP_5_4/Zend/tests/debug_backtrace_limit.phpt 2011-08-31 10:34:19 UTC (rev 315874) +++ php/php-src/branches/PHP_5_4/Zend/tests/debug_backtrace_limit.phpt 2011-08-31 10:43:39 UTC (rev 315875) @@ -24,7 +24,7 @@ ( [0] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 7 [function] = c [args] = Array @@ -38,7 +38,7 @@ ( [0] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 7 [function] = c [args] = Array @@ -49,7 +49,7 @@ [1] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 3 [function] = b [args] = Array @@ -63,7 +63,7 @@ ( [0] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 7 [function] = c [args] = Array @@ -74,7 +74,7 @@ [1] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 3 [function] = b [args] = Array @@ -85,7 +85,7 @@ [2] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 17 [function] = a [args] = Array @@ -99,7 +99,7 @@ ( [0] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 7 [function] = c [args] = Array @@ -110,7 +110,7 @@ [1] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 3 [function] = b [args] = Array @@ -121,7 +121,7 @@ [2] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 17 [function] = a [args] = Array Modified: php/php-src/trunk/Zend/tests/debug_backtrace_limit.phpt === --- php/php-src/trunk/Zend/tests/debug_backtrace_limit.phpt 2011-08-31 10:34:19 UTC (rev 315874) +++ php/php-src/trunk/Zend/tests/debug_backtrace_limit.phpt 2011-08-31 10:43:39 UTC (rev 315875) @@ -24,7 +24,7 @@ ( [0] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 7 [function] = c [args] = Array @@ -38,7 +38,7 @@ ( [0] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 7 [function] = c [args] = Array @@ -49,7 +49,7 @@ [1] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 3 [function] = b [args] = Array @@ -63,7 +63,7 @@ ( [0] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 7 [function] = c [args] = Array @@ -74,7 +74,7 @@ [1] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 3 [function] = b [args] = Array @@ -85,7 +85,7 @@ [2] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 17 [function] = a [args] = Array @@ -99,7 +99,7 @@ ( [0] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 7 [function] = c [args] = Array @@ -110,7 +110,7 @@ [1] = Array ( -[file] = %s/debug_backtrace_limit.php +[file] = %sdebug_backtrace_limit.php [line] = 3 [function] = b [args] = Array @@ -121,7 +121,7 @@ [2] = Array ( -
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/debug_print_backtrace_limit.phpt trunk/Zend/tests/debug_print_backtrace_limit.phpt
pajoye Wed, 31 Aug 2011 10:46:20 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315876 Log: - use only the test name Changed paths: U php/php-src/branches/PHP_5_4/Zend/tests/debug_print_backtrace_limit.phpt U php/php-src/trunk/Zend/tests/debug_print_backtrace_limit.phpt Modified: php/php-src/branches/PHP_5_4/Zend/tests/debug_print_backtrace_limit.phpt === --- php/php-src/branches/PHP_5_4/Zend/tests/debug_print_backtrace_limit.phpt 2011-08-31 10:43:39 UTC (rev 315875) +++ php/php-src/branches/PHP_5_4/Zend/tests/debug_print_backtrace_limit.phpt 2011-08-31 10:46:20 UTC (rev 315876) @@ -20,12 +20,12 @@ a(); ? --EXPECTF-- -#0 c() called at [%s/debug_print_backtrace_limit.php:7] -#0 c() called at [%s/debug_print_backtrace_limit.php:7] -#1 b() called at [%s/debug_print_backtrace_limit.php:3] -#0 c() called at [%s/debug_print_backtrace_limit.php:7] -#1 b() called at [%s/debug_print_backtrace_limit.php:3] -#2 a() called at [%s/debug_print_backtrace_limit.php:17] -#0 c() called at [%s/debug_print_backtrace_limit.php:7] -#1 b() called at [%s/debug_print_backtrace_limit.php:3] -#2 a() called at [%s/debug_print_backtrace_limit.php:17] +#0 c() called at [%sdebug_print_backtrace_limit.php:7] +#0 c() called at [%sdebug_print_backtrace_limit.php:7] +#1 b() called at [%sdebug_print_backtrace_limit.php:3] +#0 c() called at [%sdebug_print_backtrace_limit.php:7] +#1 b() called at [%sdebug_print_backtrace_limit.php:3] +#2 a() called at [%sdebug_print_backtrace_limit.php:17] +#0 c() called at [%sdebug_print_backtrace_limit.php:7] +#1 b() called at [%sdebug_print_backtrace_limit.php:3] +#2 a() called at [%sdebug_print_backtrace_limit.php:17] Modified: php/php-src/trunk/Zend/tests/debug_print_backtrace_limit.phpt === --- php/php-src/trunk/Zend/tests/debug_print_backtrace_limit.phpt 2011-08-31 10:43:39 UTC (rev 315875) +++ php/php-src/trunk/Zend/tests/debug_print_backtrace_limit.phpt 2011-08-31 10:46:20 UTC (rev 315876) @@ -20,12 +20,12 @@ a(); ? --EXPECTF-- -#0 c() called at [%s/debug_print_backtrace_limit.php:7] -#0 c() called at [%s/debug_print_backtrace_limit.php:7] -#1 b() called at [%s/debug_print_backtrace_limit.php:3] -#0 c() called at [%s/debug_print_backtrace_limit.php:7] -#1 b() called at [%s/debug_print_backtrace_limit.php:3] -#2 a() called at [%s/debug_print_backtrace_limit.php:17] -#0 c() called at [%s/debug_print_backtrace_limit.php:7] -#1 b() called at [%s/debug_print_backtrace_limit.php:3] -#2 a() called at [%s/debug_print_backtrace_limit.php:17] +#0 c() called at [%sdebug_print_backtrace_limit.php:7] +#0 c() called at [%sdebug_print_backtrace_limit.php:7] +#1 b() called at [%sdebug_print_backtrace_limit.php:3] +#0 c() called at [%sdebug_print_backtrace_limit.php:7] +#1 b() called at [%sdebug_print_backtrace_limit.php:3] +#2 a() called at [%sdebug_print_backtrace_limit.php:17] +#0 c() called at [%sdebug_print_backtrace_limit.php:7] +#1 b() called at [%sdebug_print_backtrace_limit.php:3] +#2 a() called at [%sdebug_print_backtrace_limit.php:17] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/function_arguments_001.phpt trunk/Zend/tests/function_arguments_001.phpt
pajoye Wed, 31 Aug 2011 11:16:25 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315878
Log:
- parser version independent
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_001.phpt
U php/php-src/trunk/Zend/tests/function_arguments_001.phpt
Modified: php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_001.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_001.phpt
2011-08-31 11:11:08 UTC (rev 315877)
+++ php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_001.phpt
2011-08-31 11:16:25 UTC (rev 315878)
@@ -5,5 +5,5 @@
function foo($arg1 string) {}
?
--EXPECTF--
-Parse error: syntax error, unexpected 'string' (T_STRING), expecting ')' in
%sfunction_arguments_001.php on line %d
+Parse error: %s error, %s)%s in %sfunction_arguments_001.php on line %d
Modified: php/php-src/trunk/Zend/tests/function_arguments_001.phpt
===
--- php/php-src/trunk/Zend/tests/function_arguments_001.phpt2011-08-31
11:11:08 UTC (rev 315877)
+++ php/php-src/trunk/Zend/tests/function_arguments_001.phpt2011-08-31
11:16:25 UTC (rev 315878)
@@ -5,5 +5,5 @@
function foo($arg1 string) {}
?
--EXPECTF--
-Parse error: syntax error, unexpected 'string' (T_STRING), expecting ')' in
%sfunction_arguments_001.php on line %d
+Parse error: %s error, %s)%s in %sfunction_arguments_001.php on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/function_arguments_002.phpt trunk/Zend/tests/function_arguments_002.phpt
pajoye Wed, 31 Aug 2011 11:18:13 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315879
Log:
- parser version independent
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_002.phpt
U php/php-src/trunk/Zend/tests/function_arguments_002.phpt
Modified: php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_002.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_002.phpt
2011-08-31 11:16:25 UTC (rev 315878)
+++ php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_002.phpt
2011-08-31 11:18:13 UTC (rev 315879)
@@ -5,5 +5,5 @@
function foo($arg1/) {}
?
--EXPECTF--
-Parse error: syntax error, unexpected '/', expecting ')' in
%sfunction_arguments_002.php on line %d
+Parse error: %s error, %s)%s in %sfunction_arguments_002.php on line %d
Modified: php/php-src/trunk/Zend/tests/function_arguments_002.phpt
===
--- php/php-src/trunk/Zend/tests/function_arguments_002.phpt2011-08-31
11:16:25 UTC (rev 315878)
+++ php/php-src/trunk/Zend/tests/function_arguments_002.phpt2011-08-31
11:18:13 UTC (rev 315879)
@@ -5,5 +5,5 @@
function foo($arg1/) {}
?
--EXPECTF--
-Parse error: syntax error, unexpected '/', expecting ')' in
%sfunction_arguments_002.php on line %d
+Parse error: %s error, %s)%s in %sfunction_arguments_002.php on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/tests/heredoc_017.phpt branches/PHP_5_4/Zend/tests/heredoc_017.phpt trunk/Zend/tests/heredoc_017.phpt
pajoye Wed, 31 Aug 2011 11:25:09 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315880 Log: - force LF eol style as this test depends on it (size) Changed paths: _U php/php-src/branches/PHP_5_3/Zend/tests/heredoc_017.phpt _U php/php-src/branches/PHP_5_4/Zend/tests/heredoc_017.phpt _U php/php-src/trunk/Zend/tests/heredoc_017.phpt Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/heredoc_017.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/heredoc_017.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/Zend/tests/heredoc_017.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_3/Zend/tests/heredoc_018.phpt PHP_5_4/Zend/tests/heredoc_018.phpt
pajoye Wed, 31 Aug 2011 11:26:27 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315881 Log: - force LF eol style as this test depends on it (size) Changed paths: _U php/php-src/branches/PHP_5_3/Zend/tests/heredoc_018.phpt _U php/php-src/branches/PHP_5_4/Zend/tests/heredoc_018.phpt Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/heredoc_018.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/heredoc_018.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/Zend/tests/ heredoc_018.phpt
pajoye Wed, 31 Aug 2011 11:27:36 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315882 Log: - force LF eol style as this test depends on it (size) Changed paths: _U php/php-src/trunk/Zend/tests/heredoc_018.phpt Property changes on: php/php-src/trunk/Zend/tests/heredoc_018.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/tests/nowdoc_013.phpt trunk/Zend/tests/nowdoc_013.phpt
pajoye Wed, 31 Aug 2011 12:26:55 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315885 Log: - force LF eol style as this test depends on it (size) Changed paths: _U php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_013.phpt _U php/php-src/trunk/Zend/tests/nowdoc_013.phpt Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_013.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/Zend/tests/nowdoc_013.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/Zend/tests/ nowdoc_013.phpt
pajoye Wed, 31 Aug 2011 12:27:11 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315887 Log: - force LF eol style as this test depends on it (size) Changed paths: _U php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_013.phpt Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_013.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/tests/nowdoc_014.phpt branches/PHP_5_4/Zend/tests/nowdoc_014.phpt trunk/Zend/tests/nowdoc_014.phpt
pajoye Wed, 31 Aug 2011 15:42:42 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315903 Log: - force LF eol style as this test depends on it Changed paths: _U php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_014.phpt _U php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_014.phpt _U php/php-src/trunk/Zend/tests/nowdoc_014.phpt Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_014.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_014.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/Zend/tests/nowdoc_014.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/Zend/tests/nowdoc_015.phpt branches/PHP_5_4/Zend/tests/nowdoc_015.phpt trunk/Zend/tests/nowdoc_015.phpt
pajoye Wed, 31 Aug 2011 15:44:01 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315904 Log: - force LF eol style as this test depends on it Changed paths: _U php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_015.phpt _U php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_015.phpt _U php/php-src/trunk/Zend/tests/nowdoc_015.phpt Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_015.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_015.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/Zend/tests/nowdoc_015.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/basic/bug45986.phpt branches/PHP_5_4/tests/basic/bug45986.phpt trunk/tests/basic/bug45986.phpt
pajoye Wed, 31 Aug 2011 20:07:44 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315921 Log: - typo Changed paths: U php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt U php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt U php/php-src/trunk/tests/basic/bug45986.phpt Modified: php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt === --- php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt 2011-08-31 20:03:20 UTC (rev 315920) +++ php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt 2011-08-31 20:07:44 UTC (rev 315921) @@ -1,5 +1,5 @@ --TEST-- -Bug #45986 (wrong error messag for a non existant file on rename) +Bug #45986 (wrong error message for a non existant file on rename) --CREDITS-- Sebastian Schürmann s...@php.net Modified: php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt === --- php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt 2011-08-31 20:03:20 UTC (rev 315920) +++ php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt 2011-08-31 20:07:44 UTC (rev 315921) @@ -1,5 +1,5 @@ --TEST-- -Bug #45986 (wrong error messag for a non existant file on rename) +Bug #45986 (wrong error message for a non existant file on rename) --CREDITS-- Sebastian Schürmann s...@php.net Modified: php/php-src/trunk/tests/basic/bug45986.phpt === --- php/php-src/trunk/tests/basic/bug45986.phpt 2011-08-31 20:03:20 UTC (rev 315920) +++ php/php-src/trunk/tests/basic/bug45986.phpt 2011-08-31 20:07:44 UTC (rev 315921) @@ -1,5 +1,5 @@ --TEST-- -Bug #45986 (wrong error messag for a non existant file on rename) +Bug #45986 (wrong error message for a non existant file on rename) --CREDITS-- Sebastian Schürmann s...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/basic/bug45986.phpt branches/PHP_5_4/tests/basic/bug45986.phpt trunk/tests/basic/bug45986.phpt
pajoye Wed, 31 Aug 2011 20:10:22 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315922
Log:
- error msg may vary
Changed paths:
U php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt
U php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt
U php/php-src/trunk/tests/basic/bug45986.phpt
Modified: php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt 2011-08-31
20:07:44 UTC (rev 315921)
+++ php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt 2011-08-31
20:10:22 UTC (rev 315922)
@@ -8,5 +8,5 @@
?php
rename('foo', 'bar');
?
---EXPECTREGEX--
-.*No such.*
+--EXPECTF--
+Warning: %s in %sbug45986.php on line 2
Modified: php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt
===
--- php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt 2011-08-31
20:07:44 UTC (rev 315921)
+++ php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt 2011-08-31
20:10:22 UTC (rev 315922)
@@ -8,5 +8,5 @@
?php
rename('foo', 'bar');
?
---EXPECTREGEX--
-.*No such.*
+--EXPECTF--
+Warning: %s in %sbug45986.php on line 2
Modified: php/php-src/trunk/tests/basic/bug45986.phpt
===
--- php/php-src/trunk/tests/basic/bug45986.phpt 2011-08-31 20:07:44 UTC (rev
315921)
+++ php/php-src/trunk/tests/basic/bug45986.phpt 2011-08-31 20:10:22 UTC (rev
315922)
@@ -8,5 +8,5 @@
?php
rename('foo', 'bar');
?
---EXPECTREGEX--
-.*No such.*
+--EXPECTF--
+Warning: %s in %sbug45986.php on line 2
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/basic/bug51709_1.phpt branches/PHP_5_4/tests/basic/bug51709_1.phpt trunk/tests/basic/bug51709_1.phpt
pajoye Wed, 31 Aug 2011 20:14:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315923 Log: - error msg may vary (parser) Changed paths: U php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt U php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt U php/php-src/trunk/tests/basic/bug51709_1.phpt Modified: php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt === --- php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt2011-08-31 20:10:22 UTC (rev 315922) +++ php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt2011-08-31 20:14:13 UTC (rev 315923) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: syntax error, unexpected T_FOR, expecting T_STRING in %sbug51709_1.php on line %d +Parse error: %s error, %s(T_STRING)%s in %sbug51709_1.php on line %d Modified: php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt === --- php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt2011-08-31 20:10:22 UTC (rev 315922) +++ php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt2011-08-31 20:14:13 UTC (rev 315923) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: syntax error, unexpected 'for' (T_FOR), expecting identifier (T_STRING) in %sbug51709_1.php on line %d +Parse error: %s error, %s(T_STRING)%s in %sbug51709_1.php on line %d Modified: php/php-src/trunk/tests/basic/bug51709_1.phpt === --- php/php-src/trunk/tests/basic/bug51709_1.phpt 2011-08-31 20:10:22 UTC (rev 315922) +++ php/php-src/trunk/tests/basic/bug51709_1.phpt 2011-08-31 20:14:13 UTC (rev 315923) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: syntax error, unexpected for (T_FOR), expecting identifier (T_STRING) in %sbug51709_1.php on line %d +Parse error: %s error, %s(T_STRING)%s in %sbug51709_1.php on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/basic/bug51709_2.phpt branches/PHP_5_4/tests/basic/bug51709_2.phpt trunk/tests/basic/bug51709_2.phpt
pajoye Wed, 31 Aug 2011 20:16:11 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315925 Log: - error msg may vary (parser) Changed paths: U php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt U php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt U php/php-src/trunk/tests/basic/bug51709_2.phpt Modified: php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt === --- php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt2011-08-31 20:15:32 UTC (rev 315924) +++ php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt2011-08-31 20:16:11 UTC (rev 315925) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: syntax error, unexpected T_GOTO, expecting T_STRING in %sbug51709_2.php on line %d +Parse error: %s error, %s(T_STRING)%s in %sbug51709_2.php on line %d Modified: php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt === --- php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt2011-08-31 20:15:32 UTC (rev 315924) +++ php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt2011-08-31 20:16:11 UTC (rev 315925) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: syntax error, unexpected 'goto' (T_GOTO), expecting identifier (T_STRING) in %sbug51709_2.php on line %d +Parse error: %s error, %s(T_STRING)%s in %sbug51709_2.php on line %d Modified: php/php-src/trunk/tests/basic/bug51709_2.phpt === --- php/php-src/trunk/tests/basic/bug51709_2.phpt 2011-08-31 20:15:32 UTC (rev 315924) +++ php/php-src/trunk/tests/basic/bug51709_2.phpt 2011-08-31 20:16:11 UTC (rev 315925) @@ -13,4 +13,4 @@ ===DONE=== ?php exit(0); ? --EXPECTF-- -Parse error: syntax error, unexpected goto (T_GOTO), expecting identifier (T_STRING) in %sbug51709_2.php on line %d +Parse error: %s error, %s(T_STRING)%s in %sbug51709_2.php on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/lang/bug21820.phpt branches/PHP_5_4/tests/lang/bug21820.phpt trunk/tests/lang/bug21820.phpt
pajoye Wed, 31 Aug 2011 23:12:35 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315938 Log: - error msg may vary (parser) Changed paths: U php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt U php/php-src/branches/PHP_5_4/tests/lang/bug21820.phpt U php/php-src/trunk/tests/lang/bug21820.phpt Modified: php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt === --- php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt 2011-08-31 22:38:20 UTC (rev 315937) +++ php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt 2011-08-31 23:12:35 UTC (rev 315938) @@ -9,5 +9,5 @@ echo $arr['foo']; ? ---EXPECTREGEX-- -Parse error: (parse|syntax) error, .*expecting `?T_STRING'? or `?T_VARIABLE'? or `?T_NUM_STRING'? in .*bug21820.php on line .* +--EXPECTF-- +Parse error: %s error, %s(T_STRING)%s(T_VARIABLE)%s(T_NUM_STRING)%s in %sbug21820.php on line %d Modified: php/php-src/branches/PHP_5_4/tests/lang/bug21820.phpt === --- php/php-src/branches/PHP_5_4/tests/lang/bug21820.phpt 2011-08-31 22:38:20 UTC (rev 315937) +++ php/php-src/branches/PHP_5_4/tests/lang/bug21820.phpt 2011-08-31 23:12:35 UTC (rev 315938) @@ -10,4 +10,4 @@ ? --EXPECTF-- -Parse error: syntax error, unexpected '' (T_ENCAPSED_AND_WHITESPACE), expecting identifier (T_STRING) or variable (T_VARIABLE) or number (T_NUM_STRING) in %sbug21820.php on line %d +Parse error: %s error, %s(T_STRING)%s(T_VARIABLE)%s(T_NUM_STRING)%s in %sbug21820.php on line %d Modified: php/php-src/trunk/tests/lang/bug21820.phpt === --- php/php-src/trunk/tests/lang/bug21820.phpt 2011-08-31 22:38:20 UTC (rev 315937) +++ php/php-src/trunk/tests/lang/bug21820.phpt 2011-08-31 23:12:35 UTC (rev 315938) @@ -10,4 +10,4 @@ ? --EXPECTF-- -Parse error: syntax error, unexpected quoted-string and whitespace (T_ENCAPSED_AND_WHITESPACE), expecting identifier (T_STRING) or variable (T_VARIABLE) or number (T_NUM_STRING) in %sbug21820.php on line %d +Parse error: %s error, %s(T_STRING)%s(T_VARIABLE)%s(T_NUM_STRING)%s in %sbug21820.php on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/libxml/libxml.c trunk/ext/libxml/libxml.c
pajoye Mon, 29 Aug 2011 10:10:05 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315683
Log:
- fix build, TSRMLS_FETCH must be the last declaration statement and init using
TSRM cannot be done before either
Changed paths:
U php/php-src/branches/PHP_5_4/ext/libxml/libxml.c
U php/php-src/trunk/ext/libxml/libxml.c
Modified: php/php-src/branches/PHP_5_4/ext/libxml/libxml.c
===
--- php/php-src/branches/PHP_5_4/ext/libxml/libxml.c2011-08-29 09:53:25 UTC
(rev 315682)
+++ php/php-src/branches/PHP_5_4/ext/libxml/libxml.c2011-08-29 10:10:05 UTC
(rev 315683)
@@ -937,9 +937,11 @@
**params[] = {public,
system, ctxzv},
*retval_ptr = NULL;
int retval;
+ zend_fcall_info *fci;
TSRMLS_FETCH();
- zend_fcall_info *fci = LIBXML(entity_loader).fci;
-
+
+ fci = LIBXML(entity_loader).fci;
+
ALLOC_INIT_ZVAL(public);
if (ID != NULL) {
ZVAL_STRING(public, ID, 1);
Modified: php/php-src/trunk/ext/libxml/libxml.c
===
--- php/php-src/trunk/ext/libxml/libxml.c 2011-08-29 09:53:25 UTC (rev
315682)
+++ php/php-src/trunk/ext/libxml/libxml.c 2011-08-29 10:10:05 UTC (rev
315683)
@@ -937,9 +937,11 @@
**params[] = {public,
system, ctxzv},
*retval_ptr = NULL;
int retval;
+ zend_fcall_info *fci;
TSRMLS_FETCH();
- zend_fcall_info *fci = LIBXML(entity_loader).fci;
-
+
+ fci = LIBXML(entity_loader).fci;
+
ALLOC_INIT_ZVAL(public);
if (ID != NULL) {
ZVAL_STRING(public, ID, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/libxml/libxml.c branches/PHP_5_4/ext/libxml/libxml.c trunk/ext/libxml/libxml.c
pajoye Tue, 30 Aug 2011 05:44:37 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315756
Log:
- ws
Changed paths:
U php/php-src/branches/PHP_5_3/ext/libxml/libxml.c
U php/php-src/branches/PHP_5_4/ext/libxml/libxml.c
U php/php-src/trunk/ext/libxml/libxml.c
Modified: php/php-src/branches/PHP_5_3/ext/libxml/libxml.c
===
--- php/php-src/branches/PHP_5_3/ext/libxml/libxml.c2011-08-30 03:47:53 UTC
(rev 315755)
+++ php/php-src/branches/PHP_5_3/ext/libxml/libxml.c2011-08-30 05:44:37 UTC
(rev 315756)
@@ -228,9 +228,9 @@
php_libxml_node_free_list((xmlNodePtr)
node-properties TSRMLS_CC);
break;
case XML_ATTRIBUTE_NODE:
- if ((node-doc != NULL)
(((xmlAttrPtr) node)-atype == XML_ATTRIBUTE_ID)) {
- xmlRemoveID(node-doc,
(xmlAttrPtr) node);
- }
+ if ((node-doc != NULL)
(((xmlAttrPtr) node)-atype == XML_ATTRIBUTE_ID)) {
+ xmlRemoveID(node-doc,
(xmlAttrPtr) node);
+ }
case XML_ATTRIBUTE_DECL:
case XML_DTD_NODE:
case XML_DOCUMENT_TYPE_NODE:
Modified: php/php-src/branches/PHP_5_4/ext/libxml/libxml.c
===
--- php/php-src/branches/PHP_5_4/ext/libxml/libxml.c2011-08-30 03:47:53 UTC
(rev 315755)
+++ php/php-src/branches/PHP_5_4/ext/libxml/libxml.c2011-08-30 05:44:37 UTC
(rev 315756)
@@ -236,9 +236,9 @@
php_libxml_node_free_list((xmlNodePtr)
node-properties TSRMLS_CC);
break;
case XML_ATTRIBUTE_NODE:
- if ((node-doc != NULL)
(((xmlAttrPtr) node)-atype == XML_ATTRIBUTE_ID)) {
- xmlRemoveID(node-doc,
(xmlAttrPtr) node);
- }
+ if ((node-doc != NULL)
(((xmlAttrPtr) node)-atype == XML_ATTRIBUTE_ID)) {
+ xmlRemoveID(node-doc,
(xmlAttrPtr) node);
+ }
case XML_ATTRIBUTE_DECL:
case XML_DTD_NODE:
case XML_DOCUMENT_TYPE_NODE:
@@ -552,8 +552,8 @@
static xmlParserInputPtr _php_libxml_external_entity_loader(const char *URL,
const char *ID, xmlParserCtxtPtr context)
{
-xmlParserInputPtr ret = NULL;
-const char *resource = NULL;
+ xmlParserInputPtr ret = NULL;
+ const char *resource = NULL;
zval*public = NULL,
*system = NULL,
*ctxzv = NULL,
@@ -647,7 +647,7 @@
} else if (Z_TYPE_P(retval_ptr) != IS_NULL) {
/* retval not string nor resource nor null; convert to
string */
SEPARATE_ZVAL(retval_ptr);
- convert_to_string(retval_ptr);
+ convert_to_string(retval_ptr);
goto is_string;
} /* else is null; don't try anything */
}
@@ -671,7 +671,7 @@
if (retval_ptr != NULL) {
zval_ptr_dtor(retval_ptr);
}
-return ret;
+ return ret;
}
PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...)
Modified: php/php-src/trunk/ext/libxml/libxml.c
===
--- php/php-src/trunk/ext/libxml/libxml.c 2011-08-30 03:47:53 UTC (rev
315755)
+++ php/php-src/trunk/ext/libxml/libxml.c 2011-08-30 05:44:37 UTC (rev
315756)
@@ -236,9 +236,9 @@
php_libxml_node_free_list((xmlNodePtr)
node-properties TSRMLS_CC);
break;
case XML_ATTRIBUTE_NODE:
- if ((node-doc != NULL)
(((xmlAttrPtr) node)-atype == XML_ATTRIBUTE_ID)) {
- xmlRemoveID(node-doc,
(xmlAttrPtr) node);
- }
+ if ((node-doc != NULL)
(((xmlAttrPtr) node)-atype == XML_ATTRIBUTE_ID)) {
+
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/main/php_variables.c trunk/main/php_variables.c
pajoye Tue, 23 Aug 2011 18:32:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315380
Log:
- ws
Changed paths:
U php/php-src/branches/PHP_5_4/main/php_variables.c
U php/php-src/trunk/main/php_variables.c
Modified: php/php-src/branches/PHP_5_4/main/php_variables.c
===
--- php/php-src/branches/PHP_5_4/main/php_variables.c 2011-08-23 18:25:13 UTC
(rev 315379)
+++ php/php-src/branches/PHP_5_4/main/php_variables.c 2011-08-23 18:32:53 UTC
(rev 315380)
@@ -597,7 +597,7 @@
|| (key_type == HASH_KEY_IS_STRING
zend_hash_find(dest, string_key, string_key_len, (void **) dest_entry) !=
SUCCESS)
|| (key_type == HASH_KEY_IS_LONG
zend_hash_index_find(dest, num_key, (void **)dest_entry) != SUCCESS)
|| Z_TYPE_PP(dest_entry) != IS_ARRAY
-) {
+ ) {
Z_ADDREF_PP(src_entry);
if (key_type == HASH_KEY_IS_STRING) {
if (!globals_check || string_key_len !=
sizeof(GLOBALS) || memcmp(string_key, GLOBALS, sizeof(GLOBALS) - 1)) {
@@ -662,7 +662,7 @@
zval *vars;
if (PG(variables_order)
- (strchr(PG(variables_order),'P') ||
strchr(PG(variables_order),'p'))
+ (strchr(PG(variables_order),'P') ||
strchr(PG(variables_order),'p'))
!SG(headers_sent)
SG(request_info).request_method
!strcasecmp(SG(request_info).request_method, POST)) {
@@ -736,7 +736,7 @@
zval **argc, **argv;
if (zend_hash_find(EG(symbol_table), argc,
sizeof(argc), (void**)argc) == SUCCESS
- zend_hash_find(EG(symbol_table), argv,
sizeof(argv), (void**)argv) == SUCCESS) {
+ zend_hash_find(EG(symbol_table),
argv, sizeof(argv), (void**)argv) == SUCCESS) {
Z_ADDREF_PP(argc);
Z_ADDREF_PP(argv);
zend_hash_update(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), argv,
sizeof(argv), argv, sizeof(zval *), NULL);
Modified: php/php-src/trunk/main/php_variables.c
===
--- php/php-src/trunk/main/php_variables.c 2011-08-23 18:25:13 UTC (rev
315379)
+++ php/php-src/trunk/main/php_variables.c 2011-08-23 18:32:53 UTC (rev
315380)
@@ -597,7 +597,7 @@
|| (key_type == HASH_KEY_IS_STRING
zend_hash_find(dest, string_key, string_key_len, (void **) dest_entry) !=
SUCCESS)
|| (key_type == HASH_KEY_IS_LONG
zend_hash_index_find(dest, num_key, (void **)dest_entry) != SUCCESS)
|| Z_TYPE_PP(dest_entry) != IS_ARRAY
-) {
+ ) {
Z_ADDREF_PP(src_entry);
if (key_type == HASH_KEY_IS_STRING) {
if (!globals_check || string_key_len !=
sizeof(GLOBALS) || memcmp(string_key, GLOBALS, sizeof(GLOBALS) - 1)) {
@@ -662,7 +662,7 @@
zval *vars;
if (PG(variables_order)
- (strchr(PG(variables_order),'P') ||
strchr(PG(variables_order),'p'))
+ (strchr(PG(variables_order),'P') ||
strchr(PG(variables_order),'p'))
!SG(headers_sent)
SG(request_info).request_method
!strcasecmp(SG(request_info).request_method, POST)) {
@@ -736,7 +736,7 @@
zval **argc, **argv;
if (zend_hash_find(EG(symbol_table), argc,
sizeof(argc), (void**)argc) == SUCCESS
- zend_hash_find(EG(symbol_table), argv,
sizeof(argv), (void**)argv) == SUCCESS) {
+ zend_hash_find(EG(symbol_table),
argv, sizeof(argv), (void**)argv) == SUCCESS) {
Z_ADDREF_PP(argc);
Z_ADDREF_PP(argv);
zend_hash_update(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), argv,
sizeof(argv), argv, sizeof(zval *), NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mbstring/config.w32 trunk/ext/mbstring/config.w32
pajoye Mon, 22 Aug 2011 07:39:09 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315265 Log: - fix typo build Changed paths: U php/php-src/branches/PHP_5_4/ext/mbstring/config.w32 U php/php-src/trunk/ext/mbstring/config.w32 Modified: php/php-src/branches/PHP_5_4/ext/mbstring/config.w32 === --- php/php-src/branches/PHP_5_4/ext/mbstring/config.w322011-08-22 07:38:08 UTC (rev 315264) +++ php/php-src/branches/PHP_5_4/ext/mbstring/config.w322011-08-22 07:39:09 UTC (rev 315265) @@ -29,7 +29,7 @@ mbfilter_iso8859_2.c mbfilter_iso8859_3.c mbfilter_iso8859_4.c \ mbfilter_iso8859_5.c mbfilter_iso8859_6.c mbfilter_iso8859_7.c \ mbfilter_iso8859_8.c mbfilter_iso8859_9.c mbfilter_jis.c \ - mbfilter_iso2022_jp_ms.c mbfilter_gb18030.c mbfiler_sjis_2004.c \ + mbfilter_iso2022_jp_ms.c mbfilter_gb18030.c mbfilter_sjis_2004.c \ mbfilter_koi8r.c mbfilter_qprint.c mbfilter_sjis.c mbfilter_ucs2.c \ mbfilter_ucs4.c mbfilter_uhc.c mbfilter_utf16.c mbfilter_utf32.c \ mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_utf8.c mbfilter_utf8_mobile.c \ Modified: php/php-src/trunk/ext/mbstring/config.w32 === --- php/php-src/trunk/ext/mbstring/config.w32 2011-08-22 07:38:08 UTC (rev 315264) +++ php/php-src/trunk/ext/mbstring/config.w32 2011-08-22 07:39:09 UTC (rev 315265) @@ -29,7 +29,7 @@ mbfilter_iso8859_2.c mbfilter_iso8859_3.c mbfilter_iso8859_4.c \ mbfilter_iso8859_5.c mbfilter_iso8859_6.c mbfilter_iso8859_7.c \ mbfilter_iso8859_8.c mbfilter_iso8859_9.c mbfilter_jis.c \ - mbfilter_iso2022_jp_ms.c mbfilter_gb18030.c mbfiler_sjis_2004.c \ + mbfilter_iso2022_jp_ms.c mbfilter_gb18030.c mbfilter_sjis_2004.c \ mbfilter_koi8r.c mbfilter_qprint.c mbfilter_sjis.c mbfilter_ucs2.c \ mbfilter_ucs4.c mbfilter_uhc.c mbfilter_utf16.c mbfilter_utf32.c \ mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_utf8.c mbfilter_utf8_mobile.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Mon, 22 Aug 2011 07:55:50 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315266 Log: - varnish karma for Anataliy Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-08-22 07:39:09 UTC (rev 315265) +++ SVNROOT/global_avail2011-08-22 07:55:50 UTC (rev 315266) @@ -344,8 +344,8 @@ avail|knut|php/php-src/*/tests avail|laruence|pecl/yaf,phpdoc avail|whereswardy|pecl/handlersocket,phpdoc +avail|ab|pecl/varnish - # Objective-C bridge avail|wez,jan|php/php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/sapi/cli/php_cli_server.c trunk/NEWS trunk/sapi/cli/php_cli_server.c
open a new FR please. Easier than following php-cvs for new FR. On Mon, Aug 22, 2011 at 2:17 PM, Kalle Sommer Nielsen ka...@php.net wrote: Hi 2011/8/22 Xinchen Hui larue...@php.net: laruence Mon, 22 Aug 2011 11:55:41 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315278 Log: Fixed #55463 (cli-server missing _SERVER[REMOTE_ADDR]) We might as well add SERVER_ADDR (+ SERVER_SOFTWARE) if not available too -- regards, Kalle Sommer Nielsen ka...@php.net -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_exceptions.c trunk/Zend/zend_exceptions.c
pajoye Sun, 21 Aug 2011 11:51:00 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315254
Log:
- Fix bug #55471, fix zts build with dtrace (Laruense)
Bug: https://bugs.php.net/55471 (Verified) zend_get_object_classname
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c
U php/php-src/trunk/Zend/zend_exceptions.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c 2011-08-21 09:38:55 UTC
(rev 315253)
+++ php/php-src/branches/PHP_5_4/Zend/zend_exceptions.c 2011-08-21 11:51:00 UTC
(rev 315254)
@@ -89,7 +89,7 @@
int name_len;
if (exception != NULL) {
- zend_get_object_classname(exception, classname,
name_len);
+ zend_get_object_classname(exception, classname,
name_len TSRMLS_CC);
DTRACE_EXCEPTION_THROWN(classname);
} else {
DTRACE_EXCEPTION_THROWN(NULL);
Modified: php/php-src/trunk/Zend/zend_exceptions.c
===
--- php/php-src/trunk/Zend/zend_exceptions.c2011-08-21 09:38:55 UTC (rev
315253)
+++ php/php-src/trunk/Zend/zend_exceptions.c2011-08-21 11:51:00 UTC (rev
315254)
@@ -89,7 +89,8 @@
int name_len;
if (exception != NULL) {
- zend_get_object_classname(exception, classname,
name_len);
+ zend_get_object_classname(exception, classname,
name_len TSRMLS_CC);
+
DTRACE_EXCEPTION_THROWN(classname);
} else {
DTRACE_EXCEPTION_THROWN(NULL);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
pajoye Sun, 21 Aug 2011 14:31:11 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315257 Log: - merge two mysqli section Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2011-08-21 13:23:12 UTC (rev 315256) +++ php/php-src/branches/PHP_5_3/NEWS 2011-08-21 14:31:11 UTC (rev 315257) @@ -169,10 +169,6 @@ . Fixed bug #55169 (mcrypt_create_iv always fails to gather sufficient random data on Windows). (Pierre) -- MySQL Improved extension: - . Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi queries). -(Andrey) - - mysqlnd . Fixed crash when using more than 28,000 bound parameters. Workaround is to set mysqlnd.net_cmd_buffer_size to at least 9000. (Andrey) @@ -182,6 +178,8 @@ - MySQLi extension: . Fixed bug #55283 (SSL options set by mysqli_ssl_set ignored for MySQLi persistent connections). (Andrey) + . Fixed Bug #54221 (mysqli::get_warnings segfault when used in multi queries). +(Andrey) - OpenSSL extension: . openssl_encrypt()/openssl_decrypt() truncated keys of variable length -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/info.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/standard/info.c trunk/ext/standard/info.c
pajoye Fri, 19 Aug 2011 09:59:47 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315170
Log:
- Fixed bug #52461 (Incomplete doctype and missing xmlns)
Bug: https://bugs.php.net/52461 (Assigned) phpinfo() corrections
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/info.c
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/standard/info.c
U php/php-src/trunk/ext/standard/info.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-08-19 09:35:27 UTC (rev 315169)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-08-19 09:59:47 UTC (rev 315170)
@@ -2,6 +2,10 @@
|||
?? ??? 2011, PHP 5.3.8
+- Core:
+ . Fixed bug #52461 (Incomplete doctype and missing xmlns).
+(virsacer at web dot de, Pierre)
+
- Improved NSAPI SAPI: (Uwe Schindler)
. Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403).
Modified: php/php-src/branches/PHP_5_3/ext/standard/info.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/info.c2011-08-19 09:35:27 UTC
(rev 315169)
+++ php/php-src/branches/PHP_5_3/ext/standard/info.c2011-08-19 09:59:47 UTC
(rev 315170)
@@ -626,7 +626,7 @@
PUTS(!DOCTYPE html PUBLIC \-//W3C//DTD XHTML 1.0 Transitional//EN\
\DTD/xhtml1-transitional.dtd\\n);
- PUTS(html);
+ PUTS(html xmlns=\http://www.w3.org/1999/xhtml\;);
PUTS(head\n);
php_info_print_style(TSRMLS_C);
PUTS(titlephpinfo()/title);
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2011-08-19 09:35:27 UTC (rev 315169)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-08-19 09:59:47 UTC (rev 315170)
@@ -6,8 +6,10 @@
. Turn on html_errors by default again in php.ini-production like it was in
PHP 5.3, but only generate docref links when the docref_root INI setting is
not empty.
-- Fixed bug #55378: Binary number literal returns float number though its value
- is small enough. (Derick)
+ . Fixed bug #55378: Binary number literal returns float number though its
value
+is small enough. (Derick)
+ . Fixed bug #52461 (Incomplete doctype and missing xmlns).
+(virsacer at web dot de, Pierre)
- Improved mbstring extension:
. Added Shift_JIS Emoji (pictograms) support. (rui)
Modified: php/php-src/branches/PHP_5_4/ext/standard/info.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/info.c2011-08-19 09:35:27 UTC
(rev 315169)
+++ php/php-src/branches/PHP_5_4/ext/standard/info.c2011-08-19 09:59:47 UTC
(rev 315170)
@@ -633,7 +633,7 @@
PHPAPI void php_print_info_htmlhead(TSRMLS_D)
{
php_info_print(!DOCTYPE html PUBLIC \-//W3C//DTD XHTML 1.0
Transitional//EN\ \DTD/xhtml1-transitional.dtd\\n);
- php_info_print(html);
+ php_info_print(html xmlns=\http://www.w3.org/1999/xhtml\;);
php_info_print(head\n);
php_info_print_style(TSRMLS_C);
php_info_print(titlephpinfo()/title);
Modified: php/php-src/trunk/ext/standard/info.c
===
--- php/php-src/trunk/ext/standard/info.c 2011-08-19 09:35:27 UTC (rev
315169)
+++ php/php-src/trunk/ext/standard/info.c 2011-08-19 09:59:47 UTC (rev
315170)
@@ -633,7 +633,7 @@
PHPAPI void php_print_info_htmlhead(TSRMLS_D)
{
php_info_print(!DOCTYPE html PUBLIC \-//W3C//DTD XHTML 1.0
Transitional//EN\ \DTD/xhtml1-transitional.dtd\\n);
- php_info_print(html);
+ php_info_print(html xmlns=\http://www.w3.org/1999/xhtml\;);
php_info_print(head\n);
php_info_print_style(TSRMLS_C);
php_info_print(titlephpinfo()/title);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_http_parser.h trunk/sapi/cli/php_http_parser.h
pajoye Fri, 19 Aug 2011 11:33:59 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315190 Log: - fix build Changed paths: U php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h U php/php-src/trunk/sapi/cli/php_http_parser.h Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h === --- php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h 2011-08-19 11:22:31 UTC (rev 315189) +++ php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h 2011-08-19 11:33:59 UTC (rev 315190) @@ -28,7 +28,9 @@ #include sys/types.h #if defined(_WIN32) !defined(__MINGW32__) +# include windows.h # include win32/php_stdint.h +# include config.w32.h #else # include stdint.h #endif Modified: php/php-src/trunk/sapi/cli/php_http_parser.h === --- php/php-src/trunk/sapi/cli/php_http_parser.h2011-08-19 11:22:31 UTC (rev 315189) +++ php/php-src/trunk/sapi/cli/php_http_parser.h2011-08-19 11:33:59 UTC (rev 315190) @@ -28,7 +28,9 @@ #include sys/types.h #if defined(_WIN32) !defined(__MINGW32__) +# include windows.h # include win32/php_stdint.h +# include config.w32.h #else # include stdint.h #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_http_parser.c trunk/sapi/cli/php_http_parser.c
pajoye Fri, 19 Aug 2011 11:35:37 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315191
Log:
- undefine CALLBACK (btw, generic names like that should be avoided, w/o prefix
:)
Changed paths:
U php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c
U php/php-src/trunk/sapi/cli/php_http_parser.c
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c
===
--- php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c 2011-08-19
11:33:59 UTC (rev 315190)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c 2011-08-19
11:35:37 UTC (rev 315191)
@@ -55,7 +55,9 @@
} \
} while (0)
-
+#ifdef PHP_WIN32
+# undef CALLBACK
+#endif
#define CALLBACK(FOR)\
do { \
CALLBACK_NOCLEAR(FOR); \
Modified: php/php-src/trunk/sapi/cli/php_http_parser.c
===
--- php/php-src/trunk/sapi/cli/php_http_parser.c2011-08-19 11:33:59 UTC
(rev 315190)
+++ php/php-src/trunk/sapi/cli/php_http_parser.c2011-08-19 11:35:37 UTC
(rev 315191)
@@ -55,7 +55,9 @@
} \
} while (0)
-
+#ifdef PHP_WIN32
+# undef CALLBACK
+#endif
#define CALLBACK(FOR)\
do { \
CALLBACK_NOCLEAR(FOR); \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_http_parser.c branches/PHP_5_4/sapi/cli/php_http_parser.h trunk/sapi/cli/php_http_parser.c trunk/sapi/cli/php_http_parser.h
pajoye Thu, 18 Aug 2011 09:16:04 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=315128
Log:
- do not use 64bit integer instead of size_t (can't be alloc'ed), or when the
actual possible values are 32bit or lower only
Changed paths:
U php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c
U php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h
U php/php-src/trunk/sapi/cli/php_http_parser.c
U php/php-src/trunk/sapi/cli/php_http_parser.h
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c
===
--- php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c 2011-08-18
09:08:00 UTC (rev 315127)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.c 2011-08-18
09:16:04 UTC (rev 315128)
@@ -323,12 +323,12 @@
{
char c, ch;
const char *p = data, *pe;
- int64_t to_read;
+ size_t to_read;
enum state state = (enum state) parser-state;
enum header_states header_state = (enum header_states) parser-header_state;
- uint64_t index = parser-index;
- uint64_t nread = parser-nread;
+ uint32_t index = parser-index;
+ uint32_t nread = parser-nread;
/* technically we could combine all of these (except for url_mark) into one
variable, saving stack space, but it seems more clear to have them
@@ -1425,7 +1425,7 @@
}
case s_body_identity:
-to_read = MIN(pe - p, (int64_t)parser-content_length);
+to_read = MIN(pe - p, (size_t)parser-content_length);
if (to_read 0) {
if (settings-on_body) settings-on_body(parser, p, to_read);
p += to_read - 1;
@@ -1510,7 +1510,7 @@
{
assert(parser-flags F_CHUNKED);
-to_read = MIN(pe - p, (int64_t)(parser-content_length));
+to_read = MIN(pe - p, (size_t)(parser-content_length));
if (to_read 0) {
if (settings-on_body) settings-on_body(parser, p, to_read);
Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h
===
--- php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h 2011-08-18
09:08:00 UTC (rev 315127)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h 2011-08-18
09:16:04 UTC (rev 315128)
@@ -112,7 +112,7 @@
unsigned char index;
uint32_t nread;
- int64_t content_length;
+ size_t content_length;
/** READ-ONLY **/
unsigned short http_major;
Modified: php/php-src/trunk/sapi/cli/php_http_parser.c
===
--- php/php-src/trunk/sapi/cli/php_http_parser.c2011-08-18 09:08:00 UTC
(rev 315127)
+++ php/php-src/trunk/sapi/cli/php_http_parser.c2011-08-18 09:16:04 UTC
(rev 315128)
@@ -323,12 +323,12 @@
{
char c, ch;
const char *p = data, *pe;
- int64_t to_read;
+ size_t to_read;
enum state state = (enum state) parser-state;
enum header_states header_state = (enum header_states) parser-header_state;
- uint64_t index = parser-index;
- uint64_t nread = parser-nread;
+ uint32_t index = parser-index;
+ uint32_t nread = parser-nread;
/* technically we could combine all of these (except for url_mark) into one
variable, saving stack space, but it seems more clear to have them
@@ -1425,7 +1425,7 @@
}
case s_body_identity:
-to_read = MIN(pe - p, (int64_t)parser-content_length);
+to_read = MIN(pe - p, (size_t)parser-content_length);
if (to_read 0) {
if (settings-on_body) settings-on_body(parser, p, to_read);
p += to_read - 1;
@@ -1510,7 +1510,7 @@
{
assert(parser-flags F_CHUNKED);
-to_read = MIN(pe - p, (int64_t)(parser-content_length));
+to_read = MIN(pe - p, (size_t)(parser-content_length));
if (to_read 0) {
if (settings-on_body) settings-on_body(parser, p, to_read);
Modified: php/php-src/trunk/sapi/cli/php_http_parser.h
===
--- php/php-src/trunk/sapi/cli/php_http_parser.h2011-08-18 09:08:00 UTC
(rev 315127)
+++ php/php-src/trunk/sapi/cli/php_http_parser.h2011-08-18 09:16:04 UTC
(rev 315128)
@@ -112,7 +112,7 @@
unsigned char index;
uint32_t nread;
- int64_t content_length;
+ size_t content_length;
/** READ-ONLY **/
unsigned short http_major;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_http_parser.h trunk/sapi/cli/php_http_parser.h
pajoye Wed, 17 Aug 2011 11:56:04 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315061 Log: - use provided stdint.h and avoid double definitions Changed paths: U php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h U php/php-src/trunk/sapi/cli/php_http_parser.h Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h === --- php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h 2011-08-17 11:52:31 UTC (rev 315060) +++ php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h 2011-08-17 11:56:04 UTC (rev 315061) @@ -28,17 +28,7 @@ #include sys/types.h #if defined(_WIN32) !defined(__MINGW32__) -typedef __int8 int8_t; -typedef unsigned __int8 uint8_t; -typedef __int16 int16_t; -typedef unsigned __int16 uint16_t; -typedef __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; - -typedef unsigned int size_t; -typedef int ssize_t; +#include win32/php_stdint.h #else #include stdint.h #endif Modified: php/php-src/trunk/sapi/cli/php_http_parser.h === --- php/php-src/trunk/sapi/cli/php_http_parser.h2011-08-17 11:52:31 UTC (rev 315060) +++ php/php-src/trunk/sapi/cli/php_http_parser.h2011-08-17 11:56:04 UTC (rev 315061) @@ -28,17 +28,7 @@ #include sys/types.h #if defined(_WIN32) !defined(__MINGW32__) -typedef __int8 int8_t; -typedef unsigned __int8 uint8_t; -typedef __int16 int16_t; -typedef unsigned __int16 uint16_t; -typedef __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; - -typedef unsigned int size_t; -typedef int ssize_t; +#include win32/php_stdint.h #else #include stdint.h #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_http_parser.h trunk/sapi/cli/php_http_parser.h
pajoye Wed, 17 Aug 2011 11:59:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=315062 Log: - WS Changed paths: U php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h U php/php-src/trunk/sapi/cli/php_http_parser.h Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h === --- php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h 2011-08-17 11:56:04 UTC (rev 315061) +++ php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h 2011-08-17 11:59:39 UTC (rev 315062) @@ -28,9 +28,9 @@ #include sys/types.h #if defined(_WIN32) !defined(__MINGW32__) -#include win32/php_stdint.h +# include win32/php_stdint.h #else -#include stdint.h +# include stdint.h #endif /* Compile with -DPHP_HTTP_PARSER_STRICT=0 to make less checks, but run Modified: php/php-src/trunk/sapi/cli/php_http_parser.h === --- php/php-src/trunk/sapi/cli/php_http_parser.h2011-08-17 11:56:04 UTC (rev 315061) +++ php/php-src/trunk/sapi/cli/php_http_parser.h2011-08-17 11:59:39 UTC (rev 315062) @@ -28,9 +28,9 @@ #include sys/types.h #if defined(_WIN32) !defined(__MINGW32__) -#include win32/php_stdint.h +# include win32/php_stdint.h #else -#include stdint.h +# include stdint.h #endif /* Compile with -DPHP_HTTP_PARSER_STRICT=0 to make less checks, but run -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/ereg/regex/regerror.c branches/PHP_5_4/ext/ereg/regex/regerror.c trunk/ext/ereg/regex/regerror.c
pajoye Thu, 11 Aug 2011 07:11:39 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314775 Log: - fix build (introduce by r314641) Changed paths: U php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c U php/php-src/branches/PHP_5_4/ext/ereg/regex/regerror.c U php/php-src/trunk/ext/ereg/regex/regerror.c Modified: php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c === --- php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c 2011-08-11 07:07:10 UTC (rev 314774) +++ php/php-src/branches/PHP_5_3/ext/ereg/regex/regerror.c 2011-08-11 07:11:39 UTC (rev 314775) @@ -8,6 +8,7 @@ #include regex.h #include utils.h #include regerror.ih +#include php.h /* = #define REG_OKAY 0 Modified: php/php-src/branches/PHP_5_4/ext/ereg/regex/regerror.c === --- php/php-src/branches/PHP_5_4/ext/ereg/regex/regerror.c 2011-08-11 07:07:10 UTC (rev 314774) +++ php/php-src/branches/PHP_5_4/ext/ereg/regex/regerror.c 2011-08-11 07:11:39 UTC (rev 314775) @@ -8,6 +8,7 @@ #include regex.h #include utils.h #include regerror.ih +#include php.h /* = #define REG_OKAY 0 Modified: php/php-src/trunk/ext/ereg/regex/regerror.c === --- php/php-src/trunk/ext/ereg/regex/regerror.c 2011-08-11 07:07:10 UTC (rev 314774) +++ php/php-src/trunk/ext/ereg/regex/regerror.c 2011-08-11 07:11:39 UTC (rev 314775) @@ -8,6 +8,7 @@ #include regex.h #include utils.h #include regerror.ih +#include php.h /* = #define REG_OKAY 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/dns.c branches/PHP_5_4/ext/standard/dns.c trunk/ext/standard/dns.c
hi Ilia, This does not sound correct and somehow random (host names are not paths). See http://msdn.microsoft.com/en-us/library/ms738532(v=vs.85).aspx for an example. On Wed, Aug 10, 2011 at 5:59 PM, Ilia Alshanetsky il...@php.net wrote: iliaa Wed, 10 Aug 2011 15:59:32 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314753 Log: Fix win32 build Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/dns.c U php/php-src/branches/PHP_5_4/ext/standard/dns.c U php/php-src/trunk/ext/standard/dns.c Modified: php/php-src/branches/PHP_5_3/ext/standard/dns.c === --- php/php-src/branches/PHP_5_3/ext/standard/dns.c 2011-08-10 15:55:36 UTC (rev 314752) +++ php/php-src/branches/PHP_5_3/ext/standard/dns.c 2011-08-10 15:59:32 UTC (rev 314753) @@ -62,6 +62,10 @@ #define AF_INET 2 /* internetwork: UDP, TCP, etc. */ #endif +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN 255 +#endif + #include php_dns.h /* type compat */ Modified: php/php-src/branches/PHP_5_4/ext/standard/dns.c === --- php/php-src/branches/PHP_5_4/ext/standard/dns.c 2011-08-10 15:55:36 UTC (rev 314752) +++ php/php-src/branches/PHP_5_4/ext/standard/dns.c 2011-08-10 15:59:32 UTC (rev 314753) @@ -62,6 +62,10 @@ #define AF_INET 2 /* internetwork: UDP, TCP, etc. */ #endif +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN 255 +#endif + #include php_dns.h /* type compat */ Modified: php/php-src/trunk/ext/standard/dns.c === --- php/php-src/trunk/ext/standard/dns.c 2011-08-10 15:55:36 UTC (rev 314752) +++ php/php-src/trunk/ext/standard/dns.c 2011-08-10 15:59:32 UTC (rev 314753) @@ -62,6 +62,10 @@ #define AF_INET 2 /* internetwork: UDP, TCP, etc. */ #endif +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN 255 +#endif + #include php_dns.h /* type compat */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/basic_functions.c branches/PHP_5_4/ext/standard/basic_functions.c trunk/ext/standard/basic_functions.c
We however have plenty of realloc calls without any checks.
Cheers,
On Sun, Aug 7, 2011 at 3:50 PM, Antony Dovgal t...@daylessday.org wrote:
On 08/07/2011 05:19 PM, Xinchen Hui wrote:
opts = (opt_struct *) erealloc(opts, sizeof(opt_struct) *
(len + count + 1));
+ if (!opts) {
+ RETURN_FALSE;
+ }
+
erealloc() cannot return NULL whatever happens and if you look at the
sources, you'll notice that nobody
ever checks the result of emalloc(), erealloc() or ecalloc().
That's because Zend memory manager shuts down the whole process if it fails
to allocate a memory segment.
See Zend/zend_alloc.c for details.
--
Wbr,
Antony Dovgal
---
http://pinba.org - realtime profiling for PHP
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Wed, 03 Aug 2011 13:19:03 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314161 Log: - update libcurl to 7.21.7 Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2011-08-03 12:40:58 UTC (rev 314160) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2011-08-03 13:19:03 UTC (rev 314161) @@ -1,2 +1,2 @@ -libcurl-7.21.6 +libcurl-7.21.7 libpng-1.2.46 Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2011-08-03 12:40:58 UTC (rev 314160) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2011-08-03 13:19:03 UTC (rev 314161) @@ -1,2 +1,2 @@ -libcurl-7.21.6 +libcurl-7.21.7 libpng-1.2.46 Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2011-08-03 12:40:58 UTC (rev 314160) +++ php/php-src/trunk/win32/build/libs_version.txt 2011-08-03 13:19:03 UTC (rev 314161) @@ -1,2 +1,2 @@ -libcurl-7.21.6 +libcurl-7.21.7 libpng-1.2.46 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Wed, 03 Aug 2011 13:46:11 + Revision: http://svn.php.net/viewvc?view=revisionrevision=314163 Log: - pecl/lua karma for laruence Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-08-03 13:43:34 UTC (rev 314162) +++ SVNROOT/global_avail2011-08-03 13:46:11 UTC (rev 314163) @@ -274,7 +274,7 @@ avail|sankazim,zardozrocks|pecl/amfext,phpdoc avail|doury|pecl/ims avail|va|pecl/yami -avail|msaraujo,mansion|pecl/lua +avail|msaraujo,mansion,laruence|pecl/lua avail|merletenney,kirtig,harveyrd,kuntakinte14,ebatutis,tex,vsavchuk|pecl/intl,pecl/unicode,phpdoc/en/*/reference/intl,php/php-src/*/ext/intl avail|kirtig|pecl/rb avail|lucas|pecl/apd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/tests/strings/ crypt_blowfish.phpt
pajoye Sun, 31 Jul 2011 10:11:20 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313990
Log:
- add test for blowfish 1.2 (Solar Designer)
Changed paths:
A
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish.phpt
Added:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish.phpt
2011-07-31 10:11:20 UTC (rev 313990)
@@ -0,0 +1,50 @@
+--TEST--
+Official blowfish tests
(http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/glibc/crypt_blowfish/wrapper.c)
+--SKIPIF--
+?php
+if (!function_exists('crypt') || !defined(CRYPT_BLOWFISH)) {
+die(SKIP crypt()-blowfish is not available);
+}
+?
+--FILE--
+?php
+
+$tests =array(
+ array('$2a$05$C.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW',
'U*U'),
+ array('$2a$05$C.VGOzA784oUp/Z0DY336zx7pLYAy0lwK',
'U*U*'),
+ array('$2a$05$XOAcXxm9kjPGEMsLznoKqmqw7tc8WCx4a',
'U*U*U'),
+ array('$2a$05$abcdefghijklmnopqrstuu5s2v8.iXieOjg/.AySBTTZIIVFJeBui',
'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789chars
after 72 are ignored'),
+ array('$2x$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e',
\xa3),
+ array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq',
\xa3),
+ array('$2x$05$6bNw2HLQYeqHYyBfLMsv/OiwqTymGIGzFsA4hOTWebfehXHNprcAS',
\xd1\x91),
+ array('$2x$05$6bNw2HLQYeqHYyBfLMsv/O9LIGgn8OMzuDoHfof8AQimSGfcSWxnS',
\xd0\xc1\xd2\xcf\xcc\xd8),
+ array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.swQOIzjOiJ9GHEPuhEkvqrUyvWhEMx6',
\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaachars
after 72 are ignored as usual),
+ array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.R9xrDjiycxMbQE2bp.vgqlYpW5wx2yy',
\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55),
+ array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.9tQZzcJfm3uj2NvJ/n5xkhpqLrMpWCe',
\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff),
+array('$2a$05$C.7uG0VCzI2bS7j6ymqJi9CdcdxiRTWNy',
''),
+
+);
+$i=0;
+foreach($tests as $test) {
+ if(crypt($test[1], $test[0]) == $test[0]) {
+echo $i. OK\n;
+ } else {
+echo $i. Not OK: $test[0] .crypt($test[1], $test[0]).\n;
+ }
+ $i++;
+}
+
+?
+--EXPECT--
+0. OK
+1. OK
+2. OK
+3. OK
+4. OK
+5. OK
+6. OK
+7. OK
+8. OK
+9. OK
+10. OK
+11. OK
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/crypt.c branches/PHP_5_4/ext/standard/crypt.c branches/PHP_5_4/ext/standard/tests/strings/crypt_blowfish.phpt trunk/ext/standard/crypt.c trun
pajoye Sun, 31 Jul 2011 20:50:09 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313999
Log:
- blowfish 1.2 update, 2nd part
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/crypt.c
U php/php-src/branches/PHP_5_4/ext/standard/crypt.c
U
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/crypt_blowfish.phpt
U php/php-src/trunk/ext/standard/crypt.c
U php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/crypt.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/crypt.c 2011-07-31 18:51:15 UTC (rev 313998)
+++ php/php-src/branches/PHP_5_3/ext/standard/crypt.c 2011-07-31 20:50:09 UTC (rev 313999)
@@ -242,7 +242,7 @@
} else if (
salt[0] == '$'
salt[1] == '2'
-salt[2] == 'a'
+salt[2] = 'a' salt[2] = 'z'
salt[3] == '$'
salt[4] = '0' salt[4] = '3'
salt[5] = '0' salt[5] = '9'
Modified: php/php-src/branches/PHP_5_4/ext/standard/crypt.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/crypt.c 2011-07-31 18:51:15 UTC (rev 313998)
+++ php/php-src/branches/PHP_5_4/ext/standard/crypt.c 2011-07-31 20:50:09 UTC (rev 313999)
@@ -242,7 +242,7 @@
} else if (
salt[0] == '$'
salt[1] == '2'
- (salt[2] != 'a' salt[2] != 'x') ||
+salt[2] = 'a' salt[2] = 'z'
salt[3] == '$'
salt[4] = '0' salt[4] = '3'
salt[5] = '0' salt[5] = '9'
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/strings/crypt_blowfish.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/crypt_blowfish.phpt 2011-07-31 18:51:15 UTC (rev 313998)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/crypt_blowfish.phpt 2011-07-31 20:50:09 UTC (rev 313999)
@@ -15,13 +15,27 @@
array('$2a$05$XOAcXxm9kjPGEMsLznoKqmqw7tc8WCx4a', 'U*U*U'),
array('$2a$05$abcdefghijklmnopqrstuu5s2v8.iXieOjg/.AySBTTZIIVFJeBui', '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789chars after 72 are ignored'),
array('$2x$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e', \xa3),
+ array('$2x$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e', \xff\xff\xa3),
+ array('$2y$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e', \xff\xff\xa3),
+ array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.nqd1wy.pTMdcvrRWxyiGL2eMz.2a85.', \xff\xff\xa3),
+ array('$2y$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq', \xa3),
array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq', \xa3),
+ array('$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi', 1\xa3345),
+ array('$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi', \xff\xa3345),
+ array('$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi', \xff\xa334\xff\xff\xff\xa3345),
+ array('$2y$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi', \xff\xa334\xff\xff\xff\xa3345),
+ array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.ZC1JEJ8Z4gPfpe1JOr/oyPXTWl9EFd.', \xff\xa334\xff\xff\xff\xa3345),
+ array('$2y$05$/OK.fbVrR/bpIqNJ5ianF.nRht2l/HRhr6zmCp9vYUvvsqynflf9e', \xff\xa3345),
+ array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.nRht2l/HRhr6zmCp9vYUvvsqynflf9e', \xff\xa3345),
+ array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS', \xa3ab),
+ array('$2x$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS', \xa3ab),
+ array('$2y$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS', \xa3ab),
array('$2x$05$6bNw2HLQYeqHYyBfLMsv/OiwqTymGIGzFsA4hOTWebfehXHNprcAS', \xd1\x91),
array('$2x$05$6bNw2HLQYeqHYyBfLMsv/O9LIGgn8OMzuDoHfof8AQimSGfcSWxnS', \xd0\xc1\xd2\xcf\xcc\xd8),
array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.swQOIzjOiJ9GHEPuhEkvqrUyvWhEMx6', \xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaachars after 72 are ignored as usual),
array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.R9xrDjiycxMbQE2bp.vgqlYpW5wx2yy', \xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55),
array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.9tQZzcJfm3uj2NvJ/n5xkhpqLrMpWCe', \x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff),
-
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Fri, 29 Jul 2011 18:03:54 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313949 Log: - s,weltling,ab, Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-07-29 17:07:14 UTC (rev 313948) +++ SVNROOT/global_avail2011-07-29 18:03:54 UTC (rev 313949) @@ -339,7 +339,7 @@ avail|dthompsono99|pecl/xcb,phpdoc avail|tpenner4d|pecl/pdo_4d,phpdoc avail|ianb|pecl/svm,phpdoc -avail|michelec,weltling|pecl/rsync,phpdoc +avail|michelec,ab|pecl/rsync,phpdoc avail|dsr|pecl/sam,phpdoc avail|jtansavatdi|pecl/amqp,phpdoc avail|knut|php/php-src/*/tests -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/Zend/ zend_string.c zend_string.h
hi Gobal,
Could you add a note in UPGRADING.INTERNALS about this change please?
Thansk!
On Thu, Jul 28, 2011 at 1:34 AM, Gopal Vijayaraghavan gop...@php.net wrote:
gopalv Wed, 27 Jul 2011 23:34:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313803
Log:
Allow zend_is_interned_string to be pluggable
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_string.c
U php/php-src/branches/PHP_5_4/Zend/zend_string.h
Modified: php/php-src/branches/PHP_5_4/Zend/zend_string.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_string.c 2011-07-27 23:06:09
UTC (rev 313802)
+++ php/php-src/branches/PHP_5_4/Zend/zend_string.c 2011-07-27 23:34:49
UTC (rev 313803)
@@ -30,10 +30,12 @@
#endif
ZEND_API const char *(*zend_new_interned_string)(const char *str, int len,
int free_src TSRMLS_DC);
+ZEND_API zend_bool (*zend_is_interned_string)(const char *str TSRMLS_DC);
ZEND_API void (*zend_interned_strings_snapshot)(TSRMLS_D);
ZEND_API void (*zend_interned_strings_restore)(TSRMLS_D);
static const char *zend_new_interned_string_int(const char *str, int len,
int free_src TSRMLS_DC);
+static zend_bool zend_is_interned_string_int(const char *str TSRMLS_DC);
static void zend_interned_strings_snapshot_int(TSRMLS_D);
static void zend_interned_strings_restore_int(TSRMLS_D);
@@ -64,6 +66,7 @@
#endif
zend_new_interned_string = zend_new_interned_string_int;
+ zend_is_interned_string = zend_is_interned_string_int;
zend_interned_strings_snapshot = zend_interned_strings_snapshot_int;
zend_interned_strings_restore = zend_interned_strings_restore_int;
}
@@ -177,6 +180,11 @@
#endif
}
+static zend_bool zend_is_interned_string_int(const char *s TSRMLS_DC)
+{
+ return (((s) = CG(interned_strings_start)) ((s)
CG(interned_strings_end)));
+}
+
static void zend_interned_strings_snapshot_int(TSRMLS_D)
{
CG(interned_strings_snapshot_top) = CG(interned_strings_top);
Modified: php/php-src/branches/PHP_5_4/Zend/zend_string.h
===
--- php/php-src/branches/PHP_5_4/Zend/zend_string.h 2011-07-27 23:06:09
UTC (rev 313802)
+++ php/php-src/branches/PHP_5_4/Zend/zend_string.h 2011-07-27 23:34:49
UTC (rev 313803)
@@ -24,6 +24,7 @@
#include zend.h
ZEND_API extern const char *(*zend_new_interned_string)(const char *str, int
len, int free_src TSRMLS_DC);
+ZEND_API extern zend_bool (*zend_is_interned_string)(const char *str
TSRMLS_DC);
ZEND_API extern void (*zend_interned_strings_snapshot)(TSRMLS_D);
ZEND_API extern void (*zend_interned_strings_restore)(TSRMLS_D);
@@ -33,7 +34,7 @@
#ifndef ZTS
#define IS_INTERNED(s) \
- (((s) = CG(interned_strings_start)) ((s)
CG(interned_strings_end)))
+ (zend_is_interned_string ? zend_is_interned_string((s) TSRMLS_CC) : 0)
#else
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Thu, 28 Jul 2011 07:07:29 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313813 Log: - weltling karma for rsync Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-07-28 07:00:25 UTC (rev 313812) +++ SVNROOT/global_avail2011-07-28 07:07:29 UTC (rev 313813) @@ -42,7 +42,7 @@ avail|loudi,cweiske,mrkschan,pmjones|phd,web/doc,web/doc-editor # People who work on the Engine - not people with just tests access -avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron,gopalv|php/php-src/*/Zend,php/php-src/*/TSRM +avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron|php/php-src/*/Zend,php/php-src/*/TSRM # The PHP Documentation Group maintains the documentation and its # translations. @@ -339,7 +339,7 @@ avail|dthompsono99|pecl/xcb,phpdoc avail|tpenner4d|pecl/pdo_4d,phpdoc avail|ianb|pecl/svm,phpdoc -avail|michelec|pecl/rsync,phpdoc +avail|michelec,weltling|pecl/rsync,phpdoc avail|dsr|pecl/sam,phpdoc avail|jtansavatdi|pecl/amqp,phpdoc avail|knut|php/php-src/*/tests -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Thu, 28 Jul 2011 07:37:11 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313814 Log: - oops, restore gopal's karma for zend Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-07-28 07:07:29 UTC (rev 313813) +++ SVNROOT/global_avail2011-07-28 07:37:11 UTC (rev 313814) @@ -42,7 +42,7 @@ avail|loudi,cweiske,mrkschan,pmjones|phd,web/doc,web/doc-editor # People who work on the Engine - not people with just tests access -avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron|php/php-src/*/Zend,php/php-src/*/TSRM +avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron,gopalv|php/php-src/*/Zend,php/php-src/*/TSRM # The PHP Documentation Group maintains the documentation and its # translations. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/Zend/ zend_string.c zend_string.h
On Thu, Jul 28, 2011 at 9:30 AM, Stas Malyshev smalys...@sugarcrm.com wrote: Hi! On 7/28/11 12:04 AM, Pierre Joye wrote: hi Gobal, Could you add a note in UPGRADING.INTERNALS about this change please? AFAIK, 5.3 had no interned strings. So it's not clear what upgrading means here. It is about what's new in 5.4+ and how to use them, etc. -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/curl/interface.c branches/PHP_5_4/ext/curl/interface.c trunk/ext/curl/interface.c
pajoye Thu, 28 Jul 2011 10:31:34 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313826
Log:
- Fix #55301 (curl part) check if malloc succeded
Bug: https://bugs.php.net/55301 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/curl/interface.c
U php/php-src/branches/PHP_5_4/ext/curl/interface.c
U php/php-src/trunk/ext/curl/interface.c
Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c 2011-07-28 10:27:23 UTC
(rev 313825)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c 2011-07-28 10:31:34 UTC
(rev 313826)
@@ -821,6 +821,9 @@
int i, c = CRYPTO_num_locks();
php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T));
+ if (!php_curl_openssl_tsl) {
+ return FAILURE;
+ }
for (i = 0; i c; ++i) {
php_curl_openssl_tsl[i] = tsrm_mutex_alloc();
Modified: php/php-src/branches/PHP_5_4/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_4/ext/curl/interface.c 2011-07-28 10:27:23 UTC
(rev 313825)
+++ php/php-src/branches/PHP_5_4/ext/curl/interface.c 2011-07-28 10:31:34 UTC
(rev 313826)
@@ -819,6 +819,9 @@
int i, c = CRYPTO_num_locks();
php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T));
+ if (!php_curl_openssl_tsl) {
+ return FAILURE;
+ }
for (i = 0; i c; ++i) {
php_curl_openssl_tsl[i] = tsrm_mutex_alloc();
Modified: php/php-src/trunk/ext/curl/interface.c
===
--- php/php-src/trunk/ext/curl/interface.c 2011-07-28 10:27:23 UTC (rev
313825)
+++ php/php-src/trunk/ext/curl/interface.c 2011-07-28 10:31:34 UTC (rev
313826)
@@ -819,6 +819,9 @@
int i, c = CRYPTO_num_locks();
php_curl_openssl_tsl = malloc(c * sizeof(MUTEX_T));
+ if (!php_curl_openssl_tsl) {
+ return FAILURE;
+ }
for (i = 0; i c; ++i) {
php_curl_openssl_tsl[i] = tsrm_mutex_alloc();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/com_dotnet/com_dotnet.c branches/PHP_5_4/ext/com_dotnet/com_dotnet.c trunk/ext/com_dotnet/com_dotnet.c
pajoye Thu, 28 Jul 2011 10:34:16 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313827
Log:
- Fix #55301 (com_dotnet part) check if malloc succeded
Bug: https://bugs.php.net/55301 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/com_dotnet/com_dotnet.c
U php/php-src/branches/PHP_5_4/ext/com_dotnet/com_dotnet.c
U php/php-src/trunk/ext/com_dotnet/com_dotnet.c
Modified: php/php-src/branches/PHP_5_3/ext/com_dotnet/com_dotnet.c
===
--- php/php-src/branches/PHP_5_3/ext/com_dotnet/com_dotnet.c2011-07-28
10:31:34 UTC (rev 313826)
+++ php/php-src/branches/PHP_5_3/ext/com_dotnet/com_dotnet.c2011-07-28
10:34:16 UTC (rev 313827)
@@ -129,6 +129,9 @@
char *where = ;
stuff = malloc(sizeof(*stuff));
+ if (!stuff) {
+ return S_FALSE;
+ }
memset(stuff, 0, sizeof(*stuff));
where = CoCreateInstance;
Modified: php/php-src/branches/PHP_5_4/ext/com_dotnet/com_dotnet.c
===
--- php/php-src/branches/PHP_5_4/ext/com_dotnet/com_dotnet.c2011-07-28
10:31:34 UTC (rev 313826)
+++ php/php-src/branches/PHP_5_4/ext/com_dotnet/com_dotnet.c2011-07-28
10:34:16 UTC (rev 313827)
@@ -129,6 +129,9 @@
char *where = ;
stuff = malloc(sizeof(*stuff));
+ if (!stuff) {
+ return S_FALSE;
+ }
memset(stuff, 0, sizeof(*stuff));
where = CoCreateInstance;
Modified: php/php-src/trunk/ext/com_dotnet/com_dotnet.c
===
--- php/php-src/trunk/ext/com_dotnet/com_dotnet.c 2011-07-28 10:31:34 UTC
(rev 313826)
+++ php/php-src/trunk/ext/com_dotnet/com_dotnet.c 2011-07-28 10:34:16 UTC
(rev 313827)
@@ -129,6 +129,9 @@
char *where = ;
stuff = malloc(sizeof(*stuff));
+ if (!stuff) {
+ return S_FALSE;
+ }
memset(stuff, 0, sizeof(*stuff));
where = CoCreateInstance;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c trunk/ext/pdo_odbc/pdo_odbc.c
pajoye Thu, 28 Jul 2011 10:37:04 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313828
Log:
- Fix #55301 (pdo_odbc part) check if malloc succeded
Bug: https://bugs.php.net/55301 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c
U php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c
U php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c
Modified: php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c2011-07-28
10:34:16 UTC (rev 313827)
+++ php/php-src/branches/PHP_5_3/ext/pdo_odbc/pdo_odbc.c2011-07-28
10:37:04 UTC (rev 313828)
@@ -98,6 +98,9 @@
char *instance = INI_STR(pdo_odbc.db2_instance_name);
if (instance) {
char *env = malloc(sizeof(DB2INSTANCE=) +
strlen(instance));
+ if (!env) {
+ return FAILURE;
+ }
strcpy(env, DB2INSTANCE=);
strcat(env, instance);
putenv(env);
Modified: php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c
===
--- php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c2011-07-28
10:34:16 UTC (rev 313827)
+++ php/php-src/branches/PHP_5_4/ext/pdo_odbc/pdo_odbc.c2011-07-28
10:37:04 UTC (rev 313828)
@@ -98,6 +98,9 @@
char *instance = INI_STR(pdo_odbc.db2_instance_name);
if (instance) {
char *env = malloc(sizeof(DB2INSTANCE=) +
strlen(instance));
+ if (!env) {
+ return FAILURE;
+ }
strcpy(env, DB2INSTANCE=);
strcat(env, instance);
putenv(env);
Modified: php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c
===
--- php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c 2011-07-28 10:34:16 UTC (rev
313827)
+++ php/php-src/trunk/ext/pdo_odbc/pdo_odbc.c 2011-07-28 10:37:04 UTC (rev
313828)
@@ -98,6 +98,9 @@
char *instance = INI_STR(pdo_odbc.db2_instance_name);
if (instance) {
char *env = malloc(sizeof(DB2INSTANCE=) +
strlen(instance));
+ if (!env) {
+ return FAILURE;
+ }
strcpy(env, DB2INSTANCE=);
strcat(env, instance);
putenv(env);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/interbase/ interbase.c
pajoye Thu, 28 Jul 2011 10:39:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313830
Log:
- Fix #55301 (interbase part) check if malloc succeded
Bug: https://bugs.php.net/55301 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/interbase/interbase.c
Modified: php/php-src/branches/PHP_5_3/ext/interbase/interbase.c
===
--- php/php-src/branches/PHP_5_3/ext/interbase/interbase.c 2011-07-28
10:39:08 UTC (rev 313829)
+++ php/php-src/branches/PHP_5_3/ext/interbase/interbase.c 2011-07-28
10:39:19 UTC (rev 313830)
@@ -998,9 +998,12 @@
ZEND_REGISTER_RESOURCE(return_value, ib_link, le_link);
} else {
zend_rsrc_list_entry new_le;
-
+
ib_link = (ibase_db_link *)
malloc(sizeof(ibase_db_link));
-
+ if (!ib_link) {
+ RETURN_FALSE;
+ }
+
/* hash it up */
Z_TYPE(new_le) = le_plink;
new_le.ptr = ib_link;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/readline/readline.c branches/PHP_5_4/ext/readline/readline.c trunk/ext/readline/readline.c
pajoye Thu, 28 Jul 2011 10:42:45 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313831
Log:
- Fix #55301 (readline part) check if malloc succeded
Bug: https://bugs.php.net/55301 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/readline/readline.c
U php/php-src/branches/PHP_5_4/ext/readline/readline.c
U php/php-src/trunk/ext/readline/readline.c
Modified: php/php-src/branches/PHP_5_3/ext/readline/readline.c
===
--- php/php-src/branches/PHP_5_3/ext/readline/readline.c2011-07-28
10:39:19 UTC (rev 313830)
+++ php/php-src/branches/PHP_5_3/ext/readline/readline.c2011-07-28
10:42:45 UTC (rev 313831)
@@ -465,6 +465,9 @@
matches =
rl_completion_matches(text,_readline_command_generator);
} else {
matches = malloc(sizeof(char *) * 2);
+ if (!matches) {
+ return NULL;
+ }
matches[0] = strdup();
matches[1] = '\0';
}
@@ -505,7 +508,10 @@
zval_copy_ctor(_readline_completion);
rl_attempted_completion_function = _readline_completion_cb;
-
+ if (rl_attempted_completion_function == NULL) {
+ efree(name);
+ RETURN_FALSE;
+ }
RETURN_TRUE;
}
Modified: php/php-src/branches/PHP_5_4/ext/readline/readline.c
===
--- php/php-src/branches/PHP_5_4/ext/readline/readline.c2011-07-28
10:39:19 UTC (rev 313830)
+++ php/php-src/branches/PHP_5_4/ext/readline/readline.c2011-07-28
10:42:45 UTC (rev 313831)
@@ -478,6 +478,9 @@
matches =
rl_completion_matches(text,_readline_command_generator);
} else {
matches = malloc(sizeof(char *) * 2);
+ if (!matches) {
+ return NULL;
+ }
matches[0] = strdup();
matches[1] = '\0';
}
@@ -518,7 +521,10 @@
zval_copy_ctor(_readline_completion);
rl_attempted_completion_function = _readline_completion_cb;
-
+ if (rl_attempted_completion_function == NULL) {
+ efree(name);
+ RETURN_FALSE;
+ }
RETURN_TRUE;
}
Modified: php/php-src/trunk/ext/readline/readline.c
===
--- php/php-src/trunk/ext/readline/readline.c 2011-07-28 10:39:19 UTC (rev
313830)
+++ php/php-src/trunk/ext/readline/readline.c 2011-07-28 10:42:45 UTC (rev
313831)
@@ -478,6 +478,9 @@
matches =
rl_completion_matches(text,_readline_command_generator);
} else {
matches = malloc(sizeof(char *) * 2);
+ if (!matches) {
+ return NULL;
+ }
matches[0] = strdup();
matches[1] = '\0';
}
@@ -518,7 +521,10 @@
zval_copy_ctor(_readline_completion);
rl_attempted_completion_function = _readline_completion_cb;
-
+ if (rl_attempted_completion_function == NULL) {
+ efree(name);
+ RETURN_FALSE;
+ }
RETURN_TRUE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/url_scanner_ex.c branches/PHP_5_3/ext/standard/url_scanner_ex.re branches/PHP_5_4/ext/standard/url_scanner_ex.c branches/PHP_5_4/ext/standard
pajoye Thu, 28 Jul 2011 10:52:45 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313832
Log:
- Fix #55301 (url scanner part) check if malloc succeded
Bug: https://bugs.php.net/55301 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.c
U php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.re
U php/php-src/branches/PHP_5_4/ext/standard/url_scanner_ex.c
U php/php-src/branches/PHP_5_4/ext/standard/url_scanner_ex.re
U php/php-src/trunk/ext/standard/url_scanner_ex.c
U php/php-src/trunk/ext/standard/url_scanner_ex.re
Modified: php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.c 2011-07-28
10:42:45 UTC (rev 313831)
+++ php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.c 2011-07-28
10:52:45 UTC (rev 313832)
@@ -57,9 +57,12 @@
if (ctx-tags)
zend_hash_destroy(ctx-tags);
- else
+ else {
ctx-tags = malloc(sizeof(HashTable));
-
+ if (!ctx-tags) {
+ return FAILURE;
+ }
+ }
zend_hash_init(ctx-tags, 0, NULL, NULL, 1);
for (key = php_strtok_r(tmp, ,, lasts);
Modified: php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.re
===
--- php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.re 2011-07-28
10:42:45 UTC (rev 313831)
+++ php/php-src/branches/PHP_5_3/ext/standard/url_scanner_ex.re 2011-07-28
10:52:45 UTC (rev 313832)
@@ -55,9 +55,13 @@
if (ctx-tags)
zend_hash_destroy(ctx-tags);
- else
+ else {
ctx-tags = malloc(sizeof(HashTable));
-
+ if (!ctx-tags) {
+ return FAILURE;
+ }
+ }
+
zend_hash_init(ctx-tags, 0, NULL, NULL, 1);
for (key = php_strtok_r(tmp, ,, lasts);
Modified: php/php-src/branches/PHP_5_4/ext/standard/url_scanner_ex.c
===
--- php/php-src/branches/PHP_5_4/ext/standard/url_scanner_ex.c 2011-07-28
10:42:45 UTC (rev 313831)
+++ php/php-src/branches/PHP_5_4/ext/standard/url_scanner_ex.c 2011-07-28
10:52:45 UTC (rev 313832)
@@ -57,9 +57,12 @@
if (ctx-tags)
zend_hash_destroy(ctx-tags);
- else
+ else {
ctx-tags = malloc(sizeof(HashTable));
-
+ if (!ctx-tags) {
+ return FAILURE;
+ }
+ }
zend_hash_init(ctx-tags, 0, NULL, NULL, 1);
for (key = php_strtok_r(tmp, ,, lasts);
Modified: php/php-src/branches/PHP_5_4/ext/standard/url_scanner_ex.re
===
--- php/php-src/branches/PHP_5_4/ext/standard/url_scanner_ex.re 2011-07-28
10:42:45 UTC (rev 313831)
+++ php/php-src/branches/PHP_5_4/ext/standard/url_scanner_ex.re 2011-07-28
10:52:45 UTC (rev 313832)
@@ -55,9 +55,13 @@
if (ctx-tags)
zend_hash_destroy(ctx-tags);
- else
+ else {
ctx-tags = malloc(sizeof(HashTable));
-
+ if (!ctx-tags) {
+ return FAILURE;
+ }
+ }
+
zend_hash_init(ctx-tags, 0, NULL, NULL, 1);
for (key = php_strtok_r(tmp, ,, lasts);
Modified: php/php-src/trunk/ext/standard/url_scanner_ex.c
===
--- php/php-src/trunk/ext/standard/url_scanner_ex.c 2011-07-28 10:42:45 UTC
(rev 313831)
+++ php/php-src/trunk/ext/standard/url_scanner_ex.c 2011-07-28 10:52:45 UTC
(rev 313832)
@@ -57,9 +57,12 @@
if (ctx-tags)
zend_hash_destroy(ctx-tags);
- else
+ else {
ctx-tags = malloc(sizeof(HashTable));
-
+ if (!ctx-tags) {
+ return FAILURE;
+ }
+ }
zend_hash_init(ctx-tags, 0, NULL, NULL, 1);
for (key = php_strtok_r(tmp, ,, lasts);
Modified: php/php-src/trunk/ext/standard/url_scanner_ex.re
===
--- php/php-src/trunk/ext/standard/url_scanner_ex.re2011-07-28 10:42:45 UTC
(rev 313831)
+++ php/php-src/trunk/ext/standard/url_scanner_ex.re2011-07-28 10:52:45 UTC
(rev 313832)
@@ -55,9 +55,13 @@
if (ctx-tags)
zend_hash_destroy(ctx-tags);
- else
+ else {
ctx-tags = malloc(sizeof(HashTable));
-
+ if (!ctx-tags) {
+ return FAILURE;
+ }
+ }
+
zend_hash_init(ctx-tags, 0, NULL, NULL, 1);
for (key = php_strtok_r(tmp, ,, lasts);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit:
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_3/ext/sybase_ct/php_sybase_ct.c PHP_5_4/ext/sybase_ct/php_sybase_ct.c
pajoye Thu, 28 Jul 2011 10:57:31 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313833
Log:
- Fix #55301 (sybase part) check if malloc succeded
Bug: https://bugs.php.net/55301 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c
U php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c
Modified: php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c 2011-07-28
10:52:45 UTC (rev 313832)
+++ php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c 2011-07-28
10:57:31 UTC (rev 313833)
@@ -777,6 +777,10 @@
}
sybase_ptr = (sybase_link *)
malloc(sizeof(sybase_link));
+ if (sybase_ptr) {
+ efree(hashed_details);
+ RETURN_FALSE;
+ }
if (!php_sybase_do_connect_internal(sybase_ptr, host,
user, passwd, charset, appname TSRMLS_CC)) {
free(sybase_ptr);
efree(hashed_details);
Modified: php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c 2011-07-28
10:52:45 UTC (rev 313832)
+++ php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c 2011-07-28
10:57:31 UTC (rev 313833)
@@ -777,6 +777,10 @@
}
sybase_ptr = (sybase_link *)
malloc(sizeof(sybase_link));
+ if (sybase_ptr) {
+ efree(hashed_details);
+ RETURN_FALSE;
+ }
if (!php_sybase_do_connect_internal(sybase_ptr, host,
user, passwd, charset, appname TSRMLS_CC)) {
free(sybase_ptr);
efree(hashed_details);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/sybase_ct/ php_sybase_ct.c
pajoye Thu, 28 Jul 2011 10:58:28 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313834
Log:
- Fix #55301 (sybase part) check if malloc succeded
Bug: https://bugs.php.net/55301 (error getting bug information)
Changed paths:
U php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c
Modified: php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c 2011-07-28 10:57:31 UTC
(rev 313833)
+++ php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c 2011-07-28 10:58:28 UTC
(rev 313834)
@@ -777,6 +777,10 @@
}
sybase_ptr = (sybase_link *)
malloc(sizeof(sybase_link));
+ if (sybase_ptr) {
+ efree(hashed_details);
+ RETURN_FALSE;
+ }
if (!php_sybase_do_connect_internal(sybase_ptr, host,
user, passwd, charset, appname TSRMLS_CC)) {
free(sybase_ptr);
efree(hashed_details);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mssql/php_mssql.c branches/PHP_5_4/ext/mssql/php_mssql.c trunk/ext/mssql/php_mssql.c
pajoye Thu, 28 Jul 2011 11:01:04 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313835
Log:
- Fix #55301 (mssql part) check if malloc succeded
Bug: https://bugs.php.net/55301 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c
U php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.c
U php/php-src/trunk/ext/mssql/php_mssql.c
Modified: php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c
===
--- php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c 2011-07-28 10:58:28 UTC
(rev 313834)
+++ php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c 2011-07-28 11:01:04 UTC
(rev 313835)
@@ -685,6 +685,13 @@
/* hash it up */
mssql_ptr = (mssql_link *) malloc(sizeof(mssql_link));
+ if (!mssql_ptr) {
+ efree(hashed_details);
+ dbfreelogin(mssql.login);
+ dbclose(mssql.link);
+ RETURN_FALSE;
+ }
+
memcpy(mssql_ptr, mssql, sizeof(mssql_link));
Z_TYPE(new_le) = le_plink;
new_le.ptr = mssql_ptr;
Modified: php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.c
===
--- php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.c 2011-07-28 10:58:28 UTC
(rev 313834)
+++ php/php-src/branches/PHP_5_4/ext/mssql/php_mssql.c 2011-07-28 11:01:04 UTC
(rev 313835)
@@ -685,6 +685,13 @@
/* hash it up */
mssql_ptr = (mssql_link *) malloc(sizeof(mssql_link));
+ if (!mssql_ptr) {
+ efree(hashed_details);
+ dbfreelogin(mssql.login);
+ dbclose(mssql.link);
+ RETURN_FALSE;
+ }
+
memcpy(mssql_ptr, mssql, sizeof(mssql_link));
Z_TYPE(new_le) = le_plink;
new_le.ptr = mssql_ptr;
Modified: php/php-src/trunk/ext/mssql/php_mssql.c
===
--- php/php-src/trunk/ext/mssql/php_mssql.c 2011-07-28 10:58:28 UTC (rev
313834)
+++ php/php-src/trunk/ext/mssql/php_mssql.c 2011-07-28 11:01:04 UTC (rev
313835)
@@ -685,6 +685,13 @@
/* hash it up */
mssql_ptr = (mssql_link *) malloc(sizeof(mssql_link));
+ if (!mssql_ptr) {
+ efree(hashed_details);
+ dbfreelogin(mssql.login);
+ dbclose(mssql.link);
+ RETURN_FALSE;
+ }
+
memcpy(mssql_ptr, mssql, sizeof(mssql_link));
Z_TYPE(new_le) = le_plink;
new_le.ptr = mssql_ptr;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c trunk/ext/sybase_ct/php_sybase_ct.c
pajoye Thu, 28 Jul 2011 21:16:51 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313903
Log:
- Fix #55301 (sybase part, take #2) check if malloc succeded
Bugs: https://bugs.php.net/55301 (Open) multiple null pointer
https://bugs.php.net/2 (Closed) hash_environment
Changed paths:
U php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c
U php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c
U php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c
Modified: php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c 2011-07-28
20:16:09 UTC (rev 313902)
+++ php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c 2011-07-28
21:16:51 UTC (rev 313903)
@@ -777,7 +777,7 @@
}
sybase_ptr = (sybase_link *)
malloc(sizeof(sybase_link));
- if (sybase_ptr) {
+ if (!sybase_ptr) {
efree(hashed_details);
RETURN_FALSE;
}
Modified: php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c 2011-07-28
20:16:09 UTC (rev 313902)
+++ php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c 2011-07-28
21:16:51 UTC (rev 313903)
@@ -777,7 +777,7 @@
}
sybase_ptr = (sybase_link *)
malloc(sizeof(sybase_link));
- if (sybase_ptr) {
+ if (!sybase_ptr) {
efree(hashed_details);
RETURN_FALSE;
}
Modified: php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c 2011-07-28 20:16:09 UTC
(rev 313902)
+++ php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c 2011-07-28 21:16:51 UTC
(rev 313903)
@@ -777,7 +777,7 @@
}
sybase_ptr = (sybase_link *)
malloc(sizeof(sybase_link));
- if (sybase_ptr) {
+ if (!sybase_ptr) {
efree(hashed_details);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_virtual_cwd.c
pajoye Wed, 27 Jul 2011 11:57:44 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313771
Log:
- do not resolve the link if all we want is to open that file
Changed paths:
U php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c2011-07-27
11:43:09 UTC (rev 313770)
+++ php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c2011-07-27
11:57:44 UTC (rev 313771)
@@ -1453,7 +1453,7 @@
}
CWD_STATE_COPY(new_state, CWDG(cwd));
- if (virtual_file_ex(new_state, path, NULL, CWD_FILEPATH TSRMLS_CC)) {
+ if (virtual_file_ex(new_state, path, NULL, CWD_EXPAND TSRMLS_CC)) {
CWD_STATE_FREE(new_state);
return NULL;
}
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2011-07-27 11:43:09 UTC (rev
313770)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2011-07-27 11:57:44 UTC (rev
313771)
@@ -1453,7 +1453,7 @@
}
CWD_STATE_COPY(new_state, CWDG(cwd));
- if (virtual_file_ex(new_state, path, NULL, CWD_FILEPATH TSRMLS_CC)) {
+ if (virtual_file_ex(new_state, path, NULL, CWD_EXPAND TSRMLS_CC)) {
CWD_STATE_FREE(new_state);
return NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c trunk/TSRM/tsrm_virtual_cwd.c
pajoye Wed, 27 Jul 2011 11:58:39 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313772
Log:
- WS
Changed paths:
U php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c
U php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
Modified: php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c2011-07-27
11:57:44 UTC (rev 313771)
+++ php/php-src/branches/PHP_5_4/TSRM/tsrm_virtual_cwd.c2011-07-27
11:58:39 UTC (rev 313772)
@@ -706,7 +706,6 @@
} else {
CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r-path_len + 1 + r-realpath_len + 1;
}
-
free(r);
} else if (key == (*bucket)-key path_len ==
(*bucket)-path_len
memcmp(path, (*bucket)-path, path_len)
== 0) {
Modified: php/php-src/trunk/TSRM/tsrm_virtual_cwd.c
===
--- php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2011-07-27 11:57:44 UTC (rev
313771)
+++ php/php-src/trunk/TSRM/tsrm_virtual_cwd.c 2011-07-27 11:58:39 UTC (rev
313772)
@@ -705,8 +705,7 @@
CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r-path_len + 1;
} else {
CWDG(realpath_cache_size) -=
sizeof(realpath_cache_bucket) + r-path_len + 1 + r-realpath_len + 1;
- }
-
+ }
free(r);
} else if (key == (*bucket)-key path_len ==
(*bucket)-path_len
memcmp(path, (*bucket)-path, path_len)
== 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/main/fopen_wrappers.c trunk/main/fopen_wrappers.c
pajoye Wed, 27 Jul 2011 12:20:32 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313774
Log:
- do not resolve the link if all we want is to open that file
Changed paths:
U php/php-src/branches/PHP_5_4/main/fopen_wrappers.c
U php/php-src/trunk/main/fopen_wrappers.c
Modified: php/php-src/branches/PHP_5_4/main/fopen_wrappers.c
===
--- php/php-src/branches/PHP_5_4/main/fopen_wrappers.c 2011-07-27 12:18:12 UTC
(rev 313773)
+++ php/php-src/branches/PHP_5_4/main/fopen_wrappers.c 2011-07-27 12:20:32 UTC
(rev 313774)
@@ -348,7 +348,7 @@
}
fp = VCWD_FOPEN(path, mode);
if (fp opened_path) {
- *opened_path = expand_filepath(path, NULL TSRMLS_CC);
+ *opened_path = expand_filepath_with_mode(path, NULL, NULL, 0,
CWD_EXPAND TSRMLS_CC);
}
return fp;
}
Modified: php/php-src/trunk/main/fopen_wrappers.c
===
--- php/php-src/trunk/main/fopen_wrappers.c 2011-07-27 12:18:12 UTC (rev
313773)
+++ php/php-src/trunk/main/fopen_wrappers.c 2011-07-27 12:20:32 UTC (rev
313774)
@@ -348,7 +348,7 @@
}
fp = VCWD_FOPEN(path, mode);
if (fp opened_path) {
- *opened_path = expand_filepath(path, NULL TSRMLS_CC);
+ *opened_path = expand_filepath_with_mode(path, NULL, NULL, 0,
CWD_EXPAND TSRMLS_CC);
}
return fp;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/TSRM/tsrm_win32.c branches/PHP_5_4/TSRM/tsrm_win32.c trunk/TSRM/tsrm_win32.c
pajoye Wed, 27 Jul 2011 14:23:06 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313782
Log:
- Fix #55295, check if malloc failed
Bug: https://bugs.php.net/55295 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
U php/php-src/branches/PHP_5_4/TSRM/tsrm_win32.c
U php/php-src/trunk/TSRM/tsrm_win32.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-07-27 14:17:45 UTC (rev 313781)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-07-27 14:23:06 UTC (rev 313782)
@@ -10,6 +10,10 @@
. On blocking SSL sockets respect the timeout option where possible.
(Scott)
+- Core
+ . Fix bug #55295 [NEW]: popen_ex on windows, fixed possible heap overflow
+(Pierre)
+
14 Jul 2011, PHP 5.3.7 RC3
- Zend Engine:
. Fixed bug #55156 (ReflectionClass::getDocComment() returns comment even
Modified: php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2011-07-27 14:17:45 UTC
(rev 313781)
+++ php/php-src/branches/PHP_5_3/TSRM/tsrm_win32.c 2011-07-27 14:23:06 UTC
(rev 313782)
@@ -532,6 +532,10 @@
}
cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof( /c
)+2);
+ if (!cmd) {
+ return NULL;
+ }
+
sprintf(cmd, %s /c \%s\, TWG(comspec), command);
if (asuser) {
res = CreateProcessAsUser(token_user, NULL, cmd, security,
security, security.bInheritHandle, dwCreateFlags, env, cwd, startup,
process);
Modified: php/php-src/branches/PHP_5_4/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_4/TSRM/tsrm_win32.c 2011-07-27 14:17:45 UTC
(rev 313781)
+++ php/php-src/branches/PHP_5_4/TSRM/tsrm_win32.c 2011-07-27 14:23:06 UTC
(rev 313782)
@@ -530,6 +530,10 @@
}
cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof( /c
)+2);
+ if (!cmd) {
+ return NULL;
+ }
+
sprintf(cmd, %s /c \%s\, TWG(comspec), command);
if (asuser) {
res = CreateProcessAsUser(token_user, NULL, cmd, security,
security, security.bInheritHandle, dwCreateFlags, env, cwd, startup,
process);
Modified: php/php-src/trunk/TSRM/tsrm_win32.c
===
--- php/php-src/trunk/TSRM/tsrm_win32.c 2011-07-27 14:17:45 UTC (rev 313781)
+++ php/php-src/trunk/TSRM/tsrm_win32.c 2011-07-27 14:23:06 UTC (rev 313782)
@@ -530,6 +530,10 @@
}
cmd = (char*)malloc(strlen(command)+strlen(TWG(comspec))+sizeof( /c
)+2);
+ if (!cmd) {
+ return NULL;
+ }
+
sprintf(cmd, %s /c \%s\, TWG(comspec), command);
if (asuser) {
res = CreateProcessAsUser(token_user, NULL, cmd, security,
security, security.bInheritHandle, dwCreateFlags, env, cwd, startup,
process);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/fileinfo/fileinfo.c trunk/ext/fileinfo/fileinfo.c
pajoye Wed, 27 Jul 2011 14:58:30 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313784
Log:
- do safemode/open basedir checks 1st, and use only expand not realpath (it is
done by the safemode/openbasedir check already)
Changed paths:
U php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c
U php/php-src/trunk/ext/fileinfo/fileinfo.c
Modified: php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c
===
--- php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c2011-07-27
14:37:46 UTC (rev 313783)
+++ php/php-src/branches/PHP_5_4/ext/fileinfo/fileinfo.c2011-07-27
14:58:30 UTC (rev 313784)
@@ -293,10 +293,6 @@
if (file_len == 0) {
file = NULL;
} else if (file *file) { /* user specified file, perform
open_basedir checks */
- if (!VCWD_REALPATH(file, resolved_path)) {
- RETURN_FALSE;
- }
- file = resolved_path;
#if PHP_API_VERSION 20100412
if ((PG(safe_mode) (!php_checkuid(file, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(file TSRMLS_CC)) {
@@ -305,6 +301,10 @@
#endif
RETURN_FALSE;
}
+ if (!expand_filepath_with_mode(file, resolved_path, NULL, 0,
CWD_EXPAND TSRMLS_CC)) {
+ RETURN_FALSE;
+ }
+ file = resolved_path;
}
finfo = emalloc(sizeof(struct php_fileinfo));
Modified: php/php-src/trunk/ext/fileinfo/fileinfo.c
===
--- php/php-src/trunk/ext/fileinfo/fileinfo.c 2011-07-27 14:37:46 UTC (rev
313783)
+++ php/php-src/trunk/ext/fileinfo/fileinfo.c 2011-07-27 14:58:30 UTC (rev
313784)
@@ -293,10 +293,6 @@
if (file_len == 0) {
file = NULL;
} else if (file *file) { /* user specified file, perform
open_basedir checks */
- if (!VCWD_REALPATH(file, resolved_path)) {
- RETURN_FALSE;
- }
- file = resolved_path;
#if PHP_API_VERSION 20100412
if ((PG(safe_mode) (!php_checkuid(file, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(file TSRMLS_CC)) {
@@ -305,6 +301,10 @@
#endif
RETURN_FALSE;
}
+ if (!expand_filepath_with_mode(file, resolved_path, NULL, 0,
CWD_EXPAND TSRMLS_CC)) {
+ RETURN_FALSE;
+ }
+ file = resolved_path;
}
finfo = emalloc(sizeof(struct php_fileinfo));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/spl/spl_directory.c trunk/ext/spl/spl_directory.c
pajoye Tue, 26 Jul 2011 07:30:41 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313695
Log:
- use cwd_expand now
Changed paths:
U php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
U php/php-src/trunk/ext/spl/spl_directory.c
Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
===
--- php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c2011-07-26
06:31:59 UTC (rev 313694)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c2011-07-26
07:30:41 UTC (rev 313695)
@@ -1219,10 +1219,7 @@
#if defined(PHP_WIN32) || HAVE_SYMLINK
if (!IS_ABSOLUTE_PATH(intern-file_name, intern-file_name_len)) {
char expanded_path[MAXPATHLEN];
-
- /* TODO: Fix expand_filepath to do not resolve links but only
expand the path
- (Pierre) */
- if (!expand_filepath(intern-file_name, expanded_path
TSRMLS_CC)) {
+ if (!expand_filepath_with_mode(intern-file_name,
expanded_path, NULL, 0, CWD_EXPAND TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, No such
file or directory);
RETURN_FALSE;
}
Modified: php/php-src/trunk/ext/spl/spl_directory.c
===
--- php/php-src/trunk/ext/spl/spl_directory.c 2011-07-26 06:31:59 UTC (rev
313694)
+++ php/php-src/trunk/ext/spl/spl_directory.c 2011-07-26 07:30:41 UTC (rev
313695)
@@ -1219,10 +1219,7 @@
#if defined(PHP_WIN32) || HAVE_SYMLINK
if (!IS_ABSOLUTE_PATH(intern-file_name, intern-file_name_len)) {
char expanded_path[MAXPATHLEN];
-
- /* TODO: Fix expand_filepath to do not resolve links but only
expand the path
- (Pierre) */
- if (!expand_filepath(intern-file_name, expanded_path
TSRMLS_CC)) {
+ if (!expand_filepath_with_mode(intern-file_name,
expanded_path, NULL, 0, CWD_EXPAND TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, No such
file or directory);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/main/fopen_wrappers.c trunk/main/fopen_wrappers.c
pajoye Tue, 26 Jul 2011 09:27:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313700
Log:
- simplify
Changed paths:
U php/php-src/branches/PHP_5_4/main/fopen_wrappers.c
U php/php-src/trunk/main/fopen_wrappers.c
Modified: php/php-src/branches/PHP_5_4/main/fopen_wrappers.c
===
--- php/php-src/branches/PHP_5_4/main/fopen_wrappers.c 2011-07-26 09:16:36 UTC
(rev 313699)
+++ php/php-src/branches/PHP_5_4/main/fopen_wrappers.c 2011-07-26 09:27:53 UTC
(rev 313700)
@@ -628,19 +628,14 @@
filename_length = strlen(filename);
/* Relative path open */
- if (*filename == '.') {
- return php_fopen_and_set_opened_path(filename, mode,
opened_path TSRMLS_CC);
- }
-
+ if ((*filename == '.')
/* Absolute path open */
- if (IS_ABSOLUTE_PATH(filename, filename_length)) {
+|| IS_ABSOLUTE_PATH(filename, filename_length)
+|| (!path || (path !*path))
+ ) {
return php_fopen_and_set_opened_path(filename, mode,
opened_path TSRMLS_CC);
}
- if (!path || (path !*path)) {
- return php_fopen_and_set_opened_path(filename, mode,
opened_path TSRMLS_CC);
- }
-
/* check in provided path */
/* append the calling scripts' current working directory
* as a fall back case
Modified: php/php-src/trunk/main/fopen_wrappers.c
===
--- php/php-src/trunk/main/fopen_wrappers.c 2011-07-26 09:16:36 UTC (rev
313699)
+++ php/php-src/trunk/main/fopen_wrappers.c 2011-07-26 09:27:53 UTC (rev
313700)
@@ -628,19 +628,14 @@
filename_length = strlen(filename);
/* Relative path open */
- if (*filename == '.') {
- return php_fopen_and_set_opened_path(filename, mode,
opened_path TSRMLS_CC);
- }
-
+ if ((*filename == '.')
/* Absolute path open */
- if (IS_ABSOLUTE_PATH(filename, filename_length)) {
+|| IS_ABSOLUTE_PATH(filename, filename_length)
+|| (!path || (path !*path))
+ ) {
return php_fopen_and_set_opened_path(filename, mode,
opened_path TSRMLS_CC);
}
- if (!path || (path !*path)) {
- return php_fopen_and_set_opened_path(filename, mode,
opened_path TSRMLS_CC);
- }
-
/* check in provided path */
/* append the calling scripts' current working directory
* as a fall back case
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt branches/PHP_5_4/main/streams/plain_wrapper.c trunk/ext/standard/tests/file/bug55124.phpt trunk/main/streams/plain_w
pajoye Tue, 26 Jul 2011 17:44:20 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313743
Log:
- Fixed bug 55124, recursive mkdir fails with current (dot) directory in path
Bug: https://bugs.php.net/55124 (Verified) recursive mkdir fails with current
(dot) directory in path
Changed paths:
A php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt
U php/php-src/branches/PHP_5_4/main/streams/plain_wrapper.c
A php/php-src/trunk/ext/standard/tests/file/bug55124.phpt
U php/php-src/trunk/main/streams/plain_wrapper.c
Added: php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt
2011-07-26 17:44:20 UTC (rev 313743)
@@ -0,0 +1,18 @@
+--TEST--
+Bug #55124 (recursive mkdir fails with current (dot) directory in path)
+--FILE--
+?php
+$old_dir_path = getcwd();
+chdir(__DIR__);
+mkdir('a/./b', 0755, true);
+if (is_dir('a/b')) {
+ rmdir('a/b');
+}
+if (is_dir('/a')) {
+ rmdir('a');
+}
+chdir($old_dir_path);
+echo OK;
+?
+--EXPECT--
+OK
Modified: php/php-src/branches/PHP_5_4/main/streams/plain_wrapper.c
===
--- php/php-src/branches/PHP_5_4/main/streams/plain_wrapper.c 2011-07-26
16:48:46 UTC (rev 313742)
+++ php/php-src/branches/PHP_5_4/main/streams/plain_wrapper.c 2011-07-26
17:44:20 UTC (rev 313743)
@@ -1147,25 +1147,19 @@
ret = php_mkdir(dir, mode TSRMLS_CC);
} else {
/* we look for directory separator from the end of string, thus
hopefuly reducing our work load */
- char *e, *buf;
+ char *e;
struct stat sb;
int dir_len = strlen(dir);
int offset = 0;
+ char buf[MAXPATHLEN];
- buf = estrndup(dir, dir_len);
-
-#ifdef PHP_WIN32
- e = buf;
- while (*e) {
- if (*e == '/') {
- *e = DEFAULT_SLASH;
- }
- e++;
+ if (!expand_filepath_with_mode(dir, buf, NULL, 0, CWD_EXPAND
TSRMLS_CC)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid
path);
+ return 0;
}
-#else
- e = buf + dir_len;
-#endif
+ e = buf + strlen(buf);
+
if ((p = memchr(buf, DEFAULT_SLASH, dir_len))) {
offset = p - buf + 1;
}
@@ -1216,7 +1210,6 @@
}
}
}
- efree(buf);
}
if (ret 0) {
/* Failure */
Added: php/php-src/trunk/ext/standard/tests/file/bug55124.phpt
===
--- php/php-src/trunk/ext/standard/tests/file/bug55124.phpt
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/file/bug55124.phpt 2011-07-26
17:44:20 UTC (rev 313743)
@@ -0,0 +1,18 @@
+--TEST--
+Bug #55124 (recursive mkdir fails with current (dot) directory in path)
+--FILE--
+?php
+$old_dir_path = getcwd();
+chdir(__DIR__);
+mkdir('a/./b', 0755, true);
+if (is_dir('a/b')) {
+ rmdir('a/b');
+}
+if (is_dir('/a')) {
+ rmdir('a');
+}
+chdir($old_dir_path);
+echo OK;
+?
+--EXPECT--
+OK
Modified: php/php-src/trunk/main/streams/plain_wrapper.c
===
--- php/php-src/trunk/main/streams/plain_wrapper.c 2011-07-26 16:48:46 UTC
(rev 313742)
+++ php/php-src/trunk/main/streams/plain_wrapper.c 2011-07-26 17:44:20 UTC
(rev 313743)
@@ -1147,25 +1147,19 @@
ret = php_mkdir(dir, mode TSRMLS_CC);
} else {
/* we look for directory separator from the end of string, thus
hopefuly reducing our work load */
- char *e, *buf;
+ char *e;
struct stat sb;
int dir_len = strlen(dir);
int offset = 0;
+ char buf[MAXPATHLEN];
- buf = estrndup(dir, dir_len);
-
-#ifdef PHP_WIN32
- e = buf;
- while (*e) {
- if (*e == '/') {
- *e = DEFAULT_SLASH;
- }
- e++;
+ if (!expand_filepath_with_mode(dir, buf, NULL, 0, CWD_EXPAND
TSRMLS_CC)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid
path);
+ return 0;
}
-#else
- e = buf + dir_len;
-#endif
+ e = buf + strlen(buf);
+
if ((p = memchr(buf, DEFAULT_SLASH,
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS
pajoye Tue, 26 Jul 2011 23:58:18 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313753 Log: - news for bug #55124 Bug: https://bugs.php.net/55124 (Assigned) recursive mkdir fails with current (dot) directory in path Changed paths: U php/php-src/branches/PHP_5_4/NEWS Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-07-26 23:49:37 UTC (rev 313752) +++ php/php-src/branches/PHP_5_4/NEWS 2011-07-26 23:58:18 UTC (rev 313753) @@ -12,6 +12,10 @@ - Changed E_ALL to include E_STRICT. (Stas) +- Improved core functions + . Fixed bug #55124 (recursive mkdir fails with current (dot) directory in path). +(Pierre) + - Improved PHP-FPM SAPI: . Added process.max to control the number of process FPM can fork. FR #55166. (fat) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/zend_language_scanner.c branches/PHP_5_4/Zend/zend_language_scanner.l branches/PHP_5_4/Zend/zend_language_scanner_defs.h branch
pajoye Wed, 27 Jul 2011 00:14:02 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313756 Log: - add binary suport, FR #50638, as defined in RFC https://wiki.php.net/rfc/binnotation4ints, patch by Jonah Harris Bug: https://bugs.php.net/50638 (Bogus) User Stream $context is Not Populated Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner_defs.h U php/php-src/branches/PHP_5_4/Zend/zend_strtod.c U php/php-src/branches/PHP_5_4/Zend/zend_strtod.h U php/php-src/trunk/Zend/zend_language_scanner.c U php/php-src/trunk/Zend/zend_language_scanner.l U php/php-src/trunk/Zend/zend_language_scanner_defs.h U php/php-src/trunk/Zend/zend_strtod.c U php/php-src/trunk/Zend/zend_strtod.h diffs exceeded maximum size -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS
pajoye Wed, 27 Jul 2011 00:16:53 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313757 Log: - correct 1st name Changed paths: U php/php-src/branches/PHP_5_4/NEWS Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-07-27 00:14:02 UTC (rev 313756) +++ php/php-src/branches/PHP_5_4/NEWS 2011-07-27 00:16:53 UTC (rev 313757) @@ -4,7 +4,7 @@ - Added features: . Short array syntax, see UPGRADING guide for full details (rsky0711 at gmail . com, sebastian.deutsch at 9elements . com, Pierre) - . Binary numbers format (0b001010). (John Harris at gmail dot com) + . Binary numbers format (0b001010). (Jonah dot Harris at gmail dot com) - Removed features: . Removed magic_quotes_gpc, magic_quotes_runtime and magic_quotes_sybase ini options. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/UPGRADING trunk/UPGRADING
pajoye Wed, 27 Jul 2011 00:18:35 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313758 Log: - upgrading entry for binary number format Changed paths: U php/php-src/branches/PHP_5_4/UPGRADING U php/php-src/trunk/UPGRADING Modified: php/php-src/branches/PHP_5_4/UPGRADING === --- php/php-src/branches/PHP_5_4/UPGRADING 2011-07-27 00:16:53 UTC (rev 313757) +++ php/php-src/branches/PHP_5_4/UPGRADING 2011-07-27 00:18:35 UTC (rev 313758) @@ -474,3 +474,5 @@ $a = ['one' = 1, 'two' = 2, 'three' = 3, 'four' = 4]; $a = ['one' = 1, 2, 'three' = 3, 4]; + - Binary number format + 0b00100 0b010101 Modified: php/php-src/trunk/UPGRADING === --- php/php-src/trunk/UPGRADING 2011-07-27 00:16:53 UTC (rev 313757) +++ php/php-src/trunk/UPGRADING 2011-07-27 00:18:35 UTC (rev 313758) @@ -462,3 +462,6 @@ $a = [1, 2, 3, 4]; $a = ['one' = 1, 'two' = 2, 'three' = 3, 'four' = 4]; $a = ['one' = 1, 2, 'three' = 3, 4]; + + - Binary number format + 0b00100 0b010101 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/UPGRADING.INTERNALS branches/PHP_5_4/main/fopen_wrappers.c branches/PHP_5_4/main/fopen_wrappers.h trunk/UPGRADING.INTERNALS trunk/main/fopen_wrappers.c tr
pajoye Mon, 25 Jul 2011 16:50:07 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313678
Log:
- add expand_filepath_with_mode (not used anywhere yet but will be used for
file ops (fopenco) to avoid extra links resolution and other non required ops
on open
Changed paths:
U php/php-src/branches/PHP_5_4/UPGRADING.INTERNALS
U php/php-src/branches/PHP_5_4/main/fopen_wrappers.c
U php/php-src/branches/PHP_5_4/main/fopen_wrappers.h
U php/php-src/trunk/UPGRADING.INTERNALS
U php/php-src/trunk/main/fopen_wrappers.c
U php/php-src/trunk/main/fopen_wrappers.h
Modified: php/php-src/branches/PHP_5_4/UPGRADING.INTERNALS
===
--- php/php-src/branches/PHP_5_4/UPGRADING.INTERNALS2011-07-25 16:45:39 UTC
(rev 313677)
+++ php/php-src/branches/PHP_5_4/UPGRADING.INTERNALS2011-07-25 16:50:07 UTC
(rev 313678)
@@ -11,6 +11,7 @@
f. streams that enclose private streams
g. leak_variable
h. API Signature changes
+ i. new TSRM function expand_filepath_with_mode
2. Build system changes
a. Unix build system changes
@@ -184,6 +185,9 @@
. php_unescape_html_entities
PHPAPI char *php_unescape_html_entities(unsigned char *old, size_t oldlen,
size_t *newlen, int all, int flags, char *hint_charset TSRMLS_DC);
+ i.
+ PHPAPI char *expand_filepath_with_mode(const char *filepath, char
*real_path, const char *relative_to, size_t relative_to_len, int realpath_mode
TSRMLS_DC);
+ expand_filepath_with_mode lets define how realpath will behave, using one of
the existing mode: CWD_EXPAND , CWD_FILEPATH or CWD_REALPATH.
2. Build system changes
Modified: php/php-src/branches/PHP_5_4/main/fopen_wrappers.c
===
--- php/php-src/branches/PHP_5_4/main/fopen_wrappers.c 2011-07-25 16:45:39 UTC
(rev 313677)
+++ php/php-src/branches/PHP_5_4/main/fopen_wrappers.c 2011-07-25 16:50:07 UTC
(rev 313678)
@@ -741,6 +741,14 @@
*/
PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const
char *relative_to, size_t relative_to_len TSRMLS_DC)
{
+ return expand_filepath_with_mode(filepath, real_path, relative_to,
relative_to_len, CWD_FILEPATH TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ expand_filepath_use_realpath
+ */
+PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path,
const char *relative_to, size_t relative_to_len, int realpath_mode TSRMLS_DC)
+{
cwd_state new_state;
char cwd[MAXPATHLEN];
int copy_len;
@@ -785,7 +793,7 @@
new_state.cwd = strdup(cwd);
new_state.cwd_length = strlen(cwd);
- if (virtual_file_ex(new_state, filepath, NULL, CWD_FILEPATH
TSRMLS_CC)) {
+ if (virtual_file_ex(new_state, filepath, NULL, realpath_mode
TSRMLS_CC)) {
free(new_state.cwd);
return NULL;
}
Modified: php/php-src/branches/PHP_5_4/main/fopen_wrappers.h
===
--- php/php-src/branches/PHP_5_4/main/fopen_wrappers.h 2011-07-25 16:45:39 UTC
(rev 313677)
+++ php/php-src/branches/PHP_5_4/main/fopen_wrappers.h 2011-07-25 16:50:07 UTC
(rev 313678)
@@ -28,6 +28,7 @@
PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC);
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC);
PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const
char *relative_to, size_t relative_to_len TSRMLS_DC);
+PHPAPI char *expand_filepath_with_mode(const char *filepath, char *real_path,
const char *relative_to, size_t relative_to_len, int realpath_mode TSRMLS_DC);
PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC);
PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC);
Modified: php/php-src/trunk/UPGRADING.INTERNALS
===
--- php/php-src/trunk/UPGRADING.INTERNALS 2011-07-25 16:45:39 UTC (rev
313677)
+++ php/php-src/trunk/UPGRADING.INTERNALS 2011-07-25 16:50:07 UTC (rev
313678)
@@ -11,6 +11,7 @@
f. streams that enclose private streams
g. leak_variable
h. API Signature changes
+ i. new TSRM function expand_filepath_with_mode
2. Build system changes
a. Unix build system changes
@@ -184,6 +185,9 @@
. php_unescape_html_entities
PHPAPI char *php_unescape_html_entities(unsigned char *old, size_t oldlen,
size_t *newlen, int all, int flags, char *hint_charset TSRMLS_DC);
+ i.
+ PHPAPI char *expand_filepath_with_mode(const char *filepath, char
*real_path, const char *relative_to, size_t relative_to_len, int realpath_mode
TSRMLS_DC);
+ expand_filepath_with_mode lets define how realpath will behave, using one of
the existing mode: CWD_EXPAND , CWD_FILEPATH or CWD_REALPATH.
2. Build system changes
Modified:
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Mon, 25 Jul 2011 11:04:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313659 Log: - system's karma for Tyrael, so he can store/alter cfgco Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-07-25 08:14:17 UTC (rev 313658) +++ SVNROOT/global_avail2011-07-25 11:04:43 UTC (rev 313659) @@ -130,7 +130,7 @@ avail|changelog|php/php-src,gtk/php-gtk # Some people have access to change the day-to-day code on the various php.net machines -avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip,danbrown,rlms,dsp,felipe|systems +avail|imajes,edink,derick,sfox,wez,goba,mj,pajoye,bjori,philip,danbrown,rlms,dsp,felipe,tyrael|systems # Finally, there are various people with access to various bits and # pieces of other SVN modules. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Sat, 23 Jul 2011 12:36:40 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313629 Log: - web karma for Tyrael Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-07-23 12:19:23 UTC (rev 313628) +++ SVNROOT/global_avail2011-07-23 12:36:40 UTC (rev 313629) @@ -52,9 +52,9 @@ # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net, # people.php.net, master.php.net, wiki.php.net, pecl.php.net and qa.php.net. -avail|salathe,scottmac,jmertic,lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey,danbrown,moacir,till,vrana|web/php,web/php-bugs,web/php-master,web/php-news,web/php-hosts,web/php-wiki,web/php-people,web/pecl,web/qa +avail|salathe,scottmac,jmertic,lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori,felipe,dsp,aharvey,danbrown,moacir,till,vrana,tyrael|web/php,web/php-bugs,web/php-master,web/php-news,web/php-hosts,web/php-wiki,web/php-people,web/pecl,web/qa -avail|degeberg,tyrael|web/php-bugs +avail|degeberg|web/php-bugs avail|danielc|web/php avail|ericstewart|web/php/*/archive avail|odoucet|web/php-news/,web/qa/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/UPGRADING branches/PHP_5_4/Zend/zend_ini_scanner.c branches/PHP_5_4/Zend/zend_language_parser.y branches/PHP_5_4/tests/lang/array_shortcut_001.phpt branch
pajoye Sat, 23 Jul 2011 20:23:21 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313641
Log:
- add short array syntax as defined in
https://wiki.php.net/rfc/shortsyntaxforarrays, 2nd solution using = only
Changed paths:
U php/php-src/branches/PHP_5_4/UPGRADING
U php/php-src/branches/PHP_5_4/Zend/zend_ini_scanner.c
U php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y
A php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_001.phpt
A php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_002.phpt
A php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_003.phpt
A php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_005.phpt
U php/php-src/trunk/UPGRADING
U php/php-src/trunk/Zend/zend_language_parser.y
A php/php-src/trunk/tests/lang/array_shortcut_001.phpt
A php/php-src/trunk/tests/lang/array_shortcut_002.phpt
A php/php-src/trunk/tests/lang/array_shortcut_003.phpt
A php/php-src/trunk/tests/lang/array_shortcut_005.phpt
Modified: php/php-src/branches/PHP_5_4/UPGRADING
===
--- php/php-src/branches/PHP_5_4/UPGRADING 2011-07-23 19:08:43 UTC (rev 313640)
+++ php/php-src/branches/PHP_5_4/UPGRADING 2011-07-23 20:23:21 UTC (rev 313641)
@@ -456,5 +456,10 @@
- fnv132
- fnv164
- joaat
+
+ k. New Syntax
+ - Short array syntax
+ $a = [1, 2, 3, 4];
+ $a = ['one' = 1, 'two' = 2, 'three' = 3, 'four' = 4];
+ $a = ['one' = 1, 2, 'three' = 3, 4];
-
Modified: php/php-src/branches/PHP_5_4/Zend/zend_ini_scanner.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_ini_scanner.c 2011-07-23 19:08:43 UTC (rev 313640)
+++ php/php-src/branches/PHP_5_4/Zend/zend_ini_scanner.c 2011-07-23 20:23:21 UTC (rev 313641)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Jun 29 02:53:12 2011 */
+/* Generated by re2c 0.13.5 on Mon Jan 17 14:03:33 2011 */
#line 1 Zend/zend_ini_scanner.l
/*
+--+
Modified: php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y
===
--- php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y 2011-07-23 19:08:43 UTC (rev 313640)
+++ php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y 2011-07-23 20:23:21 UTC (rev 313641)
@@ -761,6 +761,7 @@
| '@' { zend_do_begin_silence($1 TSRMLS_CC); } expr { zend_do_end_silence($1 TSRMLS_CC); $$ = $3; }
| scalar{ $$ = $1; }
| T_ARRAY '(' array_pair_list ')' { $$ = $3; }
+ | '[' array_pair_list ']' { $$ = $2; }
| '`' backticks_expr '`' { zend_do_shell_exec($$, $2 TSRMLS_CC); }
| T_PRINT expr { zend_do_print($$, $2 TSRMLS_CC); }
| function is_reference '(' { zend_do_begin_lambda_function_declaration($$, $1, $2.op_type, 0 TSRMLS_CC); }
@@ -894,6 +895,7 @@
| '+' static_scalar { ZVAL_LONG($1.u.constant, 0); add_function($2.u.constant, $1.u.constant, $2.u.constant TSRMLS_CC); $$ = $2; }
| '-' static_scalar { ZVAL_LONG($1.u.constant, 0); sub_function($2.u.constant, $1.u.constant, $2.u.constant TSRMLS_CC); $$ = $2; }
| T_ARRAY '(' static_array_pair_list ')' { $$ = $3; Z_TYPE($$.u.constant) = IS_CONSTANT_ARRAY; }
+ | '[' static_array_pair_list ']' { $$ = $2; Z_TYPE($$.u.constant) = IS_CONSTANT_ARRAY; }
| static_class_constant { $$ = $1; }
;
Added: php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_001.phpt
===
--- php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_001.phpt (rev 0)
+++ php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_001.phpt 2011-07-23 20:23:21 UTC (rev 313641)
@@ -0,0 +1,13 @@
+--TEST--
+Square bracket array shortcut test
+--FILE--
+?php
+print_r([1, 2, 3]);
+?
+--EXPECT--
+Array
+(
+[0] = 1
+[1] = 2
+[2] = 3
+)
Added: php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_002.phpt
===
--- php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_002.phpt (rev 0)
+++ php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_002.phpt 2011-07-23 20:23:21 UTC (rev 313641)
@@ -0,0 +1,13 @@
+--TEST--
+Square bracket associative array shortcut test
+--FILE--
+?php
+print_r([foo = orange, bar = apple, baz = lemon]);
+?
+--EXPECT--
+Array
+(
+[foo] = orange
+[bar] = apple
+[baz] = lemon
+)
Added: php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_003.phpt
===
--- php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_003.phpt (rev 0)
+++ php/php-src/branches/PHP_5_4/tests/lang/array_shortcut_003.phpt 2011-07-23 20:23:21 UTC (rev 313641)
@@ -0,0 +1,13 @@
+--TEST--
+Testing array shortcut and
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/mysqli/mysqli.c trunk/ext/mysqli/mysqli.c
pajoye Fri, 22 Jul 2011 11:26:23 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313576
Log:
- WS
Changed paths:
U php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c
U php/php-src/trunk/ext/mysqli/mysqli.c
Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c2011-07-22 11:25:30 UTC
(rev 313575)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c2011-07-22 11:26:23 UTC
(rev 313576)
@@ -1143,11 +1143,11 @@
Z_TYPE_P(res) = IS_STRING;
Z_STRVAL_P(res) =
php_addslashes(row[i], field_len[i], Z_STRLEN_P(res), 0 TSRMLS_CC);
} else {
-#endif
+#endif
ZVAL_STRINGL(res, row[i], field_len[i],
1);
#if PHP_API_VERSION 20100412
}
-#endif
+#endif
}
if (fetchtype MYSQLI_NUM) {
Modified: php/php-src/trunk/ext/mysqli/mysqli.c
===
--- php/php-src/trunk/ext/mysqli/mysqli.c 2011-07-22 11:25:30 UTC (rev
313575)
+++ php/php-src/trunk/ext/mysqli/mysqli.c 2011-07-22 11:26:23 UTC (rev
313576)
@@ -1143,11 +1143,11 @@
Z_TYPE_P(res) = IS_STRING;
Z_STRVAL_P(res) =
php_addslashes(row[i], field_len[i], Z_STRLEN_P(res), 0 TSRMLS_CC);
} else {
-#endif
+#endif
ZVAL_STRINGL(res, row[i], field_len[i],
1);
#if PHP_API_VERSION 20100412
}
-#endif
+#endif
}
if (fetchtype MYSQLI_NUM) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_float.c zend_operators.h
pajoye Fri, 22 Jul 2011 11:42:15 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313577
Log:
- should not have been applied
Changed paths:
U php/php-src/trunk/Zend/zend_float.c
U php/php-src/trunk/Zend/zend_operators.h
Modified: php/php-src/trunk/Zend/zend_float.c
===
--- php/php-src/trunk/Zend/zend_float.c 2011-07-22 11:26:23 UTC (rev 313576)
+++ php/php-src/trunk/Zend/zend_float.c 2011-07-22 11:42:15 UTC (rev 313577)
@@ -31,7 +31,7 @@
EG(saved_fpu_cw_ptr) = (void*)EG(saved_fpu_cw);
}
XPFPA_STORE_CW(EG(saved_fpu_cw_ptr));
-// XPFPA_SWITCH_DOUBLE();
+ XPFPA_SWITCH_DOUBLE();
#else
EG(saved_fpu_cw_ptr) = NULL;
#endif
Modified: php/php-src/trunk/Zend/zend_operators.h
===
--- php/php-src/trunk/Zend/zend_operators.h 2011-07-22 11:26:23 UTC (rev
313576)
+++ php/php-src/trunk/Zend/zend_operators.h 2011-07-22 11:42:15 UTC (rev
313577)
@@ -474,6 +474,7 @@
0:
:
: r(op1));
+#else
if (UNEXPECTED(Z_LVAL_P(op1) == LONG_MAX)) {
/* switch to double */
Z_DVAL_P(op1) = (double)LONG_MAX + 1.0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS ext/standard/info.c
pajoye Thu, 21 Jul 2011 14:49:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313538
Log:
- Fixed bug #55258 (Windows Version Detecting Error) (already fixed in
trunk/5.4)
Bug: https://bugs.php.net/55258 (Open) Windows Version Detecting Error
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/info.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-07-21 14:22:15 UTC (rev 313537)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-07-21 14:49:55 UTC (rev 313538)
@@ -16,6 +16,8 @@
- Core
. Removed warning when argument of is_a() or is_subclass_of() is not
a known class. (Stas)
+ . Fixed bug #55258 (Windows Version Detecting Error).
+( xiaomao5 at live dot com, Pierre)
. Fixed bug #55187 (readlink returns weird characters when false result).
(Pierre)
. Fixed bug #55014 (Compile failure due to improper use of ctime_r()). (Ilia)
Modified: php/php-src/branches/PHP_5_3/ext/standard/info.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/info.c2011-07-21 14:22:15 UTC
(rev 313537)
+++ php/php-src/branches/PHP_5_3/ext/standard/info.c2011-07-21 14:49:55 UTC
(rev 313538)
@@ -289,7 +289,7 @@
major = Windows Server 2008;
}
} else
- if ( osvi.dwMinorVersion == 2 ) {
+ if ( osvi.dwMinorVersion == 1 ) {
if( osvi.wProductType == VER_NT_WORKSTATION ) {
major = Windows 7;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/win32/build/libs_version.txt branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Tue, 19 Jul 2011 10:22:42 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313417 Log: - update libpng to 1.2.46 Changed paths: U php/php-src/branches/PHP_5_3/win32/build/libs_version.txt U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_3/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2011-07-19 09:53:20 UTC (rev 313416) +++ php/php-src/branches/PHP_5_3/win32/build/libs_version.txt 2011-07-19 10:22:42 UTC (rev 313417) @@ -1 +1,2 @@ libcurl-7.21.6 +libpng-1.2.46 Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2011-07-19 09:53:20 UTC (rev 313416) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2011-07-19 10:22:42 UTC (rev 313417) @@ -1,2 +1,2 @@ libcurl-7.21.6 -libpng-1.2.45 \ No newline at end of file +libpng-1.2.46 Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2011-07-19 09:53:20 UTC (rev 313416) +++ php/php-src/trunk/win32/build/libs_version.txt 2011-07-19 10:22:42 UTC (rev 313417) @@ -1,2 +1,2 @@ libcurl-7.21.6 -libpng-1.2.45 +libpng-1.2.46 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/php.ini-development branches/PHP_5_4/php.ini-production trunk/php.ini-development trunk/php.ini-production
pajoye Tue, 19 Jul 2011 12:02:22 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313421 Log: - cleanup Changed paths: U php/php-src/branches/PHP_5_4/php.ini-development U php/php-src/branches/PHP_5_4/php.ini-production U php/php-src/trunk/php.ini-development U php/php-src/trunk/php.ini-production Modified: php/php-src/branches/PHP_5_4/php.ini-development === --- php/php-src/branches/PHP_5_4/php.ini-development2011-07-19 11:38:23 UTC (rev 313420) +++ php/php-src/branches/PHP_5_4/php.ini-development2011-07-19 12:02:22 UTC (rev 313421) @@ -883,7 +883,6 @@ ; ;extension=php_bz2.dll ;extension=php_curl.dll -;extension=php_dba.dll ;extension=php_fileinfo.dll ;extension=php_gd2.dll ;extension=php_gettext.dll @@ -894,8 +893,6 @@ ;extension=php_ldap.dll ;extension=php_mbstring.dll ;extension=php_exif.dll ; Must be after mbstring as it depends on it -;extension=php_ming.dll -;extension=php_mssql.dll ;extension=php_mysql.dll ;extension=php_mysqli.dll ;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client Modified: php/php-src/branches/PHP_5_4/php.ini-production === --- php/php-src/branches/PHP_5_4/php.ini-production 2011-07-19 11:38:23 UTC (rev 313420) +++ php/php-src/branches/PHP_5_4/php.ini-production 2011-07-19 12:02:22 UTC (rev 313421) @@ -899,7 +899,6 @@ ;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client ;extension=php_openssl.dll ;extension=php_pdo_firebird.dll -;extension=php_pdo_mssql.dll ;extension=php_pdo_mysql.dll ;extension=php_pdo_oci.dll ;extension=php_pdo_odbc.dll Modified: php/php-src/trunk/php.ini-development === --- php/php-src/trunk/php.ini-development 2011-07-19 11:38:23 UTC (rev 313420) +++ php/php-src/trunk/php.ini-development 2011-07-19 12:02:22 UTC (rev 313421) @@ -883,7 +883,6 @@ ; ;extension=php_bz2.dll ;extension=php_curl.dll -;extension=php_dba.dll ;extension=php_fileinfo.dll ;extension=php_gd2.dll ;extension=php_gettext.dll @@ -894,8 +893,6 @@ ;extension=php_ldap.dll ;extension=php_mbstring.dll ;extension=php_exif.dll ; Must be after mbstring as it depends on it -;extension=php_ming.dll -;extension=php_mssql.dll ;extension=php_mysql.dll ;extension=php_mysqli.dll ;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client Modified: php/php-src/trunk/php.ini-production === --- php/php-src/trunk/php.ini-production2011-07-19 11:38:23 UTC (rev 313420) +++ php/php-src/trunk/php.ini-production2011-07-19 12:02:22 UTC (rev 313421) @@ -899,7 +899,6 @@ ;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client ;extension=php_openssl.dll ;extension=php_pdo_firebird.dll -;extension=php_pdo_mssql.dll ;extension=php_pdo_mysql.dll ;extension=php_pdo_oci.dll ;extension=php_pdo_odbc.dll -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/openssl/openssl.c trunk/ext/openssl/openssl.c
Please restore that, now. That's not your cup of tea and it is the way
it should have been in the 1st place.
On Wed, Jul 20, 2011 at 12:29 AM, Scott MacVicar scott...@php.net wrote:
scottmac Tue, 19 Jul 2011 22:29:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313455
Log:
Revert change to use a special Windows version of
openssl_random_pseudo_bytes().
Lets discuss this on internals first. We're advertising something from the
OpenSSL library
and then subverting it with another Windows OS call.
What are the implications of this? Should we make this available in
ext/standard/ instead?
Changed paths:
U php/php-src/branches/PHP_5_4/ext/openssl/openssl.c
U php/php-src/trunk/ext/openssl/openssl.c
Modified: php/php-src/branches/PHP_5_4/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_4/ext/openssl/openssl.c 2011-07-19 22:18:08
UTC (rev 313454)
+++ php/php-src/branches/PHP_5_4/ext/openssl/openssl.c 2011-07-19 22:29:55
UTC (rev 313455)
@@ -4930,19 +4930,10 @@
buffer = emalloc(buffer_length + 1);
-#ifdef PHP_WIN32
- strong_result = 1;
- /* random/urandom equivalent on Windows */
- if (php_win32_get_random_bytes(buffer, (size_t) buffer_length) ==
FAILURE){
- efree(buffer);
- RETURN_FALSE;
- }
-#else
if ((strong_result = RAND_pseudo_bytes(buffer, buffer_length)) 0) {
efree(buffer);
RETURN_FALSE;
}
-#endif
buffer[buffer_length] = 0;
RETVAL_STRINGL((char *)buffer, buffer_length, 0);
Modified: php/php-src/trunk/ext/openssl/openssl.c
===
--- php/php-src/trunk/ext/openssl/openssl.c 2011-07-19 22:18:08 UTC (rev
313454)
+++ php/php-src/trunk/ext/openssl/openssl.c 2011-07-19 22:29:55 UTC (rev
313455)
@@ -4926,19 +4926,10 @@
buffer = emalloc(buffer_length + 1);
-#ifdef PHP_WIN32
- strong_result = 1;
- /* random/urandom equivalent on Windows */
- if (php_win32_get_random_bytes(buffer, (size_t) buffer_length) ==
FAILURE){
- efree(buffer);
- RETURN_FALSE;
- }
-#else
if ((strong_result = RAND_pseudo_bytes(buffer, buffer_length)) 0) {
efree(buffer);
RETURN_FALSE;
}
-#endif
buffer[buffer_length] = 0;
RETVAL_STRINGL((char *)buffer, buffer_length, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/openssl/openssl.c trunk/ext/openssl/openssl.c
pajoye Tue, 19 Jul 2011 23:01:41 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313457
Log:
- re apply the rng change specific to windows, long term it should be a std
function but as this function was badly introduced in the 1st place, we have to
fix the bad things here instead, pls do not revert again, bad idea.
Changed paths:
U php/php-src/branches/PHP_5_4/ext/openssl/openssl.c
U php/php-src/trunk/ext/openssl/openssl.c
Modified: php/php-src/branches/PHP_5_4/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_4/ext/openssl/openssl.c 2011-07-19 22:38:04 UTC
(rev 313456)
+++ php/php-src/branches/PHP_5_4/ext/openssl/openssl.c 2011-07-19 23:01:41 UTC
(rev 313457)
@@ -4930,10 +4930,19 @@
buffer = emalloc(buffer_length + 1);
+#ifdef PHP_WIN32
+ strong_result = 1;
+ /* random/urandom equivalent on Windows */
+ if (php_win32_get_random_bytes(buffer, (size_t) buffer_length) ==
FAILURE){
+ efree(buffer);
+ RETURN_FALSE;
+ }
+#else
if ((strong_result = RAND_pseudo_bytes(buffer, buffer_length)) 0) {
efree(buffer);
RETURN_FALSE;
}
+#endif
buffer[buffer_length] = 0;
RETVAL_STRINGL((char *)buffer, buffer_length, 0);
Modified: php/php-src/trunk/ext/openssl/openssl.c
===
--- php/php-src/trunk/ext/openssl/openssl.c 2011-07-19 22:38:04 UTC (rev
313456)
+++ php/php-src/trunk/ext/openssl/openssl.c 2011-07-19 23:01:41 UTC (rev
313457)
@@ -4926,10 +4926,19 @@
buffer = emalloc(buffer_length + 1);
+#ifdef PHP_WIN32
+ strong_result = 1;
+ /* random/urandom equivalent on Windows */
+ if (php_win32_get_random_bytes(buffer, (size_t) buffer_length) ==
FAILURE){
+ efree(buffer);
+ RETURN_FALSE;
+ }
+#else
if ((strong_result = RAND_pseudo_bytes(buffer, buffer_length)) 0) {
efree(buffer);
RETURN_FALSE;
}
+#endif
buffer[buffer_length] = 0;
RETVAL_STRINGL((char *)buffer, buffer_length, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/openssl/openssl.c trunk/ext/openssl/openssl.c
Why did you not ask in the 1st place before reverting it?
Please don't waste our time with such things. Users expect this
(tested) fix in the next releases.
Now, openssl has lower minimum windows version support that we do, and
does all possible things to improve the entropy, which is not required
nor necessary for the windows we support.
The idea in the 1st place was to have a standard set of random
functions instead of this, as you well know. Now it is too late and we
have to live with this function. While the set of random will surely
come at some point too.
On Wed, Jul 20, 2011 at 1:04 AM, Scott MacVicar sc...@macvicar.net wrote:
Why isn't this fixed upstream? This is a horrible idea to make core changes
like this without a discussion.
I'll revert this again so we can at least have the opportunity to discuss
this.
S
On 19 Jul 2011, at 15:55, Pierre Joye pierre@gmail.com wrote:
Please restore that, now. That's not your cup of tea and it is the way
it should have been in the 1st place.
On Wed, Jul 20, 2011 at 12:29 AM, Scott MacVicar scott...@php.net wrote:
scottmac Tue, 19 Jul 2011 22:29:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313455
Log:
Revert change to use a special Windows version of
openssl_random_pseudo_bytes().
Lets discuss this on internals first. We're advertising something from the
OpenSSL library
and then subverting it with another Windows OS call.
What are the implications of this? Should we make this available in
ext/standard/ instead?
Changed paths:
U php/php-src/branches/PHP_5_4/ext/openssl/openssl.c
U php/php-src/trunk/ext/openssl/openssl.c
Modified: php/php-src/branches/PHP_5_4/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_4/ext/openssl/openssl.c 2011-07-19 22:18:08
UTC (rev 313454)
+++ php/php-src/branches/PHP_5_4/ext/openssl/openssl.c 2011-07-19 22:29:55
UTC (rev 313455)
@@ -4930,19 +4930,10 @@
buffer = emalloc(buffer_length + 1);
-#ifdef PHP_WIN32
- strong_result = 1;
- /* random/urandom equivalent on Windows */
- if (php_win32_get_random_bytes(buffer, (size_t) buffer_length) ==
FAILURE){
- efree(buffer);
- RETURN_FALSE;
- }
-#else
if ((strong_result = RAND_pseudo_bytes(buffer, buffer_length)) 0) {
efree(buffer);
RETURN_FALSE;
}
-#endif
buffer[buffer_length] = 0;
RETVAL_STRINGL((char *)buffer, buffer_length, 0);
Modified: php/php-src/trunk/ext/openssl/openssl.c
===
--- php/php-src/trunk/ext/openssl/openssl.c 2011-07-19 22:18:08 UTC
(rev 313454)
+++ php/php-src/trunk/ext/openssl/openssl.c 2011-07-19 22:29:55 UTC
(rev 313455)
@@ -4926,19 +4926,10 @@
buffer = emalloc(buffer_length + 1);
-#ifdef PHP_WIN32
- strong_result = 1;
- /* random/urandom equivalent on Windows */
- if (php_win32_get_random_bytes(buffer, (size_t) buffer_length) ==
FAILURE){
- efree(buffer);
- RETURN_FALSE;
- }
-#else
if ((strong_result = RAND_pseudo_bytes(buffer, buffer_length)) 0) {
efree(buffer);
RETURN_FALSE;
}
-#endif
buffer[buffer_length] = 0;
RETVAL_STRINGL((char *)buffer, buffer_length, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/openssl/openssl.c trunk/ext/openssl/openssl.c
hi,
On Wed, Jul 20, 2011 at 1:50 AM, Scott MacVicar sc...@macvicar.net wrote:
Why did you even commit such a change without discussing it?
I maintain this part of the OpenSsl extension and the php windows
port. There was a horrible bug and slowdown with this code and I fixed
it. Users tested it and are happy with the fix.
I understand your logic for doing this but there was no RFC or discussion
around the impact of this.
I do not need to do a RFC for a fix and even less for an extension I maintain.
OpenSSL has been FIPS certified, your change has changed this contract and
it's calling back into a Windows API. Has it been reviewed for correctness?
Be serious two and half second. I gave you the explanation in my reply.
Whats the speed difference between OpenSSL and your version. I know you
removed the screen code which was causing a long delay.
300%
Now move on, we have other things to do that arguing about this little
broken function introduced back then.
On Jul 19, 2011, at 4:13 PM, Pierre Joye wrote:
Why did you not ask in the 1st place before reverting it?
Please don't waste our time with such things. Users expect this
(tested) fix in the next releases.
Now, openssl has lower minimum windows version support that we do, and
does all possible things to improve the entropy, which is not required
nor necessary for the windows we support.
The idea in the 1st place was to have a standard set of random
functions instead of this, as you well know. Now it is too late and we
have to live with this function. While the set of random will surely
come at some point too.
On Wed, Jul 20, 2011 at 1:04 AM, Scott MacVicar sc...@macvicar.net wrote:
Why isn't this fixed upstream? This is a horrible idea to make core changes
like this without a discussion.
I'll revert this again so we can at least have the opportunity to discuss
this.
S
On 19 Jul 2011, at 15:55, Pierre Joye pierre@gmail.com wrote:
Please restore that, now. That's not your cup of tea and it is the way
it should have been in the 1st place.
On Wed, Jul 20, 2011 at 12:29 AM, Scott MacVicar scott...@php.net wrote:
scottmac Tue, 19 Jul 2011 22:29:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313455
Log:
Revert change to use a special Windows version of
openssl_random_pseudo_bytes().
Lets discuss this on internals first. We're advertising something from
the OpenSSL library
and then subverting it with another Windows OS call.
What are the implications of this? Should we make this available in
ext/standard/ instead?
Changed paths:
U php/php-src/branches/PHP_5_4/ext/openssl/openssl.c
U php/php-src/trunk/ext/openssl/openssl.c
Modified: php/php-src/branches/PHP_5_4/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_4/ext/openssl/openssl.c 2011-07-19
22:18:08 UTC (rev 313454)
+++ php/php-src/branches/PHP_5_4/ext/openssl/openssl.c 2011-07-19
22:29:55 UTC (rev 313455)
@@ -4930,19 +4930,10 @@
buffer = emalloc(buffer_length + 1);
-#ifdef PHP_WIN32
- strong_result = 1;
- /* random/urandom equivalent on Windows */
- if (php_win32_get_random_bytes(buffer, (size_t) buffer_length) ==
FAILURE){
- efree(buffer);
- RETURN_FALSE;
- }
-#else
if ((strong_result = RAND_pseudo_bytes(buffer, buffer_length))
0) {
efree(buffer);
RETURN_FALSE;
}
-#endif
buffer[buffer_length] = 0;
RETVAL_STRINGL((char *)buffer, buffer_length, 0);
Modified: php/php-src/trunk/ext/openssl/openssl.c
===
--- php/php-src/trunk/ext/openssl/openssl.c 2011-07-19 22:18:08 UTC
(rev 313454)
+++ php/php-src/trunk/ext/openssl/openssl.c 2011-07-19 22:29:55 UTC
(rev 313455)
@@ -4926,19 +4926,10 @@
buffer = emalloc(buffer_length + 1);
-#ifdef PHP_WIN32
- strong_result = 1;
- /* random/urandom equivalent on Windows */
- if (php_win32_get_random_bytes(buffer, (size_t) buffer_length) ==
FAILURE){
- efree(buffer);
- RETURN_FALSE;
- }
-#else
if ((strong_result = RAND_pseudo_bytes(buffer, buffer_length))
0) {
efree(buffer);
RETURN_FALSE;
}
-#endif
buffer[buffer_length] = 0;
RETVAL_STRINGL((char *)buffer, buffer_length, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
Pierre
@pierrejoye | http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/openssl/openssl.c trunk/ext/openssl/openssl.c
On Wed, Jul 20, 2011 at 1:50 AM, Scott MacVicar sc...@macvicar.net wrote: OpenSSL has been FIPS certified, your change has changed this contract and it's calling back into a Windows API. Has it been reviewed for correctness? And by the way, the CryptoAPI for the windows versions we support is certified as well. Just in case you did not check yourself in the 1st place. Furter ref, http://technet.microsoft.com/en-us/library/cc750357.aspx Cheers, -- Pierre @pierrejoye | http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/mbstring/ libmbfl/mbfl/mbfilter.c mbstring.c
hi Rui!
It would rock if you could use a sparse checkout and commits :)
Thanks,
On Mon, Jul 18, 2011 at 10:21 AM, Rui Hirokawa hirok...@php.net wrote:
hirokawa Mon, 18 Jul 2011 08:21:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313365
Log:
added numeric entities encode/decode in hex format.
Changed paths:
U php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/mbfl/mbfilter.c
U php/php-src/branches/PHP_5_4/ext/mbstring/mbstring.c
Modified: php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/mbfl/mbfilter.c
===
--- php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/mbfl/mbfilter.c
2011-07-18 07:55:03 UTC (rev 313364)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/mbfl/mbfilter.c
2011-07-18 08:21:48 UTC (rev 313365)
@@ -2746,7 +2746,9 @@
}
break;
case 2:
- if (c = 0x30 c = 0x39) { /* '0' - '9' */
+ if (c == 0x78) { /* 'x' */
+ pc-status = 4;
+ } else if (c = 0x30 c = 0x39) { /* '0' - '9' */
pc-cache = c - 0x30;
pc-status = 3;
pc-digit = 1;
@@ -2810,6 +2812,89 @@
(*pc-decoder-filter_function)(c, pc-decoder);
}
break;
+ case 4:
+ if (c = 0x30 c = 0x39) { /* '0' - '9' */
+ pc-cache = c - 0x30;
+ pc-status = 5;
+ pc-digit = 1;
+ } else if (c = 0x41 c = 0x46) { /* 'A' - 'F' */
+ pc-cache = c - 0x41 + 10;
+ pc-status = 5;
+ pc-digit = 1;
+ } else if (c = 0x61 c = 0x66) { /* 'a' - 'f' */
+ pc-cache = c - 0x61 + 10;
+ pc-status = 5;
+ pc-digit = 1;
+ } else {
+ pc-status = 0;
+ (*pc-decoder-filter_function)(0x26, pc-decoder);
/* '' */
+ (*pc-decoder-filter_function)(0x23, pc-decoder);
/* '#' */
+ (*pc-decoder-filter_function)(0x78, pc-decoder);
/* 'x' */
+ (*pc-decoder-filter_function)(c, pc-decoder);
+ }
+ break;
+ case 5:
+ s = 0;
+ f = 0;
+ if ((c = 0x30 c = 0x39) ||
+ (c = 0x41 c = 0x46) ||
+ (c = 0x61 c = 0x66)) { /* '0' - '9' or 'a' -
'f' */
+ if (pc-digit 9) {
+ pc-status = 0;
+ s = pc-cache;
+ f = 1;
+ } else {
+ if (c = 0x30 c = 0x39) {
+ s = pc-cache*16 + (c - 0x30);
+ } else if (c = 0x41 c = 0x46) {
+ s = pc-cache*16 + (c - 0x41 + 10);
+ } else {
+ s = pc-cache*16 + (c - 0x61 + 10);
+ }
+ pc-cache = s;
+ pc-digit++;
+ }
+ } else {
+ pc-status = 0;
+ s = pc-cache;
+ f = 1;
+ n = 0;
+ size = pc-mapsize;
+ while (n size) {
+ mapelm = (pc-convmap[n*4]);
+ d = s - mapelm[2];
+ if (d = mapelm[0] d = mapelm[1]) {
+ f = 0;
+ (*pc-decoder-filter_function)(d,
pc-decoder);
+ if (c != 0x3b) { /* ';' */
+
(*pc-decoder-filter_function)(c, pc-decoder);
+ }
+ break;
+ }
+ n++;
+ }
+ }
+ if (f) {
+ (*pc-decoder-filter_function)(0x26, pc-decoder);
/* '' */
+ (*pc-decoder-filter_function)(0x23, pc-decoder);
/* '#' */
+ (*pc-decoder-filter_function)(0x78, pc-decoder);
/* 'x' */
+ r = 1;
+ n = pc-digit;
+ while (n 0) {
+ r *= 16;
+ n--;
+ }
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/main/php_ini.c trunk/main/php_ini.c
pajoye Mon, 18 Jul 2011 10:25:36 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313371 Log: - fix bug #54204, Can't set a value with a PATH section in php.ini Bug: https://bugs.php.net/54204 (Assigned) Can't set a value with a PATH section in php.ini Changed paths: U php/php-src/branches/PHP_5_4/main/php_ini.c U php/php-src/trunk/main/php_ini.c Modified: php/php-src/branches/PHP_5_4/main/php_ini.c === --- php/php-src/branches/PHP_5_4/main/php_ini.c 2011-07-18 10:19:23 UTC (rev 313370) +++ php/php-src/branches/PHP_5_4/main/php_ini.c 2011-07-18 10:25:36 UTC (rev 313371) @@ -828,7 +828,7 @@ #if PHP_WIN32 memcpy(path_bak, path, path_len); - path_bak[path_len - 1] = 0; + path_bak[path_len] = 0; TRANSLATE_SLASHES_LOWER(path_bak); path = path_bak; #endif Modified: php/php-src/trunk/main/php_ini.c === --- php/php-src/trunk/main/php_ini.c2011-07-18 10:19:23 UTC (rev 313370) +++ php/php-src/trunk/main/php_ini.c2011-07-18 10:25:36 UTC (rev 313371) @@ -828,7 +828,7 @@ #if PHP_WIN32 memcpy(path_bak, path, path_len); - path_bak[path_len - 1] = 0; + path_bak[path_len] = 0; TRANSLATE_SLASHES_LOWER(path_bak); path = path_bak; #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/win32/build/config.w32 trunk/win32/build/config.w32
pajoye Mon, 18 Jul 2011 12:00:08 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313379
Log:
- not a good idea after all and did not do what I thought it should do
Changed paths:
U php/php-src/branches/PHP_5_4/win32/build/config.w32
U php/php-src/trunk/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_4/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_4/win32/build/config.w32 2011-07-18 11:05:10 UTC
(rev 313378)
+++ php/php-src/branches/PHP_5_4/win32/build/config.w32 2011-07-18 12:00:08 UTC
(rev 313379)
@@ -151,7 +151,6 @@
// Set some debug/release specific options
ADD_FLAG('CFLAGS', ' /RTC1 ');
}
- ADD_FLAG('CFLAGS', ' /D_BIND_TO_CURRENT_CRT_VERSION=1 ');
}
ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for
compilation', 'auto');
Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322011-07-18 11:05:10 UTC (rev
313378)
+++ php/php-src/trunk/win32/build/config.w322011-07-18 12:00:08 UTC (rev
313379)
@@ -151,7 +151,6 @@
// Set some debug/release specific options
ADD_FLAG('CFLAGS', ' /RTC1 ');
}
- ADD_FLAG('CFLAGS', ' /D_BIND_TO_CURRENT_CRT_VERSION=1 ');
}
ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for
compilation', 'auto');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ global_avail
pajoye Mon, 18 Jul 2011 17:08:51 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313397 Log: - give Ryan tests karma Changed paths: U SVNROOT/global_avail Modified: SVNROOT/global_avail === --- SVNROOT/global_avail2011-07-18 16:54:59 UTC (rev 313396) +++ SVNROOT/global_avail2011-07-18 17:08:51 UTC (rev 313397) @@ -243,7 +243,7 @@ avail|val|pecl/bcompiler,phpdoc avail|simenec,ttk|pecl/maxdb,phpdoc/en/reference avail|ksadlocha|pecl/simplesql -avail|eyalt,michael,tomerc,rdohms,wimartin,odoucet,danielc,jmfontaine,jeraimee,tyrael,shein,dtajchreber|php/php-src/*/tests,phpdoc +avail|eyalt,michael,tomerc,rdohms,wimartin,odoucet,danielc,jmfontaine,jeraimee,tyrael,shein,dtajchreber,yaauie|php/php-src/*/tests,phpdoc avail|blindman|pecl/colorer avail|mike|pecl/http avail|gabe|pecl/intercept -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS main/php_ini.c
pajoye Mon, 18 Jul 2011 21:00:59 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313404 Log: - MFH: Fixed bug #54204 (Can't set a value with a PATH section in php.ini). Bug: https://bugs.php.net/54204 (Assigned) Can't set a value with a PATH section in php.ini Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/main/php_ini.c Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2011-07-18 20:59:18 UTC (rev 313403) +++ php/php-src/branches/PHP_5_3/NEWS 2011-07-18 21:00:59 UTC (rev 313404) @@ -14,6 +14,8 @@ (Pierre) . Fixed bug #55014 (Compile failure due to improper use of ctime_r()). (Ilia) . Fixed bug #54332 (Crash in zend_mm_check_ptr // Heap corruption). (Dmitry) + . Fixed bug #54204 (Can't set a value with a PATH section in php.ini). +(Pierre) . Fixed bug #54305 (Crash in gc_remove_zval_from_buffer). (Dmitry) . Fixed bug #53727 (Inconsistent behavior of is_subclass_of with interfaces) (Ralph Schindler, Dmitry) Modified: php/php-src/branches/PHP_5_3/main/php_ini.c === --- php/php-src/branches/PHP_5_3/main/php_ini.c 2011-07-18 20:59:18 UTC (rev 313403) +++ php/php-src/branches/PHP_5_3/main/php_ini.c 2011-07-18 21:00:59 UTC (rev 313404) @@ -832,7 +832,7 @@ #if PHP_WIN32 memcpy(path_bak, path, path_len); - path_bak[path_len - 1] = 0; + path_bak[path_len] = 0; TRANSLATE_SLASHES_LOWER(path_bak); path = path_bak; #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/win32/build/config.w32 trunk/win32/build/config.w32
pajoye Thu, 14 Jul 2011 10:54:39 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313233
Log:
- fix decl
Changed paths:
U php/php-src/branches/PHP_5_4/win32/build/config.w32
U php/php-src/trunk/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_4/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_4/win32/build/config.w32 2011-07-14 09:47:27 UTC
(rev 313232)
+++ php/php-src/branches/PHP_5_4/win32/build/config.w32 2011-07-14 10:54:39 UTC
(rev 313233)
@@ -151,7 +151,7 @@
// Set some debug/release specific options
ADD_FLAG('CFLAGS', ' /RTC1 ');
}
- ADD_FLAG('CFLAGS', ' /D_BIND_TO_CURRENT_CRT_VERSION =1 ');
+ ADD_FLAG('CFLAGS', ' /D_BIND_TO_CURRENT_CRT_VERSION=1 ');
}
ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for
compilation', 'auto');
Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322011-07-14 09:47:27 UTC (rev
313232)
+++ php/php-src/trunk/win32/build/config.w322011-07-14 10:54:39 UTC (rev
313233)
@@ -151,7 +151,7 @@
// Set some debug/release specific options
ADD_FLAG('CFLAGS', ' /RTC1 ');
}
- ADD_FLAG('CFLAGS', ' /D_BIND_TO_CURRENT_CRT_VERSION =1 ');
+ ADD_FLAG('CFLAGS', ' /D_BIND_TO_CURRENT_CRT_VERSION=1 ');
}
ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for
compilation', 'auto');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/xsl/xsltprocessor.c trunk/ext/xsl/xsltprocessor.c
pajoye Thu, 14 Jul 2011 11:12:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313235
Log:
- fix build
Changed paths:
U php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c
U php/php-src/trunk/ext/xsl/xsltprocessor.c
Modified: php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c
===
--- php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c2011-07-14
11:07:17 UTC (rev 313234)
+++ php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c2011-07-14
11:12:33 UTC (rev 313235)
@@ -916,8 +916,9 @@
{
zval *id;
xsl_object *intern;
+ long securityPrefs, oldSecurityPrefs;
+
DOM_GET_THIS(id);
- long securityPrefs, oldSecurityPrefs;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l,
securityPrefs) == FAILURE) {
return;
}
@@ -933,9 +934,9 @@
{
zval *id;
xsl_object *intern;
- DOM_GET_THIS(id);
long securityPrefs;
+ DOM_GET_THIS(id);
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, ) == SUCCESS) {
intern = (xsl_object *)zend_object_store_get_object(id
TSRMLS_CC);
RETURN_LONG(intern-securityPrefs);
Modified: php/php-src/trunk/ext/xsl/xsltprocessor.c
===
--- php/php-src/trunk/ext/xsl/xsltprocessor.c 2011-07-14 11:07:17 UTC (rev
313234)
+++ php/php-src/trunk/ext/xsl/xsltprocessor.c 2011-07-14 11:12:33 UTC (rev
313235)
@@ -916,8 +916,9 @@
{
zval *id;
xsl_object *intern;
+ long securityPrefs, oldSecurityPrefs;
+
DOM_GET_THIS(id);
- long securityPrefs, oldSecurityPrefs;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l,
securityPrefs) == FAILURE) {
return;
}
@@ -933,9 +934,9 @@
{
zval *id;
xsl_object *intern;
- DOM_GET_THIS(id);
long securityPrefs;
+ DOM_GET_THIS(id);
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS()
TSRMLS_CC, ) == SUCCESS) {
intern = (xsl_object *)zend_object_store_get_object(id
TSRMLS_CC);
RETURN_LONG(intern-securityPrefs);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/win32/build/config.w32 trunk/win32/build/config.w32
pajoye Wed, 13 Jul 2011 06:42:39 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313197
Log:
- bind to the available crt version
Changed paths:
U php/php-src/branches/PHP_5_4/win32/build/config.w32
U php/php-src/trunk/win32/build/config.w32
Modified: php/php-src/branches/PHP_5_4/win32/build/config.w32
===
--- php/php-src/branches/PHP_5_4/win32/build/config.w32 2011-07-13 05:41:40 UTC
(rev 313196)
+++ php/php-src/branches/PHP_5_4/win32/build/config.w32 2011-07-13 06:42:39 UTC
(rev 313197)
@@ -151,6 +151,7 @@
// Set some debug/release specific options
ADD_FLAG('CFLAGS', ' /RTC1 ');
}
+ ADD_FLAG('CFLAGS', ' /D_BIND_TO_CURRENT_CRT_VERSION =1 ');
}
ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for
compilation', 'auto');
Modified: php/php-src/trunk/win32/build/config.w32
===
--- php/php-src/trunk/win32/build/config.w322011-07-13 05:41:40 UTC (rev
313196)
+++ php/php-src/trunk/win32/build/config.w322011-07-13 06:42:39 UTC (rev
313197)
@@ -151,6 +151,7 @@
// Set some debug/release specific options
ADD_FLAG('CFLAGS', ' /RTC1 ');
}
+ ADD_FLAG('CFLAGS', ' /D_BIND_TO_CURRENT_CRT_VERSION =1 ');
}
ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for
compilation', 'auto');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
