Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/configure.in branches/PHP_5_3/ext/standard/basic_functions.c branches/PHP_5_3/ext/standard/config.m4 branches/PHP_5_3/ext/standard/dns.c branches/PH
On Thu, Aug 6, 2009 at 01:20, Scott MacVicarscott...@php.net wrote: scottmac Wed, 05 Aug 2009 23:20:17 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286857 Log: Change dns.h to php_dns.h, part of my dns cleanup Don't the same rules apply to 5.3 and 5.2 now? (Meaning; if this patch is cool for 5.3, it should go to 5.2 too) -Hannes -- 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/configure.in trunk/configure.in
On 08/05/2009 11:01 PM, Scott MacVicar wrote: scottmac Wed, 05 Aug 2009 20:01:33 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286852 Log: res_search is already checked within ext/standard/config.m4 also check for arpa/nameser_compat.h, OSX puts some old defines in there (not used yet) These are cached, it doesn't matter if res_search is there. Now this file differs even more with other branches.. --Jani Changed paths: U php/php-src/branches/PHP_5_3/configure.in U php/php-src/trunk/configure.in Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2009-08-05 19:45:13 UTC (rev 286851) +++ php/php-src/branches/PHP_5_3/configure.in 2009-08-05 20:01:33 UTC (rev 286852) @@ -424,6 +424,7 @@ alloca.h \ arpa/inet.h \ arpa/nameser.h \ +arpa/nameser_compat.h \ assert.h \ crypt.h \ fcntl.h \ @@ -599,7 +600,6 @@ realpath \ random \ rand_r \ -res_search \ scandir \ setitimer \ setlocale \ Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in 2009-08-05 19:45:13 UTC (rev 286851) +++ php/php-src/trunk/configure.in 2009-08-05 20:01:33 UTC (rev 286852) @@ -424,6 +424,7 @@ alloca.h \ arpa/inet.h \ arpa/nameser.h \ +arpa/nameser_compat.h \ assert.h \ crypt.h \ fcntl.h \ @@ -599,7 +600,6 @@ realpath \ random \ rand_r \ -res_search \ scandir \ setitimer \ setlocale \ -- 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/zend_builtin_functions.c trunk/Zend/zend_builtin_functions.c
jani Thu, 06 Aug 2009 11:02:25 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286878
Log:
- Restore PHP-5.2 behaviour when passing null inside object scope to get_class()
Changed paths:
U php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c
U php/php-src/trunk/Zend/zend_builtin_functions.c
Modified: php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c 2009-08-06
10:56:00 UTC (rev 286877)
+++ php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c 2009-08-06
11:02:25 UTC (rev 286878)
@@ -747,7 +747,7 @@
zend_uint name_len = 0;
int dup;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |o, obj) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |o!, obj) ==
FAILURE) {
RETURN_FALSE;
}
Modified: php/php-src/trunk/Zend/zend_builtin_functions.c
===
--- php/php-src/trunk/Zend/zend_builtin_functions.c 2009-08-06 10:56:00 UTC
(rev 286877)
+++ php/php-src/trunk/Zend/zend_builtin_functions.c 2009-08-06 11:02:25 UTC
(rev 286878)
@@ -716,7 +716,7 @@
zend_uint name_len = 0;
int dup;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |o, obj) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |o!, obj) ==
FAILURE) {
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_3/tests/classes/
jani Thu, 06 Aug 2009 11:05:07 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286879 Log: - Missing svn:ignore Changed paths: _U php/php-src/branches/PHP_5_3/tests/classes/ Property changes on: php/php-src/branches/PHP_5_3/tests/classes ___ Added: svn:ignore + phpt.* *.mem *.diff *.log *.exp *.out *.php *.gcda *.gcno -- 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_2/ext/posix/posix.c branches/PHP_5_3/ext/posix/posix.c trunk/ext/posix/posix.c
jani Thu, 06 Aug 2009 11:11:15 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286880
Log:
- Fix CS and remove extra strlen() call
Changed paths:
U php/php-src/branches/PHP_5_2/ext/posix/posix.c
U php/php-src/branches/PHP_5_3/ext/posix/posix.c
U php/php-src/trunk/ext/posix/posix.c
Modified: php/php-src/branches/PHP_5_2/ext/posix/posix.c
===
--- php/php-src/branches/PHP_5_2/ext/posix/posix.c 2009-08-06 11:05:07 UTC
(rev 286879)
+++ php/php-src/branches/PHP_5_2/ext/posix/posix.c 2009-08-06 11:11:15 UTC
(rev 286880)
@@ -1196,7 +1196,9 @@
RETURN_FALSE;
}
- if(strlen(name)==0) RETURN_FALSE;
+ if (name_len == 0) {
+ RETURN_FALSE;
+ }
RETURN_BOOL(!initgroups((const char *)name, basegid));
}
Modified: php/php-src/branches/PHP_5_3/ext/posix/posix.c
===
--- php/php-src/branches/PHP_5_3/ext/posix/posix.c 2009-08-06 11:05:07 UTC
(rev 286879)
+++ php/php-src/branches/PHP_5_3/ext/posix/posix.c 2009-08-06 11:11:15 UTC
(rev 286880)
@@ -1361,7 +1361,9 @@
RETURN_FALSE;
}
- if(strlen(name)==0) RETURN_FALSE;
+ if (name_len == 0) {
+ RETURN_FALSE;
+ }
RETURN_BOOL(!initgroups((const char *)name, basegid));
}
Modified: php/php-src/trunk/ext/posix/posix.c
===
--- php/php-src/trunk/ext/posix/posix.c 2009-08-06 11:05:07 UTC (rev 286879)
+++ php/php-src/trunk/ext/posix/posix.c 2009-08-06 11:11:15 UTC (rev 286880)
@@ -1390,7 +1390,9 @@
RETURN_FALSE;
}
- if(strlen(name)==0) RETURN_FALSE;
+ if (name_len == 0) {
+ RETURN_FALSE;
+ }
RETURN_BOOL(!initgroups((const char *)name, basegid));
}
--
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/configure.in branches/PHP_5_3/ext/standard/basic_functions.c branches/PHP_5_3/ext/standard/config.m4 branches/PHP_5_3/ext/standard/dns.c branches/PHP_
On Wed, 2009-08-05 at 23:20 +, Scott MacVicar wrote: scottmac Wed, 05 Aug 2009 23:20:17 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286857 Log: Change dns.h to php_dns.h, part of my dns cleanup That header is being installed and the name is part of the public API, from a quick look into it I don't see things that might be used by other modules but I'd like to avoid such changes in a bug fix branch. johannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/phpruntests/trunk/src/ configuration/preconditions/rtIsPhpVersionCorrect.php configuration/rtEnvironmentVariables.php configuration/rtRuntestsConfiguration.php configuration/settin
zoe Thu, 06 Aug 2009 11:48:12 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286881
Log:
change to use protected rather than private
Changed paths:
U
php/phpruntests/trunk/src/configuration/preconditions/rtIsPhpVersionCorrect.php
U php/phpruntests/trunk/src/configuration/rtEnvironmentVariables.php
U php/phpruntests/trunk/src/configuration/rtRuntestsConfiguration.php
U
php/phpruntests/trunk/src/configuration/settings/rtCurrentDirectorySetting.php
U php/phpruntests/trunk/src/configuration/settings/rtLogFormatSetting.php
U
php/phpruntests/trunk/src/configuration/settings/rtPhpCgiExecutableSetting.php
U
php/phpruntests/trunk/src/configuration/settings/rtPhpCommandLineArgSetting.php
U
php/phpruntests/trunk/src/configuration/settings/rtPhpExecutableSetting.php
U
php/phpruntests/trunk/src/configuration/settings/rtTestDirectorySetting.php
U php/phpruntests/trunk/src/configuration/settings/rtTestFileSetting.php
U
php/phpruntests/trunk/src/configuration/settings/rtWorkingDirectorySetting.php
U php/phpruntests/trunk/src/taskScheduler/rtTaskSchedulerFile.php
U php/phpruntests/trunk/src/taskScheduler/rtTaskSchedulerMsgQ.php
U php/phpruntests/trunk/src/taskScheduler/rtTaskTestGroup.php
U php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterHTML.php
U php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterXML.php
U
php/phpruntests/trunk/src/testcase/preconditions/rtHasNoEmptySections.php
U
php/phpruntests/trunk/src/testcase/preconditions/rtIsSectionImplemented.php
U
php/phpruntests/trunk/src/testcase/preconditions/rtIsValidSectionName.php
U php/phpruntests/trunk/src/testcase/rtPhpRunner.php
U php/phpruntests/trunk/src/testcase/rtPhpTest.php
U php/phpruntests/trunk/src/testcase/rtPhpTestFile.php
U php/phpruntests/trunk/src/testcase/rtTestConfiguration.php
U php/phpruntests/trunk/src/testcase/rtTestDifference.php
U php/phpruntests/trunk/src/testcase/rtTestResults.php
U php/phpruntests/trunk/src/testcase/rtTestStatus.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtArgsSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtCookieSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtDeflatePostSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtEnvSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGetSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGzipPostSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtIniSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostRawSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtStdinSection.php
U
php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileExternalSection.php
U
php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileSection.php
U
php/phpruntests/trunk/src/testcase/sections/outputsections/rtExpectFSection.php
U php/phpruntests/trunk/src/testcase/sections/rtSection.php
U php/phpruntests/trunk/src/testgroup/rtPhpTestGroup.php
U php/phpruntests/trunk/src/testrun/rtPhpTestRun.php
Modified: php/phpruntests/trunk/src/configuration/preconditions/rtIsPhpVersionCorrect.php
===
--- php/phpruntests/trunk/src/configuration/preconditions/rtIsPhpVersionCorrect.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/preconditions/rtIsPhpVersionCorrect.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -19,12 +19,12 @@
/**
* @var int
*/
-private $requiredMajorVersion = 5;
+protected $requiredMajorVersion = 5;
/**
* @var int
*/
-private $requiredMinorVersion = 3;
+protected $requiredMinorVersion = 3;
/**
* Return the message associated with an invalid php-version
Modified: php/phpruntests/trunk/src/configuration/rtEnvironmentVariables.php
===
--- php/phpruntests/trunk/src/configuration/rtEnvironmentVariables.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/rtEnvironmentVariables.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -31,7 +31,7 @@
'NO_PHPTEST_SUMMARY',
);
-private $environmentVariables = array();
+protected $environmentVariables = array();
public function __construct()
{
Modified: php/phpruntests/trunk/src/configuration/rtRuntestsConfiguration.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/curl/tests/curl_writeheader_callback.phpt branches/PHP_5_3/ext/curl/tests/curl_writeheader_callback.phpt trunk/ext/curl/tests/curl_writeheader_callbac
iliaaThu, 06 Aug 2009 12:23:35 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286883 Log: Make test more generic Changed paths: U php/php-src/branches/PHP_5_2/ext/curl/tests/curl_writeheader_callback.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_writeheader_callback.phpt U php/php-src/trunk/ext/curl/tests/curl_writeheader_callback.phpt Modified: php/php-src/branches/PHP_5_2/ext/curl/tests/curl_writeheader_callback.phpt === --- php/php-src/branches/PHP_5_2/ext/curl/tests/curl_writeheader_callback.phpt 2009-08-06 12:21:04 UTC (rev 286882) +++ php/php-src/branches/PHP_5_2/ext/curl/tests/curl_writeheader_callback.phpt 2009-08-06 12:23:35 UTC (rev 286883) @@ -26,5 +26,5 @@ curl_close($ch); ? ---EXPECT-- -HTTP/1.1 200 OK +--EXPECTF-- +HTTP/1.1 %d %s Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_writeheader_callback.phpt === --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_writeheader_callback.phpt 2009-08-06 12:21:04 UTC (rev 286882) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_writeheader_callback.phpt 2009-08-06 12:23:35 UTC (rev 286883) @@ -26,5 +26,5 @@ curl_close($ch); ? ---EXPECT-- -HTTP/1.1 200 OK +--EXPECTF-- +HTTP/1.1 %d %s Modified: php/php-src/trunk/ext/curl/tests/curl_writeheader_callback.phpt === --- php/php-src/trunk/ext/curl/tests/curl_writeheader_callback.phpt 2009-08-06 12:21:04 UTC (rev 286882) +++ php/php-src/trunk/ext/curl/tests/curl_writeheader_callback.phpt 2009-08-06 12:23:35 UTC (rev 286883) @@ -26,5 +26,5 @@ curl_close($ch); ? ---EXPECT-- -HTTP/1.1 200 OK +--EXPECTF-- +HTTP/1.1 %d %s -- 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/simplexml/tests/ bug42259.phpt
jani Thu, 06 Aug 2009 12:40:36 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286885
Log:
- Remove duplicate section
Changed paths:
U php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug42259.phpt
Modified: php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug42259.phpt
===
--- php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug42259.phpt
2009-08-06 12:37:28 UTC (rev 286884)
+++ php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug42259.phpt
2009-08-06 12:40:36 UTC (rev 286885)
@@ -1,8 +1,6 @@
--TEST--
Bug #42259 (SimpleXMLIterator loses ancestry)
--SKIPIF--
-?php if (!extension_loaded(simplexml)) print skip; ?
---SKIPIF--
?php
if (!extension_loaded('simplexml')) print 'skip';
if (!extension_loaded(libxml)) print skip LibXML not present;
--
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_2/ext/xmlrpc/tests/bug42189.phpt branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt trunk/ext/xmlrpc/tests/bug42189.phpt
rasmus Thu, 06 Aug 2009 13:08:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286886 Log: Fix test Changed paths: U php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug42189.phpt U php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt U php/php-src/trunk/ext/xmlrpc/tests/bug42189.phpt Modified: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug42189.phpt === --- php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug42189.phpt 2009-08-06 12:40:36 UTC (rev 286885) +++ php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug42189.phpt 2009-08-06 13:08:13 UTC (rev 286886) @@ -11,5 +11,5 @@ echo Done\n; ? --EXPECT-- -bool(false) +bool(true) Done Modified: php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt === --- php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt 2009-08-06 12:40:36 UTC (rev 286885) +++ php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt 2009-08-06 13:08:13 UTC (rev 286886) @@ -11,5 +11,5 @@ echo Done\n; ? --EXPECT-- -bool(false) +bool(true) Done Modified: php/php-src/trunk/ext/xmlrpc/tests/bug42189.phpt === --- php/php-src/trunk/ext/xmlrpc/tests/bug42189.phpt2009-08-06 12:40:36 UTC (rev 286885) +++ php/php-src/trunk/ext/xmlrpc/tests/bug42189.phpt2009-08-06 13:08:13 UTC (rev 286886) @@ -11,5 +11,5 @@ echo Done\n; ? --EXPECT-- -bool(false) +bool(true) Done -- 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_2/ext/xmlrpc/tests/bug42189.phpt branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt trunk/ext/xmlrpc/tests/bug42189.phpt
On 08/06/2009 04:08 PM, Rasmus Lerdorf wrote: rasmus Thu, 06 Aug 2009 13:08:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286886 Log: Fix test Huh? Now the test fails for me. Passing invalid stuff there should realyl return false.. --Jani Changed paths: U php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug42189.phpt U php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt U php/php-src/trunk/ext/xmlrpc/tests/bug42189.phpt Modified: php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug42189.phpt === --- php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug42189.phpt 2009-08-06 12:40:36 UTC (rev 286885) +++ php/php-src/branches/PHP_5_2/ext/xmlrpc/tests/bug42189.phpt 2009-08-06 13:08:13 UTC (rev 286886) @@ -11,5 +11,5 @@ echo Done\n; ? --EXPECT-- -bool(false) +bool(true) Done Modified: php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt === --- php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt 2009-08-06 12:40:36 UTC (rev 286885) +++ php/php-src/branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt 2009-08-06 13:08:13 UTC (rev 286886) @@ -11,5 +11,5 @@ echo Done\n; ? --EXPECT-- -bool(false) +bool(true) Done Modified: php/php-src/trunk/ext/xmlrpc/tests/bug42189.phpt === --- php/php-src/trunk/ext/xmlrpc/tests/bug42189.phpt2009-08-06 12:40:36 UTC (rev 286885) +++ php/php-src/trunk/ext/xmlrpc/tests/bug42189.phpt2009-08-06 13:08:13 UTC (rev 286886) @@ -11,5 +11,5 @@ echo Done\n; ? --EXPECT-- -bool(false) +bool(true) Done -- 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_2/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt branches/PHP_5_2/ext/standard/tests/general_functions/print_r_64bit.phpt branches/PHP_5_
rasmus Thu, 06 Aug 2009 13:26:43 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286887 Log: Fix more tests messed up by svn Changed paths: UU php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt _U php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/print_r_64bit.phpt UU php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt _U php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/print_r_64bit.phpt UU php/php-src/trunk/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt UU php/php-src/trunk/ext/standard/tests/general_functions/print_r_64bit.phpt Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt === --- php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt 2009-08-06 13:08:13 UTC (rev 286886) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt 2009-08-06 13:26:43 UTC (rev 286887) @@ -217,11 +217,11 @@ -- Iteration 38 -- string(34) 1234 5678 - 9100 + 9100 abcda string(34) 1234 5678 - 9100 + 9100 abcda -- Iteration 39 -- bool(true) refcount(3) Property changes on: php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt ___ Deleted: svn:eol-style - native Property changes on: php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/print_r_64bit.phpt ___ Deleted: svn:eol-style - native Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt 2009-08-06 13:08:13 UTC (rev 286886) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt 2009-08-06 13:26:43 UTC (rev 286887) @@ -217,11 +217,11 @@ -- Iteration 38 -- string(34) 1234 5678 - 9100 + 9100 abcda string(34) 1234 5678 - 9100 + 9100 abcda -- Iteration 39 -- bool(true) refcount(3) Property changes on: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt ___ Deleted: svn:eol-style - native Property changes on: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/print_r_64bit.phpt ___ Deleted: svn:eol-style - native Modified: php/php-src/trunk/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt === --- php/php-src/trunk/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt 2009-08-06 13:08:13 UTC (rev 286886) +++ php/php-src/trunk/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt 2009-08-06 13:26:43 UTC (rev 286887) @@ -218,11 +218,11 @@ -- Iteration 38 -- unicode(34) 1234 5678 - 9100 + 9100 abcda unicode(34) 1234 5678 - 9100 + 9100 abcda -- Iteration 39 -- bool(true) refcount(3) Property changes on: php/php-src/trunk/ext/standard/tests/general_functions/debug_zval_dump_b_64bit.phpt ___ Deleted: svn:eol-style - native Modified: php/php-src/trunk/ext/standard/tests/general_functions/print_r_64bit.phpt === --- php/php-src/trunk/ext/standard/tests/general_functions/print_r_64bit.phpt 2009-08-06 13:08:13 UTC (rev 286886) +++ php/php-src/trunk/ext/standard/tests/general_functions/print_r_64bit.phpt 2009-08-06 13:26:43 UTC (rev 286887) @@ -627,15 +627,15 @@ -- Iteration 14 -- 1234 5678 - 9100 + 9100 abcda 1234 5678 - 9100 + 9100 abcda 1234 5678 - 9100 + 9100 abcda *** Testing print_r() on boolean variables *** Property changes on: php/php-src/trunk/ext/standard/tests/general_functions/print_r_64bit.phpt ___ Deleted: svn:eol-style - native -- 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_2/ext/xmlrpc/tests/bug42189.phpt branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt trunk/ext/xmlrpc/tests/bug42189.phpt
Jani Taskinen wrote: On 08/06/2009 04:08 PM, Rasmus Lerdorf wrote: rasmus Thu, 06 Aug 2009 13:08:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286886 Log: Fix test Huh? Now the test fails for me. Passing invalid stuff there should realyl return false.. I tested in both 5.2 and 5.3. Returns true for me in both. -- 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_2/ext/standard/tests/general_functions/print_r_64bit.phpt PHP_5_3/ext/standard/tests/general_functions/print_r_64bit.phpt
rasmus Thu, 06 Aug 2009 13:31:03 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286888 Log: More eol crap Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/print_r_64bit.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/print_r_64bit.phpt Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/print_r_64bit.phpt === --- php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/print_r_64bit.phpt 2009-08-06 13:26:43 UTC (rev 286887) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/print_r_64bit.phpt 2009-08-06 13:31:03 UTC (rev 286888) @@ -627,15 +627,15 @@ -- Iteration 14 -- 1234 5678 - 9100 + 9100 abcda 1234 5678 - 9100 + 9100 abcda 1234 5678 - 9100 + 9100 abcda *** Testing print_r() on boolean variables *** Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/print_r_64bit.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/print_r_64bit.phpt 2009-08-06 13:26:43 UTC (rev 286887) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/print_r_64bit.phpt 2009-08-06 13:31:03 UTC (rev 286888) @@ -627,15 +627,15 @@ -- Iteration 14 -- 1234 5678 - 9100 + 9100 abcda 1234 5678 - 9100 + 9100 abcda 1234 5678 - 9100 + 9100 abcda *** Testing print_r() on boolean variables *** -- 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/class_object/get_class_variation_001.phpt trunk/ext/standard/tests/class_object/get_class_variation_001.phpt
jani Thu, 06 Aug 2009 13:54:21 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286889 Log: - Fix test Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/class_object/get_class_variation_001.phpt U php/php-src/trunk/ext/standard/tests/class_object/get_class_variation_001.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/class_object/get_class_variation_001.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/class_object/get_class_variation_001.phpt 2009-08-06 13:31:03 UTC (rev 286888) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/class_object/get_class_variation_001.phpt 2009-08-06 13:54:21 UTC (rev 286889) @@ -152,12 +152,12 @@ Arg value: (type: NULL) -Warning: get_class() expects parameter 1 to be object, null given in %sget_class_variation_001.php on line %d +Warning: get_class() called without object from outside a class in %sget_class_variation_001.php on line %d bool(false) Arg value: (type: NULL) -Warning: get_class() expects parameter 1 to be object, null given in %sget_class_variation_001.php on line %d +Warning: get_class() called without object from outside a class in %sget_class_variation_001.php on line %d bool(false) Arg value: 1 (type: boolean) @@ -202,11 +202,11 @@ Arg value: (type: NULL) -Warning: get_class() expects parameter 1 to be object, null given in %sget_class_variation_001.php on line %d +Warning: get_class() called without object from outside a class in %sget_class_variation_001.php on line %d bool(false) Arg value: (type: NULL) -Warning: get_class() expects parameter 1 to be object, null given in %sget_class_variation_001.php on line %d +Warning: get_class() called without object from outside a class in %sget_class_variation_001.php on line %d bool(false) Done Modified: php/php-src/trunk/ext/standard/tests/class_object/get_class_variation_001.phpt === --- php/php-src/trunk/ext/standard/tests/class_object/get_class_variation_001.phpt 2009-08-06 13:31:03 UTC (rev 286888) +++ php/php-src/trunk/ext/standard/tests/class_object/get_class_variation_001.phpt 2009-08-06 13:54:21 UTC (rev 286889) @@ -162,12 +162,12 @@ Arg value: (type: NULL) -Warning: get_class() expects parameter 1 to be object, null given in %sget_class_variation_001.php on line %d +Warning: get_class() called without object from outside a class in %sget_class_variation_001.php on line %d bool(false) Arg value: (type: NULL) -Warning: get_class() expects parameter 1 to be object, null given in %sget_class_variation_001.php on line %d +Warning: get_class() called without object from outside a class in %sget_class_variation_001.php on line %d bool(false) Arg value: 1 (type: boolean) @@ -212,11 +212,11 @@ Arg value: (type: NULL) -Warning: get_class() expects parameter 1 to be object, null given in %sget_class_variation_001.php on line %d +Warning: get_class() called without object from outside a class in %sget_class_variation_001.php on line %d bool(false) Arg value: (type: NULL) -Warning: get_class() expects parameter 1 to be object, null given in %sget_class_variation_001.php on line %d +Warning: get_class() called without object from outside a class in %sget_class_variation_001.php on line %d bool(false) Done -- 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_2/ext/xmlrpc/tests/bug42189.phpt branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt trunk/ext/xmlrpc/tests/bug42189.phpt
On 08/06/2009 04:28 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: On 08/06/2009 04:08 PM, Rasmus Lerdorf wrote: rasmus Thu, 06 Aug 2009 13:08:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286886 Log: Fix test Huh? Now the test fails for me. Passing invalid stuff there should realyl return false.. I tested in both 5.2 and 5.3. Returns true for me in both. 32bit / 64bit issue? It fails for me on 32bit machine. Or rather, behaves like it should IMO. On the 64bit machine the test now passes..and still misbehaves since when '~~' was a valid datetime? --Jani -- 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_2/ext/standard/ basic_functions.c config.m4 dns.c dns.h php_dns.h php_standard.h
scottmac Thu, 06 Aug 2009 14:07:16 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286890 Log: Merge r286857: Change dns.h to php_dns.h, part of my dns cleanup Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c U php/php-src/branches/PHP_5_2/ext/standard/config.m4 U php/php-src/branches/PHP_5_2/ext/standard/dns.c D php/php-src/branches/PHP_5_2/ext/standard/dns.h A + php/php-src/branches/PHP_5_2/ext/standard/php_dns.h (from php/php-src/branches/PHP_5_2/ext/standard/dns.h:r286885) U php/php-src/branches/PHP_5_2/ext/standard/php_standard.h Modified: php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c === --- php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c 2009-08-06 13:54:21 UTC (rev 286889) +++ php/php-src/branches/PHP_5_2/ext/standard/basic_functions.c 2009-08-06 14:07:16 UTC (rev 286890) @@ -31,7 +31,7 @@ #include ext/standard/info.h #include ext/session/php_session.h #include zend_operators.h -#include ext/standard/dns.h +#include ext/standard/php_dns.h #include ext/standard/php_uuencode.h #ifdef PHP_WIN32 Modified: php/php-src/branches/PHP_5_2/ext/standard/config.m4 === --- php/php-src/branches/PHP_5_2/ext/standard/config.m4 2009-08-06 13:54:21 UTC (rev 286889) +++ php/php-src/branches/PHP_5_2/ext/standard/config.m4 2009-08-06 14:07:16 UTC (rev 286890) @@ -309,7 +309,7 @@ dnl dnl Detect library functions needed by php dns_xxx functions -dnl ext/standard/dns.h will collect these in a single define: HAVE_DNS_FUNCS +dnl ext/standard/php_dns.h will collect these in a single define: HAVE_DNS_FUNCS dnl PHP_CHECK_FUNC(res_nmkquery, resolv, bind, socket) PHP_CHECK_FUNC(res_nsend, resolv, bind, socket) Modified: php/php-src/branches/PHP_5_2/ext/standard/dns.c === --- php/php-src/branches/PHP_5_2/ext/standard/dns.c 2009-08-06 13:54:21 UTC (rev 286889) +++ php/php-src/branches/PHP_5_2/ext/standard/dns.c 2009-08-06 14:07:16 UTC (rev 286890) @@ -68,7 +68,7 @@ #define AF_INET 2 /* internetwork: UDP, TCP, etc. */ #endif -#include dns.h +#include php_dns.h /* type compat */ #ifndef DNS_T_A Deleted: php/php-src/branches/PHP_5_2/ext/standard/dns.h === --- php/php-src/branches/PHP_5_2/ext/standard/dns.h 2009-08-06 13:54:21 UTC (rev 286889) +++ php/php-src/branches/PHP_5_2/ext/standard/dns.h 2009-08-06 14:07:16 UTC (rev 286890) @@ -1,54 +0,0 @@ -/* - +--+ - | PHP Version 5| - +--+ - | Copyright (c) 1997-2009 The PHP Group| - +--+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is| - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | lice...@php.net so we can mail you a copy immediately. | - +--+ - | Authors: The typical suspects| - | Marcus Boerger he...@php.net | - | Pollita poll...@php.net | - +--+ -*/ - -/* $Id$ */ - -#ifndef DNS_H -#define DNS_H - -#if HAVE_RES_NMKQUERY HAVE_RES_NSEND HAVE_DN_EXPAND HAVE_DN_SKIPNAME -#define HAVE_DNS_FUNCS 1 -#endif - -PHP_FUNCTION(gethostbyaddr); -PHP_FUNCTION(gethostbyname); -PHP_FUNCTION(gethostbynamel); - -#if HAVE_RES_SEARCH !(defined(__BEOS__) || defined(PHP_WIN32) || defined(NETWARE)) -PHP_FUNCTION(dns_check_record); -# if HAVE_DN_SKIPNAME HAVE_DN_EXPAND -PHP_FUNCTION(dns_get_mx); -# endif - -# if HAVE_DNS_FUNCS -PHP_FUNCTION(dns_get_record); -PHP_MINIT_FUNCTION(dns); -# endif -#endif - -#ifndef INT16SZ -#define INT16SZ2 -#endif - -#ifndef INT32SZ -#define INT32SZ4 -#endif - -#endif /* DNS_H */ Copied: php/php-src/branches/PHP_5_2/ext/standard/php_dns.h (from rev 286885, php/php-src/branches/PHP_5_2/ext/standard/dns.h) === --- php/php-src/branches/PHP_5_2/ext/standard/php_dns.h (rev 0) +++
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/xmlrpc/tests/bug42189.phpt branches/PHP_5_3/ext/xmlrpc/tests/bug42189.phpt trunk/ext/xmlrpc/tests/bug42189.phpt
Jani Taskinen wrote: On 08/06/2009 04:28 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: On 08/06/2009 04:08 PM, Rasmus Lerdorf wrote: rasmus Thu, 06 Aug 2009 13:08:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286886 Log: Fix test Huh? Now the test fails for me. Passing invalid stuff there should realyl return false.. I tested in both 5.2 and 5.3. Returns true for me in both. 32bit / 64bit issue? It fails for me on 32bit machine. Or rather, behaves like it should IMO. On the 64bit machine the test now passes..and still misbehaves since when '~~' was a valid datetime? Right, it isn't, but the test was testing a crash. It doesn't crash. And yes, I ran my test on 64-bit Linux. I'll take a closer look later unless someone beats me to it. -Rasmus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
