[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Jul 10 01:31:53 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3102r2=1.3103diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3102 php-src/ChangeLog:1.3103 --- php-src/ChangeLog:1.3102Wed Jul 9 01:32:11 2008 +++ php-src/ChangeLog Thu Jul 10 01:31:53 2008 @@ -1,3 +1,141 @@ +2008-07-09 Etienne Kneuss [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/array.c: + MFH: Fix resolution rule of count vs. handler + +* ext/standard/array.c: + Fix resolution rule of count vs. handler + +* (PHP_5_3) + ext/simplexml/php_simplexml.h + ext/simplexml/simplexml.c + ext/simplexml/tests/036.phpt + ext/spl/spl_sxe.c: + MFH: Move SXI::count to SXE::count and make it user-friendly + +* ext/simplexml/php_simplexml.h + ext/simplexml/simplexml.c + ext/simplexml/tests/036.phpt + ext/simplexml/tests/036.phpt: + Move SXI::count to SXE::count and make it user-friendly + +* ext/spl/tests/fixedarray_019.phpt + ext/spl/tests/fixedarray_019.phpt: + + Test extended iterators methods + +2008-07-09 Rob Richards [EMAIL PROTECTED] + +* ext/gd/config.w32 + ext/zip/config.w32: + MFB: fix zlib detection and linking + - synch zip config.w32 + +* (PHP_5_3) + ext/gd/config.w32 + ext/zip/config.w32: + fix zlib detection and linking + +2008-07-09 Steph Fox [EMAIL PROTECTED] + +* (PHP_5_3) + win32/build/projectgen.js: + - It's amazing the havoc one little misplaced bracket can cause... + +* (PHP_5_3) + win32/build/projectgen.js: + - Clean up ws/cs a bit and add some comments + +2008-07-09 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + ext/phar/phar.c: + add zero-terminator to the delimiter (and make valgrind happy) + +2008-07-09 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ext/date/tests/015.phpt + ext/date/tests/test-parse-from-format.phpt: + - Fixed test + +* ext/date/php_date.c: + - MFB: Added arginfo + +* (PHP_5_3) + ext/date/php_date.c: + - Added arginfo + +2008-07-09 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + ZendEngine2/tests/each_002.phpt: + remove UEXPECTF section + +2008-07-09 Scott MacVicar [EMAIL PROTECTED] + +* win32/build/config.w32: + Fix windows build + +2008-07-09 Etienne Kneuss [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS: + add SplFileInfo::getPathInfo fix to NEWS + +* ext/phar/tests/phar_oo_005.phpt + ext/phar/tests/refcount1.phpt + ext/phar/tests/tar/refcount1.phpt + ext/phar/tests/zip/refcount1.phpt: + MFB: Fix filename/pathname/getpathinfo tests according to SPL fix + +2008-07-09 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_3) + ext/phar/phar_object.c: + Fixed efree(NULL) + +2008-07-09 Etienne Kneuss [EMAIL PROTECTED] + +* (PHP_5_3) + ext/phar/tests/phar_oo_005.phpt + ext/phar/tests/refcount1.phpt + ext/phar/tests/tar/refcount1.phpt + ext/phar/tests/zip/refcount1.phpt: + Fix filename/pathname/getpathinfo tests according to SPL fix + +2008-07-09 Joe Orton [EMAIL PROTECTED] + +* (PHP_5_3) + ext/date/tests/015.phpt: + - MFH: tweak test case to better trigger the (now-fixed) reference bugs + +* ext/date/tests/015.phpt: + - tweak test case to better trigger the (now-fixed) reference bugs + +2008-07-09 Steph Fox [EMAIL PROTECTED] + +* (PHP_5_3) + win32/.cvsignore: + - Add generated files to .cvsignore + +* win32/build/DSP.README + win32/build/DSP.README + win32/build/block.template.dsw + win32/build/block.template.dsw + win32/build/buildconf.js + win32/build/config.w32 + win32/build/confutils.js + win32/build/projectgen.js + win32/build/projectgen.js + win32/build/template.dsp + win32/build/template.dsp + win32/build/template.dsw + win32/build/template.dsw: + + file DSP.README was initially added on branch PHP_5_3. + 2008-07-08 Etienne Kneuss [EMAIL PROTECTED] * ext/spl/spl_directory.c
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Jul 10 01:31:56 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1333r2=1.1334diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1333 ZendEngine2/ChangeLog:1.1334 --- ZendEngine2/ChangeLog:1.1333Wed Jul 9 01:32:18 2008 +++ ZendEngine2/ChangeLog Thu Jul 10 01:31:56 2008 @@ -1,3 +1,9 @@ +2008-07-09 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + tests/each_002.phpt: + remove UEXPECTF section + 2008-07-08 Dmitry Stogov [EMAIL PROTECTED] * zend_closures.c @@ -24554,7 +24560,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1333 2008/07/09 01:32:18 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1334 2008/07/10 01:31:56 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -26278,7 +26284,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1333 2008/07/09 01:32:18 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1334 2008/07/10 01:31:56 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build DSP.README block.template.dsw buildconf.js config.w32 confutils.js projectgen.js template.dsp template.dsw
sfoxWed Jul 9 08:15:46 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/win32/buildDSP.README block.template.dsw projectgen.js
template.dsp template.dsw
Modified files:
/php-src/win32/buildbuildconf.js config.w32 confutils.js
Log:
- Embryonic project file generation. Use buildconf --add-project-files and
hopefully it'll work.
- Please read the README before complaining.
@Stas, Rob - please test.
http://cvs.php.net/viewvc.cgi/php-src/win32/build/buildconf.js?r1=1.13.2.2.2.1.2.2r2=1.13.2.2.2.1.2.3diff_format=u
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.2
php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.3
--- php-src/win32/build/buildconf.js:1.13.2.2.2.1.2.2 Mon Jun 23 07:55:03 2008
+++ php-src/win32/build/buildconf.jsWed Jul 9 08:15:46 2008
@@ -16,13 +16,14 @@
+--+
*/
-/* $Id: buildconf.js,v 1.13.2.2.2.1.2.2 2008/06/23 07:55:03 pajoye Exp $ */
+/* $Id: buildconf.js,v 1.13.2.2.2.1.2.3 2008/07/09 08:15:46 sfox Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine(Rebuilding configure.js);
var FSO = WScript.CreateObject(Scripting.FileSystemObject);
var C = FSO.CreateTextFile(configure.js, true);
var B = FSO.CreateTextFile(configure.bat, true);
+var DSP = false;
var modules = ;
var MODULES = WScript.CreateObject(Scripting.Dictionary);
@@ -203,6 +204,11 @@
WScript.StdOut.WriteLine(Adding + argval + to the
module search path);
module_dirs[module_dirs.length] = argval;
}
+
+ if (argname == '--add-project-files') {
+ WScript.StdOut.WriteLine(Adding dsp templates into the
mix);
+ DSP = true;
+ }
}
}
@@ -212,6 +218,16 @@
C.WriteLine(/* This file automatically generated from
win32/build/confutils.js */);
C.Write(file_get_contents(win32/build/confutils.js));
+// If project files were requested, pull in the code to generate them
+if (DSP == true) {
+ C.WriteLine('PHP_DSP=yes');
+ C.WriteBlankLines(1);
+ C.Write(file_get_contents(win32/build/projectgen.js));
+} else {
+ C.WriteLine('PHP_DSP=no');
+ C.WriteBlankLines(1);
+}
+
// Pull in code from sapi and extensions
modules = file_get_contents(win32/build/config.w32);
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.23r2=1.40.2.8.2.10.2.24diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.23
php-src/win32/build/config.w32:1.40.2.8.2.10.2.24
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.23 Mon Jul 7 13:51:35 2008
+++ php-src/win32/build/config.w32 Wed Jul 9 08:15:46 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.23 2008/07/07 13:51:35 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.24 2008/07/09 08:15:46 sfox Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -364,3 +364,10 @@
DEFINE('SNAPSHOT_TEMPLATE', PHP_SNAPSHOT_TEMPLATE);
ARG_ENABLE('summary', 'Enable configuration summary', 'yes');
+
+if (PHP_DSP != no) {
+ if (FSO.FolderExists(tmp)) {
+ FSO.DeleteFolder(tmp);
+ }
+ FSO.CreateFolder(tmp);
+}
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.22r2=1.60.2.1.2.8.2.23diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.22
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.23
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.22 Mon Jul 7 13:51:35 2008
+++ php-src/win32/build/confutils.jsWed Jul 9 08:15:46 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8.2.22 2008/07/07 13:51:35 pajoye Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.23 2008/07/09 08:15:46 sfox Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -26,6 +26,7 @@
var MFO = null;
var SYSTEM_DRIVE = WshShell.Environment(Process).Item(SystemDrive);
var PROGRAM_FILES = WshShell.Environment(Process).Item(ProgramFiles);
+var DSP_FLAGS = new Array();
/* Store the enabled extensions (summary + QA check) */
var extensions_enabled = new Array();
@@ -1039,6 +1040,10 @@
ADD_FLAG(SAPI_TARGETS, makefiletarget);
}
+ if (PHP_DSP != no) {
+ generate_dsp_file(sapiname, configure_module_dirname,
file_list, false);
+ }
+
MFO.WriteBlankLines(1);
sapi_enabled[sapi_enabled.length] = [sapiname];
}
@@ -1203,6 +1208,11 @@
DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_PHP) $(CFLAGS_' +
EXT + ')');
}
ADD_FLAG(CFLAGS_ + EXT, cflags);
+
+ if
[PHP-CVS] cvs: php-src(PHP_5_3) /win32 .cvsignore
sfoxWed Jul 9 08:17:03 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32 .cvsignore Log: - Add generated files to .cvsignore http://cvs.php.net/viewvc.cgi/php-src/win32/.cvsignore?r1=1.8r2=1.8.6.1diff_format=u Index: php-src/win32/.cvsignore diff -u php-src/win32/.cvsignore:1.8 php-src/win32/.cvsignore:1.8.6.1 --- php-src/win32/.cvsignore:1.8Sun Oct 10 16:10:38 2004 +++ php-src/win32/.cvsignoreWed Jul 9 08:17:03 2008 @@ -16,3 +16,5 @@ wsyslog.h *.gcda *.gcno +win32.dsp +php.dsw -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests 015.phpt
jorton Wed Jul 9 08:29:55 2008 UTC
Modified files:
/php-src/ext/date/tests 015.phpt
Log:
- tweak test case to better trigger the (now-fixed) reference bugs
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/015.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/date/tests/015.phpt
diff -u php-src/ext/date/tests/015.phpt:1.1 php-src/ext/date/tests/015.phpt:1.2
--- php-src/ext/date/tests/015.phpt:1.1 Tue Jul 8 17:40:35 2008
+++ php-src/ext/date/tests/015.phpt Wed Jul 9 08:29:55 2008
@@ -10,10 +10,13 @@
$dto-setTimezone(new DateTimeZone('US/Eastern'));
var_dump($tzold-getName());
var_dump($dto-getTimezone()-getName());
+unset($dto);
+var_dump($tzold-getName());
echo Done\n;
?
--EXPECTF--
unicode(3) UTC
unicode(3) UTC
unicode(10) US/Eastern
+unicode(3) UTC
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build DSP.README block.template.dsw buildconf.js config.w32 confutils.js projectgen.js template.dsp template.dsw
On Wed, Jul 9, 2008 at 10:15 AM, Steph Fox [EMAIL PROTECTED] wrote: sfoxWed Jul 9 08:15:46 2008 UTC Added files: (Branch: PHP_5_3) /php-src/win32/buildDSP.README block.template.dsw projectgen.js template.dsp template.dsw Modified files: /php-src/win32/buildbuildconf.js config.w32 confutils.js Log: - Embryonic project file generation. Use buildconf --add-project-files and hopefully it'll work. - Please read the README before complaining. @Stas, Rob - please test. It is not like it hurts anyone to have that but do you know that: - we are working on CMake port which allows exactly that and much more? (all VC versions, projects or makefile, ICC, mingw, etc.) - VC6 is likely to be dropped in the release after 5.3 And as Rob said to you on IRC, there is no need to change anything in regards of the DSP but update them until cmake is ready. I'm not sure it is worth the effort to do that now. It would be also nice to ask first and provide some patches too. Cheers, -- Pierre 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] cvs: php-src(PHP_5_3) /ext/date/tests 015.phpt
jorton Wed Jul 9 08:37:29 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date/tests 015.phpt
Log:
- MFH: tweak test case to better trigger the (now-fixed) reference bugs
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/015.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/date/tests/015.phpt
diff -u php-src/ext/date/tests/015.phpt:1.1.2.2
php-src/ext/date/tests/015.phpt:1.1.2.3
--- php-src/ext/date/tests/015.phpt:1.1.2.2 Tue Jul 8 17:41:51 2008
+++ php-src/ext/date/tests/015.phpt Wed Jul 9 08:37:29 2008
@@ -10,10 +10,13 @@
$dto-setTimezone(new DateTimeZone('US/Eastern'));
var_dump($tzold-getName());
var_dump($dto-getTimezone()-getName());
+unset($dto);
+var_dump($tzold-getName());
echo Done\n;
?
--EXPECTF--
-string(3) UTC
-string(3) UTC
-string(10) US/Eastern
+unicode(3) UTC
+unicode(3) UTC
+unicode(10) US/Eastern
+unicode(3) UTC
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build DSP.README block.template.dsw buildconf.js config.w32 confutils.js projectgen.js template.dsp template.dsw
Well surprise, Pierre, - we are working on CMake port which allows exactly that and much Good grief, I'm surprised you find the time to do it all in between haranguing me! What is it exactly that CMake does for IDEs anyway? more? (all VC versions, projects or makefile, ICC, mingw, etc.) - VC6 is likely to be dropped in the release after 5.3 OMG, and to think we said 5 years last year... And as Rob said to you on IRC, there is no need to change anything in regards of the DSP but update them until cmake is ready. And you're going to update them, are you? Great, I'll wash my hands of it all then. I'm not sure it is worth the effort to do that now. To do what? It would be also nice to ask first and provide some patches too. Why on earth would I want to provide patches? These are new files. And why should I ask your permission? Does anyone else ask your permission? - Steph -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_directory.c /ext/spl/tests dit_001.phpt fileobject_003.phpt fileobject_getfileinfo_basic.phpt
Hi Etienne, After this patch I see 4 broken tests in ext/phar. I'm not sure if the new behavior is expected, could you please take a look. Thanks. Dmitry. Etienne Kneuss wrote: colderTue Jul 8 22:40:49 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl spl_directory.c /php-src/ext/spl/testsdit_001.phpt fileobject_003.phpt fileobject_getfileinfo_basic.phpt Log: MFH: - Fix filename in debug_info - Fix #45345 (getPathInfo on the file instead of the dir) - Remove trailing / on input -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar_object.c
dmitry Wed Jul 9 08:47:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar_object.c
Log:
Fixed efree(NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.33r2=1.266.2.34diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.33
php-src/ext/phar/phar_object.c:1.266.2.34
--- php-src/ext/phar/phar_object.c:1.266.2.33 Mon Jul 7 01:11:07 2008
+++ php-src/ext/phar/phar_object.c Wed Jul 9 08:47:05 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_object.c,v 1.266.2.33 2008/07/07 01:11:07 sfox Exp $ */
+/* $Id: phar_object.c,v 1.266.2.34 2008/07/09 08:47:05 dmitry Exp $ */
#include phar_internal.h
#include func_interceptors.h
@@ -3884,12 +3884,12 @@
}
fp = php_stream_open_wrapper(phar_obj-arc.archive-fname, rb,
IGNORE_URL|STREAM_MUST_SEEK, actual);
- efree(actual);
if (!fp) {
zend_throw_exception_ex(spl_ce_InvalidArgumentException, 0
TSRMLS_CC,
Invalid argument, %s cannot be found,
phar_obj-arc.archive-fname);
return;
}
+ efree(actual);
php_stream_close(fp);
if (pathto_len 1) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests phar_oo_005.phpt refcount1.phpt /ext/phar/tests/tar refcount1.phpt /ext/phar/tests/zip refcount1.phpt
Whoa, hang on Etienne, that's actually different behaviour... you used to
get 'string(21) phar_oo_test.phar.php' and now you get 'string(5)
a.php'?
Can you explain?
Thanks,
- Steph
- Original Message -
From: Etienne Kneuss [EMAIL PROTECTED]
To: php-cvs@lists.php.net
Sent: Wednesday, July 09, 2008 9:39 AM
Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests phar_oo_005.phpt
refcount1.phpt /ext/phar/tests/tar refcount1.phpt /ext/phar/tests/zip
refcount1.phpt
colder Wed Jul 9 08:39:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/tests phar_oo_005.phpt refcount1.phpt
/php-src/ext/phar/tests/tar refcount1.phpt
/php-src/ext/phar/tests/zip refcount1.phpt
Log:
Fix filename/pathname/getpathinfo tests according to SPL fix
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_oo_005.phpt?r1=1.9r2=1.9.2.1diff_format=u
Index: php-src/ext/phar/tests/phar_oo_005.phpt
diff -u php-src/ext/phar/tests/phar_oo_005.phpt:1.9
php-src/ext/phar/tests/phar_oo_005.phpt:1.9.2.1
--- php-src/ext/phar/tests/phar_oo_005.phpt:1.9 Wed Feb 20 13:32:59 2008
+++ php-src/ext/phar/tests/phar_oo_005.phpt Wed Jul 9 08:39:41 2008
@@ -36,25 +36,25 @@
string(14) phar://*/a.php
string(0)
string(5) a.php
-string(21) phar_oo_test.phar.php
+string(5) a.php
string(16) phar://*/b/c.php
string(16) phar://*/b/c.php
string(1) b
string(7) b/c.php
-string(1) b
+string(5) c.php
string(16) phar://*/b/d.php
string(16) phar://*/b/d.php
string(1) b
string(7) b/d.php
-string(1) b
+string(5) d.php
string(14) phar://*/b.php
string(14) phar://*/b.php
string(0)
string(5) b.php
-string(21) phar_oo_test.phar.php
+string(5) b.php
string(14) phar://*/e.php
string(14) phar://*/e.php
string(0)
string(5) e.php
-string(21) phar_oo_test.phar.php
+string(5) e.php
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/refcount1.phpt?r1=1.10r2=1.10.2.1diff_format=u
Index: php-src/ext/phar/tests/refcount1.phpt
diff -u php-src/ext/phar/tests/refcount1.phpt:1.10
php-src/ext/phar/tests/refcount1.phpt:1.10.2.1
--- php-src/ext/phar/tests/refcount1.phpt:1.10 Wed Feb 20 13:11:38 2008
+++ php-src/ext/phar/tests/refcount1.phpt Wed Jul 9 08:39:41 2008
@@ -43,9 +43,9 @@
===CLOSE===
object(PharFileInfo)#%d (2) {
[pathName:SplFileInfo:private]=
- string(%d) phar://%srefcount1.phar.php/b
- [fileName:SplFileInfo:private]=
string(%d) phar://%srefcount1.phar.php/b/c.php
+ [fileName:SplFileInfo:private]=
+ string(%d) c.php
}
string(5) extra
===UNLINK===
@@ -53,9 +53,9 @@
Warning: unlink(): phar error: b/c.php in phar %srefcount1.phar.php,
has open file pointers, cannot unlink in %srefcount1.php on line %d
object(PharFileInfo)#%d (2) {
[pathName:SplFileInfo:private]=
- string(%d) phar://%srefcount1.phar.php/b
+ string(%d) phar://%srefcount1.phar.php/b/c.php
[fileName:SplFileInfo:private]=
- string(%s) phar://%srefcount1.phar.php/b/c.php
+ string(%s) c.php
}
string(5) extra
extra
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/tar/refcount1.phpt?r1=1.2r2=1.2.2.1diff_format=u
Index: php-src/ext/phar/tests/tar/refcount1.phpt
diff -u php-src/ext/phar/tests/tar/refcount1.phpt:1.2
php-src/ext/phar/tests/tar/refcount1.phpt:1.2.2.1
--- php-src/ext/phar/tests/tar/refcount1.phpt:1.2 Tue Feb 12 16:39:58 2008
+++ php-src/ext/phar/tests/tar/refcount1.phpt Wed Jul 9 08:39:42 2008
@@ -55,9 +55,9 @@
===CLOSE===
object(PharFileInfo)#%d (2) {
[pathName:SplFileInfo:private]=
- string(%d) phar://%srefcount1.phar.tar/b
- [fileName:SplFileInfo:private]=
string(%d) phar://%srefcount1.phar.tar/b/c.php
+ [fileName:SplFileInfo:private]=
+ string(%d) c.php
}
string(5) extra
===UNLINK===
@@ -65,9 +65,9 @@
Warning: unlink(): phar error: b/c.php in phar %srefcount1.phar.tar,
has open file pointers, cannot unlink in %srefcount1.php on line %d
object(PharFileInfo)#%d (2) {
[pathName:SplFileInfo:private]=
- string(%d) phar://%srefcount1.phar.tar/b
+ string(%d) phar://%srefcount1.phar.tar/b/c.php
[fileName:SplFileInfo:private]=
- string(%s) phar://%srefcount1.phar.tar/b/c.php
+ string(%s) c.php
}
string(5) extra
extra
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/refcount1.phpt?r1=1.3r2=1.3.2.1diff_format=u
Index: php-src/ext/phar/tests/zip/refcount1.phpt
diff -u php-src/ext/phar/tests/zip/refcount1.phpt:1.3
php-src/ext/phar/tests/zip/refcount1.phpt:1.3.2.1
--- php-src/ext/phar/tests/zip/refcount1.phpt:1.3 Mon Feb 11 20:55:42 2008
+++ php-src/ext/phar/tests/zip/refcount1.phpt Wed Jul 9 08:39:42 2008
@@ -51,9 +51,9 @@
===CLOSE===
object(PharFileInfo)#%d (2) {
[pathName:SplFileInfo:private]=
- string(%d) phar://%srefcount1.phar.zip/b
- [fileName:SplFileInfo:private]=
string(%d) phar://%srefcount1.phar.zip/b/c.php
+ [fileName:SplFileInfo:private]=
+ string(%d) c.php
}
string(5) extra
===UNLINK===
@@ -61,9 +61,9 @@
Warning: unlink(): phar error: b/c.php in phar %srefcount1.phar.zip,
has open file pointers, cannot unlink in %srefcount1.php on line %d
object(PharFileInfo)#%d
[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build DSP.README block.template.dsw buildconf.js config.w32 confutils.js projectgen.js template.dsp template.dsw
Read the description in the wiki and in the CMake docs. It generates dsp/dsw, sln/vcproj or makefiles for all VC versions (while working as well for unix). Great, cool, shame it'll take a couple of years from inception before we can rely on it day-in day-out. No idea what you are talking about here. You don't surprise me. We agreed that VC6 wasn't about to vanish in a puff of smoke and we shouldn't pull support for the old system completely. This at the same time as we agreed we should be working on getting third-party libs to build across every version in sight. Rob and Stan said they will or can. You must have very optimistic hearing :) I'm not sure it is worth the effort to do that now. To do what? What you are doing now. What am I doing now? I'm asking because your line of attack strongly suggests that you actually don't have a clue what I did. Why on earth would I want to provide patches? These are new files. And why should I ask your permission? Does anyone else ask your permission? Not my permission but ours. Oh, but I did. Just not yours. I somehow didn't feel in the mood for watching my work getting your name and fingerprints all over it again. - Steph -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS configure.in /ext/pcre php_pcre.c /ext/reflection php_reflection.c ZendEngine2 Makefile.am Zend.dsp ZendTS.dsp zend.h zend_API.c zend_closures.c zend_closures.h ze
Hello Dmitry, Christian, great work! marcus Tuesday, July 8, 2008, 9:05:04 AM, you wrote: dmitry Tue Jul 8 07:05:04 2008 UTC Added files: /ZendEngine2zend_closures.c zend_closures.h /ZendEngine2/tests closure_001.phpt closure_002.phpt closure_003.phpt closure_004.phpt closure_005.phpt closure_006.phpt closure_007.phpt closure_008.phpt closure_009.phpt closure_010.phpt closure_011.phpt closure_012.phpt Modified files: /php-srcNEWS configure.in /ZendEngine2Makefile.am Zend.dsp ZendTS.dsp zend.h zend_API.c zend_compile.c zend_compile.h zend_default_classes.c zend_execute.c zend_execute_API.c zend_language_parser.y zend_vm_def.h zend_vm_execute.h zend_vm_opcodes.h /php-src/ext/pcre php_pcre.c /php-src/ext/reflection php_reflection.c Log: Added closures support Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
colder Wed Jul 9 10:07:46 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: add SplFileInfo::getPathInfo fix to NEWS http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.197r2=1.2027.2.547.2.965.2.198diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.197 php-src/NEWS:1.2027.2.547.2.965.2.198 --- php-src/NEWS:1.2027.2.547.2.965.2.197 Tue Jul 8 17:41:51 2008 +++ php-src/NEWSWed Jul 9 10:07:46 2008 @@ -199,6 +199,8 @@ - Fixed PECL bug #12431 (OCI8 ping functionality is broken). (Oracle Corp.) +- Fixed bug #45345 (SPLFileInfo::getPathInfo() returning dir info instead of + file info). (Etienne) - Fixed bug #45038 (Crash when using DateTimeZone object returned by Date::getTimezone). (Joe Orton, Derick) - Fixed bug #44769 (declaring private magic methods should throw error). (Felipe) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
scottmacWed Jul 9 10:39:11 2008 UTC Modified files: /php-src/win32/buildconfig.w32 Log: Fix windows build http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.75r2=1.76diff_format=u Index: php-src/win32/build/config.w32 diff -u php-src/win32/build/config.w32:1.75 php-src/win32/build/config.w32:1.76 --- php-src/win32/build/config.w32:1.75 Mon Jul 7 13:48:23 2008 +++ php-src/win32/build/config.w32 Wed Jul 9 10:39:11 2008 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32,v 1.75 2008/07/07 13:48:23 pajoye Exp $ +// $Id: config.w32,v 1.76 2008/07/09 10:39:11 scottmac Exp $ // Master config file; think of it as a configure.in // equivalent. @@ -311,7 +311,7 @@ } ADD_FLAG(LIBS, icuuc.lib icuin.lib icuio.lib icule.lib iculx.lib); } - + //DEFINE(PHP_BUILD, PHP_PHP_BUILD); STDOUT.WriteBlankLines(1); @@ -328,7 +328,7 @@ zend_sprintf.c zend_ini.c zend_qsort.c zend_ts_hash.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c zend_unicode.c zend_strtol.c \ - zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c); + zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c); ADD_SOURCES(main, main.c snprintf.c spprintf.c fopen_wrappers.c \ php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] subscrive
-- Barry Carlyon Located Between Al-Jazeera and BBC Radio 1 Webmaster of, http://barrycarlyon.co.uk http://lsrfm.com mobile: 07729 048 443 office: 0113 380 1280 skype: barrycarlyon email: [EMAIL PROTECTED] msn: [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail loginfo
derick Wed Jul 9 11:43:13 2008 UTC
Modified files:
/CVSROOTavail loginfo
Log:
- Adding bcarlyon for the bugtracker GSoC project, and redirect mails to the
php-cvs list.
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1419r2=1.1420diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1419 CVSROOT/avail:1.1420
--- CVSROOT/avail:1.1419Wed Jul 2 15:26:05 2008
+++ CVSROOT/avail Wed Jul 9 11:43:13 2008
@@ -331,4 +331,7 @@
# Our bundled version of bindlib (used by php on windows)
avail|auroraeosrose,scottmac,pajoye,edin|bindlib_w32
+# bugtracker karma
+avail|bcarlyon|bugtracker
+
# vim:set ft=conf sw=2 ts=2 et:
http://cvs.php.net/viewvc.cgi/CVSROOT/loginfo?r1=1.130r2=1.131diff_format=u
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.130 CVSROOT/loginfo:1.131
--- CVSROOT/loginfo:1.130 Wed May 28 06:15:38 2008
+++ CVSROOT/loginfo Wed Jul 9 11:43:13 2008
@@ -1,5 +1,5 @@
#
-#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.130 2008/05/28 06:15:38
philip Exp $
+#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.131 2008/07/09 11:43:13
derick Exp $
#
# The loginfo file is used to control where cvs commit log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -106,6 +106,7 @@
# QA website
^qaweb $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^bugtracker $CVSROOT/CVSROOT/loginfo.pl php-cvs@lists.php.net $USER %{sVv}
# presentation-related stuff
^pres$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / loginfo
derick Wed Jul 9 11:58:18 2008 UTC
Modified files:
/CVSROOTloginfo
Log:
- It's better for the webmaster list.
http://cvs.php.net/viewvc.cgi/CVSROOT/loginfo?r1=1.131r2=1.132diff_format=u
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.131 CVSROOT/loginfo:1.132
--- CVSROOT/loginfo:1.131 Wed Jul 9 11:43:13 2008
+++ CVSROOT/loginfo Wed Jul 9 11:58:17 2008
@@ -1,5 +1,5 @@
#
-#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.131 2008/07/09 11:43:13
derick Exp $
+#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.132 2008/07/09 11:58:17
derick Exp $
#
# The loginfo file is used to control where cvs commit log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -45,6 +45,7 @@
# php.net websites
^php[^/]*web $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
+^bugtracker $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
# zend stuff
^ZendAPI$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED],[EMAIL PROTECTED]
$USER %{sVv}
@@ -106,7 +107,6 @@
# QA website
^qaweb $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
-^bugtracker $CVSROOT/CVSROOT/loginfo.pl php-cvs@lists.php.net $USER %{sVv}
# presentation-related stuff
^pres$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date php_date.c
felipe Wed Jul 9 12:50:57 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date php_date.c Log: - Added arginfo http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.41r2=1.43.2.45.2.51.2.42diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.41 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.42 --- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.41 Tue Jul 8 19:29:18 2008 +++ php-src/ext/date/php_date.c Wed Jul 9 12:50:57 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51.2.41 2008/07/08 19:29:18 derick Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.42 2008/07/09 12:50:57 felipe Exp $ */ #include php.h #include php_streams.h @@ -146,6 +146,264 @@ ZEND_ARG_INFO(0, longitude) ZEND_END_ARG_INFO() +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create, 0, 0, 0) + ZEND_ARG_INFO(0, time) + ZEND_ARG_INFO(0, object) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create_from_format, 0, 0, 2) + ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(0, time) + ZEND_ARG_INFO(0, object) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_parse, 0, 0, 1) + ZEND_ARG_INFO(0, date) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_parse_from_format, 0, 0, 2) + ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(0, date) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_date_get_last_errors, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_format, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, format) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_format, 0, 0, 1) + ZEND_ARG_INFO(0, format) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_modify, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, modify) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_modify, 0, 0, 1) + ZEND_ARG_INFO(0, modify) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_add, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, interval) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_add, 0, 0, 1) + ZEND_ARG_INFO(0, interval) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_sub, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, interval) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_sub, 0, 0, 1) + ZEND_ARG_INFO(0, interval) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timezone_get, 0, 0, 1) + ZEND_ARG_INFO(0, object) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_date_method_timezone_get, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timezone_set, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, timezone) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_timezone_set, 0, 0, 1) + ZEND_ARG_INFO(0, timezone) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_offset_get, 0, 0, 1) + ZEND_ARG_INFO(0, object) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_date_method_offset_get, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_diff, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, object2) + ZEND_ARG_INFO(0, absolute) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_diff, 0, 0, 1) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, absolute) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_time_set, 0, 0, 3) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, hour) + ZEND_ARG_INFO(0, minute) + ZEND_ARG_INFO(0, second) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_time_set, 0, 0, 2) + ZEND_ARG_INFO(0, hour) + ZEND_ARG_INFO(0, minute) + ZEND_ARG_INFO(0, second) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_date_set, 0, 0, 4) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, month) + ZEND_ARG_INFO(0, day) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_date_set, 0, 0, 3) + ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, month) + ZEND_ARG_INFO(0, day) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_isodate_set, 0, 0, 3) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, week) + ZEND_ARG_INFO(0, day) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_isodate_set, 0, 0, 2) + ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, week) + ZEND_ARG_INFO(0, day)
[PHP-CVS] cvs: php-src /ext/date php_date.c
felipe Wed Jul 9 12:51:26 2008 UTC Modified files: /php-src/ext/date php_date.c Log: - MFB: Added arginfo http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.192r2=1.193diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.192 php-src/ext/date/php_date.c:1.193 --- php-src/ext/date/php_date.c:1.192 Tue Jul 8 19:29:06 2008 +++ php-src/ext/date/php_date.c Wed Jul 9 12:51:26 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.192 2008/07/08 19:29:06 derick Exp $ */ +/* $Id: php_date.c,v 1.193 2008/07/09 12:51:26 felipe Exp $ */ #include php.h #include php_streams.h @@ -147,6 +147,270 @@ ZEND_ARG_INFO(0, longitude) ZEND_END_ARG_INFO() +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create, 0, 0, 0) + ZEND_ARG_INFO(0, time) + ZEND_ARG_INFO(0, object) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_create_from_format, 0, 0, 2) + ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(0, time) + ZEND_ARG_INFO(0, object) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_parse, 0, 0, 1) + ZEND_ARG_INFO(0, date) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_parse_from_format, 0, 0, 2) + ZEND_ARG_INFO(0, format) + ZEND_ARG_INFO(0, date) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_date_get_last_errors, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_format, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, format) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_format, 0, 0, 1) + ZEND_ARG_INFO(0, format) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_modify, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, modify) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_modify, 0, 0, 1) + ZEND_ARG_INFO(0, modify) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_add, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, interval) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_add, 0, 0, 1) + ZEND_ARG_INFO(0, interval) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_sub, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, interval) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_sub, 0, 0, 1) + ZEND_ARG_INFO(0, interval) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timezone_get, 0, 0, 1) + ZEND_ARG_INFO(0, object) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_date_method_timezone_get, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timezone_set, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, timezone) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_timezone_set, 0, 0, 1) + ZEND_ARG_INFO(0, timezone) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_offset_get, 0, 0, 1) + ZEND_ARG_INFO(0, object) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO(arginfo_date_method_offset_get, 0) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_diff, 0, 0, 2) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, object2) + ZEND_ARG_INFO(0, absolute) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_diff, 0, 0, 1) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, absolute) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_time_set, 0, 0, 3) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, hour) + ZEND_ARG_INFO(0, minute) + ZEND_ARG_INFO(0, second) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_time_set, 0, 0, 2) + ZEND_ARG_INFO(0, hour) + ZEND_ARG_INFO(0, minute) + ZEND_ARG_INFO(0, second) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_date_set, 0, 0, 4) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, month) + ZEND_ARG_INFO(0, day) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_date_set, 0, 0, 3) + ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, month) + ZEND_ARG_INFO(0, day) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_isodate_set, 0, 0, 3) + ZEND_ARG_INFO(0, object) + ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, week) + ZEND_ARG_INFO(0, day) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_method_isodate_set, 0, 0, 2) + ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, week) + ZEND_ARG_INFO(0, day) +ZEND_END_ARG_INFO() + +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_date_timestamp_set, 0, 0, 2) + ZEND_ARG_INFO(0, object) +
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/tests 015.phpt
felipe Wed Jul 9 12:53:59 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date/tests 015.phpt Log: - Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/015.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/date/tests/015.phpt diff -u php-src/ext/date/tests/015.phpt:1.1.2.3 php-src/ext/date/tests/015.phpt:1.1.2.4 --- php-src/ext/date/tests/015.phpt:1.1.2.3 Wed Jul 9 08:37:29 2008 +++ php-src/ext/date/tests/015.phpt Wed Jul 9 12:53:58 2008 @@ -15,8 +15,8 @@ echo Done\n; ? --EXPECTF-- -unicode(3) UTC -unicode(3) UTC -unicode(10) US/Eastern -unicode(3) UTC +string(3) UTC +string(3) UTC +string(10) US/Eastern +string(3) UTC Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests test-parse-from-format.phpt
felipe Wed Jul 9 13:00:00 2008 UTC
Modified files:
/php-src/ext/date/tests test-parse-from-format.phpt
Log:
- Fixed test
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/test-parse-from-format.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/date/tests/test-parse-from-format.phpt
diff -u php-src/ext/date/tests/test-parse-from-format.phpt:1.1
php-src/ext/date/tests/test-parse-from-format.phpt:1.2
--- php-src/ext/date/tests/test-parse-from-format.phpt:1.1 Tue Jul 8
20:23:38 2008
+++ php-src/ext/date/tests/test-parse-from-format.phpt Wed Jul 9 13:00:00 2008
@@ -22,123 +22,123 @@
}
?
--EXPECT--
-string(13) Y-m-d\TH:i:sP
-string(25) 2008-07-08T22:14:12+02:00
+unicode(13) Y-m-d\TH:i:sP
+unicode(25) 2008-07-08T22:14:12+02:00
object(DateTime)#2 (3) {
- [date]=
- string(19) 2008-07-08 22:14:12
- [timezone_type]=
+ [udate]=
+ unicode(19) 2008-07-08 22:14:12
+ [utimezone_type]=
int(1)
- [timezone]=
- string(6) +02:00
+ [utimezone]=
+ unicode(6) +02:00
}
-string(16) l, d-M-y H:i:s T
-string(36) Tuesday, 08-Jul-08 22:14:12 GMT+0200
+unicode(16) l, d-M-y H:i:s T
+unicode(36) Tuesday, 08-Jul-08 22:14:12 GMT+0200
object(DateTime)#1 (3) {
- [date]=
- string(19) 2008-07-08 22:14:12
- [timezone_type]=
+ [udate]=
+ unicode(19) 2008-07-08 22:14:12
+ [utimezone_type]=
int(1)
- [timezone]=
- string(6) +02:00
+ [utimezone]=
+ unicode(6) +02:00
}
-string(13) Y-m-d\TH:i:sO
-string(24) 2008-07-08T22:14:12+0200
+unicode(13) Y-m-d\TH:i:sO
+unicode(24) 2008-07-08T22:14:12+0200
object(DateTime)#3 (3) {
- [date]=
- string(19) 2008-07-08 22:14:12
- [timezone_type]=
+ [udate]=
+ unicode(19) 2008-07-08 22:14:12
+ [utimezone_type]=
int(1)
- [timezone]=
- string(6) +02:00
+ [utimezone]=
+ unicode(6) +02:00
}
-string(16) D, d M y H:i:s O
-string(29) Tue, 08 Jul 08 22:14:12 +0200
+unicode(16) D, d M y H:i:s O
+unicode(29) Tue, 08 Jul 08 22:14:12 +0200
object(DateTime)#2 (3) {
- [date]=
- string(19) 2008-07-08 22:14:12
- [timezone_type]=
+ [udate]=
+ unicode(19) 2008-07-08 22:14:12
+ [utimezone_type]=
int(1)
- [timezone]=
- string(6) +02:00
+ [utimezone]=
+ unicode(6) +02:00
}
-string(16) l, d-M-y H:i:s T
-string(36) Tuesday, 08-Jul-08 22:14:12 GMT+0200
+unicode(16) l, d-M-y H:i:s T
+unicode(36) Tuesday, 08-Jul-08 22:14:12 GMT+0200
object(DateTime)#1 (3) {
- [date]=
- string(19) 2008-07-08 22:14:12
- [timezone_type]=
+ [udate]=
+ unicode(19) 2008-07-08 22:14:12
+ [utimezone_type]=
int(1)
- [timezone]=
- string(6) +02:00
+ [utimezone]=
+ unicode(6) +02:00
}
-string(16) D, d M y H:i:s O
-string(29) Tue, 08 Jul 08 22:14:12 +0200
+unicode(16) D, d M y H:i:s O
+unicode(29) Tue, 08 Jul 08 22:14:12 +0200
object(DateTime)#3 (3) {
- [date]=
- string(19) 2008-07-08 22:14:12
- [timezone_type]=
+ [udate]=
+ unicode(19) 2008-07-08 22:14:12
+ [utimezone_type]=
int(1)
- [timezone]=
- string(6) +02:00
+ [utimezone]=
+ unicode(6) +02:00
}
-string(16) D, d M Y H:i:s O
-string(31) Tue, 08 Jul 2008 22:14:12 +0200
+unicode(16) D, d M Y H:i:s O
+unicode(31) Tue, 08 Jul 2008 22:14:12 +0200
object(DateTime)#2 (3) {
- [date]=
- string(19) 2008-07-08 22:14:12
- [timezone_type]=
+ [udate]=
+ unicode(19) 2008-07-08 22:14:12
+ [utimezone_type]=
int(1)
- [timezone]=
- string(6) +02:00
+ [utimezone]=
+ unicode(6) +02:00
}
-string(16) D, d M Y H:i:s O
-string(31) Tue, 08 Jul 2008 22:14:12 +0200
+unicode(16) D, d M Y H:i:s O
+unicode(31) Tue, 08 Jul 2008 22:14:12 +0200
object(DateTime)#1 (3) {
- [date]=
- string(19) 2008-07-08 22:14:12
- [timezone_type]=
+ [udate]=
+ unicode(19) 2008-07-08 22:14:12
+ [utimezone_type]=
int(1)
- [timezone]=
- string(6) +02:00
+ [utimezone]=
+ unicode(6) +02:00
}
-string(13) Y-m-d\TH:i:sP
-string(25) 2008-07-08T22:14:12+02:00
+unicode(13) Y-m-d\TH:i:sP
+unicode(25) 2008-07-08T22:14:12+02:00
object(DateTime)#3 (3) {
- [date]=
- string(19) 2008-07-08 22:14:12
- [timezone_type]=
+ [udate]=
+ unicode(19) 2008-07-08 22:14:12
+ [utimezone_type]=
int(1)
- [timezone]=
- string(6) +02:00
+ [utimezone]=
+ unicode(6) +02:00
}
-string(16) D, d M Y H:i:s O
-string(31) Tue, 08 Jul 2008 22:14:12 +0200
+unicode(16) D, d M Y H:i:s O
+unicode(31) Tue, 08 Jul 2008 22:14:12 +0200
object(DateTime)#2 (3) {
- [date]=
- string(19) 2008-07-08 22:14:12
- [timezone_type]=
+ [udate]=
+ unicode(19) 2008-07-08 22:14:12
+ [utimezone_type]=
int(1)
- [timezone]=
- string(6) +02:00
+ [utimezone]=
+ unicode(6) +02:00
}
-string(13) Y-m-d\TH:i:sP
-string(25) 2008-07-08T22:14:12+02:00
+unicode(13) Y-m-d\TH:i:sP
+unicode(25) 2008-07-08T22:14:12+02:00
object(DateTime)#1 (3) {
- [date]=
- string(19) 2008-07-08 22:14:12
- [timezone_type]=
+ [udate]=
+ unicode(19) 2008-07-08 22:14:12
+ [utimezone_type]=
int(1)
- [timezone]=
- string(6) +02:00
+ [utimezone]=
+ unicode(6) +02:00
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.c
tony2001Wed Jul 9 14:15:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar.c
Log:
add zero-terminator to the delimiter (and make valgrind happy)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.30r2=1.370.2.31diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.30 php-src/ext/phar/phar.c:1.370.2.31
--- php-src/ext/phar/phar.c:1.370.2.30 Fri Jun 27 01:21:12 2008
+++ php-src/ext/phar/phar.c Wed Jul 9 14:15:41 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.370.2.30 2008/06/27 01:21:12 cellog Exp $ */
+/* $Id: phar.c,v 1.370.2.31 2008/07/09 14:15:41 tony2001 Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -102,7 +102,7 @@
{
char *tmp;
char *key, *lasts, *end;
- char ds[1];
+ char ds[2];
phar_archive_data *phar;
uint i = 0;
@@ -111,6 +111,7 @@
}
ds[0] = DEFAULT_DIR_SEPARATOR;
+ ds[1] = '\0';
tmp = estrdup(PHAR_GLOBALS-cache_list);
/* fake request startup */
@@ -3406,7 +3407,7 @@
php_info_print_table_header(2, Phar: PHP Archive support, enabled);
php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION);
php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.30 $);
+ php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.31 $);
php_info_print_table_row(2, Phar-based phar archives, enabled);
php_info_print_table_row(2, Tar-based phar archives, enabled);
php_info_print_table_row(2, ZIP-based phar archives, enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests/cache_list .cvsignore
tony2001Wed Jul 9 14:18:40 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/phar/tests/cache_list .cvsignore Log: add missing cvsignore http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/.cvsignore?view=markuprev=1.1 Index: php-src/ext/phar/tests/cache_list/.cvsignore +++ php-src/ext/phar/tests/cache_list/.cvsignore -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build projectgen.js
sfoxWed Jul 9 14:57:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildprojectgen.js
Log:
- Clean up ws/cs a bit and add some comments
http://cvs.php.net/viewvc.cgi/php-src/win32/build/projectgen.js?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/win32/build/projectgen.js
diff -u php-src/win32/build/projectgen.js:1.1.2.1
php-src/win32/build/projectgen.js:1.1.2.2
--- php-src/win32/build/projectgen.js:1.1.2.1 Wed Jul 9 08:15:46 2008
+++ php-src/win32/build/projectgen.js Wed Jul 9 14:57:14 2008
@@ -1,3 +1,4 @@
+/* utility function to write .dsp source blocks */
function write_src_file(fname, arr)
{
var src = FSO.CreateTextFile(fname, true);
@@ -10,36 +11,51 @@
src.WriteBlankLines(1);
}
}
+
src.Close();
return;
}
-function copy_dsp_files() {
+/* final stage, all gets cleaned up here */
+function copy_dsp_files()
+{
var tmp = FSO.GetFolder(tmp);
var core = TSRM Zend main streams win32 standard;
var tmpl = file_get_contents(win32\\build\\template.dsw);
f = new Enumerator(tmp.Files);
blocks = ;
+
for (; !f.atEnd(); f.moveNext()) {
+ /* retrieve the final path for the .dsp */
contents = file_get_contents(f.item());
address = contents.slice(0, contents.indexOf(#));
contents = contents.slice(contents.indexOf(#));
dsp = FSO.CreateTextFile(address, true);
dsp.Write(contents);
dsp.Close();
+
+ /* pick up module name, check it isn't already in template.dsw
*/
ext = address.slice(address.lastIndexOf(\\)+1,
address.length-4);
+
+ /* if not, write the workspace block */
if (!core.match(ext)) {
blocks +=
file_get_contents(win32\\build\\block.template.dsw);
blocks = blocks.replace(ADDRESS, address);
blocks = blocks.replace(EXTNAME, ext);
}
+
FSO.DeleteFile(f.item());
}
+
+ /* push all the blocks to the same tag */
tmpl = tmpl.replace(INSERT, blocks);
+
dsw = FSO.CreateTextFile(win32\\php.dsw, true);
dsw.Write(tmpl);
dsw.Close();
+
+ /* goodnight vienna */
FSO.DeleteFolder(tmp);
}
@@ -47,6 +63,9 @@
{
for (i = 0; i DSP_FLAGS.length; i++) {
name = DSP_FLAGS[i][0];
+
+ /* it's apparently not possible to key a javascript
+ array using strings, much less dual-key it */
if (DSP_FLAGS.length == i+1 || name != DSP_FLAGS[i+1][0]) {
ext = name.substr(7).toLowerCase();
src = file_get_contents(tmp\\ + ext + .dsp);
@@ -57,6 +76,9 @@
dsp.Close();
}
}
+
+ /* now we have flags (and potentially other stuff) for
+ all configured modules, so finish off the process */
copy_dsp_files();
return;
}
@@ -67,13 +89,19 @@
var tabs = new RegExp([\t\r\n\'\], gm);
var ws = new RegExp(\\s+, g);
var dir = FSO.GetFolder(ext_dir);
+ var configfile = FSO.BuildPath(ext_dir, config.w32);
var headers = ;
if (!files) {
+ /* module either lacks a config.w32 or is core
+* either way, we know nothing about its sources
+*/
files = ;
f = new Enumerator(dir.Files);
+
for (; !f.atEnd(); f.moveNext()) {
name = FSO.GetFileName(f.item());
+
if (name.substr(name.length-2) == .c) {
files += ./ + name;
}
@@ -82,20 +110,26 @@
files = files.replace(tabs, );
files = ./ + files.replace(/ /g, ./);
}
+
DSP_SOURCES = files.split( );
+ /* pick up headers (all modules) */
f = new Enumerator(dir.Files);
+
for (; !f.atEnd(); f.moveNext()) {
name = FSO.GetFileName(f.item());
+
if (name.substr(name.length-2) == .h) {
headers += ./ + name;
}
}
+
DSP_HEADERS = headers.split( );
- configfile = FSO.BuildPath(ext_dir, config.w32);
+ /* check for bundled library paths and sourcefiles */
if (FSO.FileExists(configfile)) {
config = file_get_contents(configfile);
+
if (config.match(ADD_SOURCES)) {
sources = new
RegExp(ADD_SOURCES\\([^,]*\\s*,\\s*['\]([^'\]+)['\].*\\), gm);
arr = config.match(sources);
@@ -107,16 +141,19 @@
orig_path = orig_path.replace( + , );
path = orig_path.replace(munged_dir + '/', );
-
[PHP-CVS] cvs: CVSROOT / avail
derick Wed Jul 9 15:12:47 2008 UTC Modified files: /CVSROOTavail Log: - Add myself so I can do some tests why the mail doesn't work. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1420r2=1.1421diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1420 CVSROOT/avail:1.1421 --- CVSROOT/avail:1.1420Wed Jul 9 11:43:13 2008 +++ CVSROOT/avail Wed Jul 9 15:12:47 2008 @@ -332,6 +332,6 @@ avail|auroraeosrose,scottmac,pajoye,edin|bindlib_w32 # bugtracker karma -avail|bcarlyon|bugtracker +avail|bcarlyon,derick|bugtracker # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build projectgen.js
sfoxWed Jul 9 15:47:06 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/buildprojectgen.js Log: - It's amazing the havoc one little misplaced bracket can cause... http://cvs.php.net/viewvc.cgi/php-src/win32/build/projectgen.js?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/win32/build/projectgen.js diff -u php-src/win32/build/projectgen.js:1.1.2.2 php-src/win32/build/projectgen.js:1.1.2.3 --- php-src/win32/build/projectgen.js:1.1.2.2 Wed Jul 9 14:57:14 2008 +++ php-src/win32/build/projectgen.js Wed Jul 9 15:47:06 2008 @@ -155,13 +155,14 @@ } DSP_HEADERS = DSP_HEADERS.concat(libheaders.split( )); - } - sources = newarr[1].replace(/\\/g, ); - sources = sources.replace(ws, ); - path = path ? ./ + path + / : ./; - sources = sources.replace(/ /g, path); - DSP_SOURCES = DSP_SOURCES.concat(sources.split( )); + sources = newarr[1].replace(/\\/g, ); + sources = sources.replace(ws, ); + path = path ? ./ + path + / : ./; + sources = sources.replace(/ /g, path); + + DSP_SOURCES = DSP_SOURCES.concat(sources.split( )); + } } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/gd config.w32 /ext/zip config.w32
rrichards Wed Jul 9 16:09:35 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gd config.w32
/php-src/ext/zipconfig.w32
Log:
fix zlib detection and linking
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.10.4.4.2.3r2=1.10.4.4.2.4diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.10.4.4.2.3
php-src/ext/gd/config.w32:1.10.4.4.2.4
--- php-src/ext/gd/config.w32:1.10.4.4.2.3 Tue Jul 8 19:09:11 2008
+++ php-src/ext/gd/config.w32 Wed Jul 9 16:09:35 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.10.4.4.2.3 2008/07/08 19:09:11 pajoye Exp $
+// $Id: config.w32,v 1.10.4.4.2.4 2008/07/09 16:09:35 rrichards Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -13,7 +13,8 @@
(CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
- ((!PHP_ZLIB_SHARED) (CHECK_LIB(zlib_a.lib, gd, PHP_GD)
|| CHECK_LIB(zlib.lib, gd, PHP_GD)))
+ (((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib, gd, PHP_GD) ||
CHECK_LIB(zlib.lib, gd, PHP_GD))) ||
+ (PHP_ZLIB_SHARED CHECK_LIB(zlib.lib, gd,
PHP_GD)) || (PHP_ZLIB == yes (!PHP_ZLIB_SHARED)))
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.w32?r1=1.1.2.1.2.4r2=1.1.2.1.2.5diff_format=u
Index: php-src/ext/zip/config.w32
diff -u php-src/ext/zip/config.w32:1.1.2.1.2.4
php-src/ext/zip/config.w32:1.1.2.1.2.5
--- php-src/ext/zip/config.w32:1.1.2.1.2.4 Fri May 30 19:46:56 2008
+++ php-src/ext/zip/config.w32 Wed Jul 9 16:09:35 2008
@@ -1,13 +1,13 @@
-// $Id: config.w32,v 1.1.2.1.2.4 2008/05/30 19:46:56 pajoye Exp $
+// $Id: config.w32,v 1.1.2.1.2.5 2008/07/09 16:09:35 rrichards Exp $
// vim:ft=javascript
ARG_ENABLE(zip, ZIP support, yes);
if (PHP_ZIP != no) {
- if (CHECK_HEADER_ADD_INCLUDE(zlib.h, CFLAGS_ZIP, ..\\zlib; +
php_usual_include_suspects + ; + PHP_ZIP)) {
- if (PHP_ZLIB_SHARED) {
- CHECK_LIB(zlib.lib, zip, PHP_ZIP);
- }
+ if (CHECK_HEADER_ADD_INCLUDE(zlib.h, CFLAGS_ZIP, ..\\zlib; +
PHP_ZIP)
+ (((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib, zip, PHP_ZIP)
|| CHECK_LIB(zlib.lib, zip, PHP_ZIP))) ||
+ (PHP_ZLIB_SHARED CHECK_LIB(zlib.lib, zip,
PHP_ZIP)) || (PHP_ZLIB == yes (!PHP_ZLIB_SHARED)))
+ ) {
EXTENSION('zip', 'php_zip.c zip_stream.c');
ADD_SOURCES(configure_module_dirname + /lib, zip_add.c
zip_error.c zip_fclose.c \
zip_fread.c zip_open.c zip_source_filep.c \
@@ -28,7 +28,6 @@
zip_unchange_archive.c zip_memdup.c zip_stat_init.c \
zip_add_dir.c zip_file_error_clear.c zip_error_clear.c,
zip);
- AC_DEFINE('HAVE_ZLIB', 1);
AC_DEFINE('HAVE_ZIP', 1);
} else {
WARNING(zip not enabled; libraries and headers not found);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd config.w32 /ext/zip config.w32
rrichards Wed Jul 9 16:13:53 2008 UTC
Modified files:
/php-src/ext/gd config.w32
/php-src/ext/zipconfig.w32
Log:
MFB: fix zlib detection and linking
- synch zip config.w32
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/config.w32?r1=1.28r2=1.29diff_format=u
Index: php-src/ext/gd/config.w32
diff -u php-src/ext/gd/config.w32:1.28 php-src/ext/gd/config.w32:1.29
--- php-src/ext/gd/config.w32:1.28 Tue Jul 8 19:07:53 2008
+++ php-src/ext/gd/config.w32 Wed Jul 9 16:13:53 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.28 2008/07/08 19:07:53 pajoye Exp $
+// $Id: config.w32,v 1.29 2008/07/09 16:13:53 rrichards Exp $
// vim:ft=javascript
ARG_WITH(gd, Bundled GD support, yes,shared);
@@ -13,7 +13,8 @@
(CHECK_LIB(libiconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(libiconv.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv_a.lib, iconv, PHP_ICONV) ||
CHECK_LIB(iconv.lib, iconv, PHP_ICONV))
CHECK_HEADER_ADD_INCLUDE(iconv.h, CFLAGS_ICONV, PHP_ICONV)
- ((!PHP_ZLIB_SHARED) (CHECK_LIB(zlib_a.lib, gd, PHP_GD)
|| CHECK_LIB(zlib.lib, gd, PHP_GD)))
+ (((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib, gd, PHP_GD) ||
CHECK_LIB(zlib.lib, gd, PHP_GD))) ||
+ (PHP_ZLIB_SHARED CHECK_LIB(zlib.lib, gd,
PHP_GD)) || (PHP_ZLIB == yes (!PHP_ZLIB_SHARED)))
) {
if (PHP_T1LIB != no) {
if (CHECK_LIB(T1_StaticMD.lib, gd, PHP_GD)
@@ -24,6 +25,7 @@
WARNING(t1lib not enabled; libraries and
headers not found);
}
}
+
CHECK_LIB(User32.lib, gd, PHP_GD);
CHECK_LIB(Gdi32.lib, gd, PHP_GD);
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/config.w32?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/zip/config.w32
diff -u php-src/ext/zip/config.w32:1.4 php-src/ext/zip/config.w32:1.5
--- php-src/ext/zip/config.w32:1.4 Mon Jan 14 03:15:50 2008
+++ php-src/ext/zip/config.w32 Wed Jul 9 16:13:53 2008
@@ -1,14 +1,13 @@
-// $Id: config.w32,v 1.4 2008/01/14 03:15:50 cellog Exp $
+// $Id: config.w32,v 1.5 2008/07/09 16:13:53 rrichards Exp $
// vim:ft=javascript
-ARG_ENABLE(zip, ZIP support, no);
+ARG_ENABLE(zip, ZIP support, yes);
if (PHP_ZIP != no) {
-
- if (CHECK_HEADER_ADD_INCLUDE(zlib.h, CFLAGS_ZIP, ..\\zlib; +
php_usual_include_suspects + ; + PHP_ZIP)) {
- if (PHP_ZLIB_SHARED) {
- CHECK_LIB(zlib.lib, zip, PHP_ZIP);
- }
+ if (CHECK_HEADER_ADD_INCLUDE(zlib.h, CFLAGS_ZIP, ..\\zlib; +
PHP_ZIP)
+ (((PHP_ZLIB==no) (CHECK_LIB(zlib_a.lib, zip, PHP_ZIP)
|| CHECK_LIB(zlib.lib, zip, PHP_ZIP))) ||
+ (PHP_ZLIB_SHARED CHECK_LIB(zlib.lib, zip,
PHP_ZIP)) || (PHP_ZLIB == yes (!PHP_ZLIB_SHARED)))
+ ) {
EXTENSION('zip', 'php_zip.c zip_stream.c');
ADD_SOURCES(configure_module_dirname + /lib, zip_add.c
zip_error.c zip_fclose.c \
zip_fread.c zip_open.c zip_source_filep.c \
@@ -29,9 +28,7 @@
zip_unchange_archive.c zip_memdup.c zip_stat_init.c \
zip_add_dir.c zip_file_error_clear.c zip_error_clear.c,
zip);
- AC_DEFINE('HAVE_ZLIB', 1);
AC_DEFINE('HAVE_ZIP', 1);
- ADD_FLAG(CFLAGS_ZIP, /D PHP_ZIP_EXPORTS );
} else {
WARNING(zip not enabled; libraries and headers not found);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build DSP.README block.template.dsw buildconf.js config.w32 confutils.js projectgen.js template.dsp template.dsw
Steph Fox wrote: Read the description in the wiki and in the CMake docs. It generates dsp/dsw, sln/vcproj or makefiles for all VC versions (while working as well for unix). Great, cool, shame it'll take a couple of years from inception before we can rely on it day-in day-out. No idea what you are talking about here. You don't surprise me. We agreed that VC6 wasn't about to vanish in a puff of smoke and we shouldn't pull support for the old system completely. This at the same time as we agreed we should be working on getting third-party libs to build across every version in sight. Rob and Stan said they will or can. You must have very optimistic hearing :) Actually we both did agree to start updating them in order to keep them until the CMake stuff is integrated. imho, rather than working on adding new stuff for the win build, time can be better spent testing out/fixing any issues with the 5.3 build and all the new libraries. There is also a pretty long TODO list on the wiki. Feel free to chip in help getting the dsp's up to speed as well :) One thing though, commit your changes to HEAD too! Not directing this solely at you but this is becoming ridiculous. Rob -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build DSP.README block.template.dsw buildconf.js config.w32 confutils.js projectgen.js template.dsp template.dsw
Hi Rob, Actually we both did agree to start updating them in order to keep them until the CMake stuff is integrated. Not while I was logging... or in my email archives... so you must've agreed that in some different channel or mailing list. In fact what you actually said to me was 'don't take the old build system away until we have cmake', and the reason you and Stas both gave for this was that you use the files for debugging (not building - we all know it's not been possible to build with that system for several months now). So we have 60-odd broken files all over CVS to support that; and all I want to do is replace those 60-odd broken files with 4 working files in the win32 directory that will generate 60-odd broken files on request if you really really want them. My only question is, 'how much broken is OK?' - Steph -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build DSP.README block.template.dsw buildconf.js config.w32 confutils.js projectgen.js template.dsp template.dsw
Hey Steph, Steph Fox wrote: Hi Rob, Actually we both did agree to start updating them in order to keep them until the CMake stuff is integrated. Not while I was logging... or in my email archives... so you must've agreed that in some different channel or mailing list. In fact what you actually said to me was 'don't take the old build system away until we have cmake', and the reason you and Stas both gave for this was that you use the files for debugging (not building - we all know it's not been possible to build with that system for several months now). So we have 60-odd broken files all over CVS to support that; and all I want to do is replace those 60-odd broken files with 4 working files in the win32 directory that will generate 60-odd broken files on request if you really really want them. My only question is, 'how much broken is OK?' Personally the change you made would be fine with me as I don't make builds off of them and strictly use them for debugging/profiling. I did test it out and it did produce the project files. Stas had mentioned that he wanted to get them building (so in order to keep them around I would help with getting them up to speed). So the question does really come down to whether or not non-buildable dsp files are acceptable to everyone. CC'ing him so he can chime in on this. Really though, with time getting short, we should be spending more time on the testing/fixing up of the 5.3 build and new libs than cosmetics. Rob -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] Re: [PHP-DEV] Re: [PHP-CVS] cvs: php-src(PHP_5_3) /win32/build DSP.README block.template.dsw buildconf.js config.w32 confutils.js projectgen.js template.dsp template.dsw
Hi Rob, So we have 60-odd broken files all over CVS to support that; and all I want to do is replace those 60-odd broken files with 4 working files in the win32 directory that will generate 60-odd broken files on request if you really really want them. My only question is, 'how much broken is OK?' Personally the change you made would be fine with me as I don't make builds off of them and strictly use them for debugging/profiling. I did test it out and it did produce the project files. Stas had mentioned that he wanted to get them building (so in order to keep them around I would help with getting them up to speed). So the question does really come down to whether or not non-buildable dsp files are acceptable to everyone. I think it would actually be counter-productive to have them buildable, to be honest, but I'm willing to spend another day on it if what's there isn't good enough for the uses those files are put to. I wasn't sure whether project dependencies and include paths would be important in this regard, for example. If they're not, we're good to go with last night's efforts :) CC'ing him so he can chime in on this. Really though, with time getting short, we should be spending more time on the testing/fixing up of the 5.3 build and new libs than cosmetics. There wasn't a lot wrong with the 5.3 build until very recently. I'm getting all sorts of peculiar things now (GD failing to find libiconv, SimpleXML failing to find SPL, etc etc). But you've seen the response if I touch anything in that department. The next thing on my personal TODO, apart from Phar-porting, is cleaning up the compiler warnings across the core. Also we never came to a real conclusion about versioning in core modules, but I guess that goes as 'cosmetic'. - Steph -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests fixedarray_019.phpt
colder Wed Jul 9 20:34:37 2008 UTC
Added files:
/php-src/ext/spl/tests fixedarray_019.phpt
Log:
Test extended iterators methods
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fixedarray_019.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/fixedarray_019.phpt
+++ php-src/ext/spl/tests/fixedarray_019.phpt
--TEST--
SPL: SplFixedArray with overriden iterator methods
--FILE--
?php
class SplFixedArray2 extends SplFixedArray {
public function rewind() {
echo rewind\n;
return parent::rewind();
}
public function valid() {
echo valid\n;
return parent::valid();
}
public function next() {
echo next\n;
return parent::next();
}
public function current() {
echo current\n;
return parent::current();
}
public function key() {
echo key\n;
return parent::key();
}
}
$fa = new SplFixedArray2(3);
foreach($fa as $k=$v) {
echo $k=;
var_dump($v);
}
?
--EXPECT--
rewind
valid
current
key
0=NULL
next
valid
current
key
1=NULL
next
valid
current
key
2=NULL
next
valid
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests fixedarray_019.phpt
colder Wed Jul 9 20:35:04 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests fixedarray_019.phpt
Log:
MFH: Test extended iterators methods
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/fixedarray_019.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/fixedarray_019.phpt
+++ php-src/ext/spl/tests/fixedarray_019.phpt
--TEST--
SPL: SplFixedArray with overriden iterator methods
--FILE--
?php
class SplFixedArray2 extends SplFixedArray {
public function rewind() {
echo rewind\n;
return parent::rewind();
}
public function valid() {
echo valid\n;
return parent::valid();
}
public function next() {
echo next\n;
return parent::next();
}
public function current() {
echo current\n;
return parent::current();
}
public function key() {
echo key\n;
return parent::key();
}
}
$fa = new SplFixedArray2(3);
foreach($fa as $k=$v) {
echo $k=;
var_dump($v);
}
?
--EXPECT--
rewind
valid
current
key
0=NULL
next
valid
current
key
1=NULL
next
valid
current
key
2=NULL
next
valid
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml php_simplexml.h simplexml.c /ext/simplexml/tests 036.phpt
colder Wed Jul 9 21:27:10 2008 UTC
Added files:
/php-src/ext/simplexml/tests036.phpt
Modified files:
/php-src/ext/simplexml php_simplexml.h simplexml.c
Log:
Move SXI::count to SXE::count and make it user-friendly
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml.h?r1=1.29r2=1.30diff_format=u
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.29
php-src/ext/simplexml/php_simplexml.h:1.30
--- php-src/ext/simplexml/php_simplexml.h:1.29 Thu Jan 3 16:18:29 2008
+++ php-src/ext/simplexml/php_simplexml.h Wed Jul 9 21:27:10 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_simplexml.h,v 1.29 2008/01/03 16:18:29 nlopess Exp $ */
+/* $Id: php_simplexml.h,v 1.30 2008/07/09 21:27:10 colder Exp $ */
#ifndef PHP_SIMPLEXML_H
#define PHP_SIMPLEXML_H
@@ -68,6 +68,7 @@
zval *data;
} iter;
zval *tmp;
+ zend_function *fptr_count;
} php_sxe_object;
#ifdef ZTS
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.256r2=1.257diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.256
php-src/ext/simplexml/simplexml.c:1.257
--- php-src/ext/simplexml/simplexml.c:1.256 Fri Jun 27 15:47:21 2008
+++ php-src/ext/simplexml/simplexml.c Wed Jul 9 21:27:10 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.256 2008/06/27 15:47:21 felipe Exp $ */
+/* $Id: simplexml.c,v 1.257 2008/07/09 21:27:10 colder Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1868,14 +1868,12 @@
}
/* }}} */
-static int sxe_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
+static int php_sxe_count_elements_helper(php_sxe_object *sxe, long *count
TSRMLS_DC) /* {{{ */
{
- php_sxe_object *sxe;
xmlNodePtr node;
zval*data;
*count = 0;
- sxe = php_sxe_fetch_object(object TSRMLS_CC);
data = sxe-iter.data;
sxe-iter.data = NULL;
@@ -1897,6 +1895,42 @@
}
/* }}} */
+static int sxe_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
+{
+ php_sxe_object *intern;
+ intern = php_sxe_fetch_object(object TSRMLS_CC);
+ if (intern-fptr_count) {
+ zval *rv;
+ zend_call_method_with_0_params(object, intern-zo.ce,
intern-fptr_count, count, rv);
+ if (rv) {
+ if (intern-tmp) {
+ zval_ptr_dtor(intern-tmp);
+ }
+ MAKE_STD_ZVAL(intern-tmp);
+ ZVAL_ZVAL(intern-tmp, rv, 1, 1);
+ convert_to_long(intern-tmp);
+ *count = (long) Z_LVAL_P(intern-tmp);
+ return SUCCESS;
+ }
+ return FAILURE;
+ }
+ return php_sxe_count_elements_helper(intern, count TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto int SimpleXMLIterator::count()
+ Get number of child elements */
+SXE_METHOD(count)
+{
+ long count = 0;
+ php_sxe_object *sxe = php_sxe_fetch_object(getThis() TSRMLS_CC);
+
+ php_sxe_count_elements_helper(sxe, count TSRMLS_CC);
+
+ RETURN_LONG(count);
+}
+/* }}} */
+
static zval *sxe_get_value(zval *z TSRMLS_DC) /* {{{ */
{
zval *retval;
@@ -2035,15 +2069,34 @@
static php_sxe_object* php_sxe_object_new(zend_class_entry *ce TSRMLS_DC)
{
php_sxe_object *intern;
+ zend_class_entry *parent = ce;
+ int inherited = 0;
intern = ecalloc(1, sizeof(php_sxe_object));
intern-iter.type = SXE_ITER_NONE;
intern-iter.nsprefix = NULL;
intern-iter.name = NULL;
+ intern-fptr_count = NULL;
zend_object_std_init(intern-zo, ce TSRMLS_CC);
+ while (parent) {
+ if (parent == sxe_class_entry) {
+ break;
+ }
+
+ parent = parent-parent;
+ inherited = 1;
+ }
+
+ if (inherited) {
+ zend_hash_find(ce-function_table, count,
sizeof(count),(void **) intern-fptr_count);
+ if (intern-fptr_count-common.scope == parent) {
+ intern-fptr_count = NULL;
+ }
+ }
+
return intern;
}
/* }}} */
@@ -2538,6 +2591,7 @@
SXE_ME(addChild, NULL, ZEND_ACC_PUBLIC)
SXE_ME(addAttribute, NULL, ZEND_ACC_PUBLIC)
SXE_ME(__toString, NULL, ZEND_ACC_PUBLIC)
+ SXE_ME(count, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
/* }}} */
@@ -2586,7 +2640,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
-
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/simplexml php_simplexml.h simplexml.c /ext/simplexml/tests 036.phpt /ext/spl spl_sxe.c
colder Wed Jul 9 21:27:28 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/simplexml/tests036.phpt
Modified files:
/php-src/ext/splspl_sxe.c
/php-src/ext/simplexml php_simplexml.h simplexml.c
Log:
MFH: Move SXI::count to SXE::count and make it user-friendly
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_sxe.c?r1=1.8.2.5.2.2.2.2r2=1.8.2.5.2.2.2.3diff_format=u
Index: php-src/ext/spl/spl_sxe.c
diff -u php-src/ext/spl/spl_sxe.c:1.8.2.5.2.2.2.2
php-src/ext/spl/spl_sxe.c:1.8.2.5.2.2.2.3
--- php-src/ext/spl/spl_sxe.c:1.8.2.5.2.2.2.2 Mon Dec 31 07:17:14 2007
+++ php-src/ext/spl/spl_sxe.c Wed Jul 9 21:27:28 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_sxe.c,v 1.8.2.5.2.2.2.2 2007/12/31 07:17:14 sebastian Exp $ */
+/* $Id: spl_sxe.c,v 1.8.2.5.2.2.2.3 2008/07/09 21:27:28 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -145,17 +145,6 @@
RETURN_ZVAL(sxe-iter.data, 1, 0);
}
-/* {{{ proto int SimpleXMLIterator::count()
- Get number of child elements */
-SPL_METHOD(SimpleXMLIterator, count)
-{
- long count = 0;
-
- Z_OBJ_HANDLER_P(getThis(), count_elements)(getThis(), count TSRMLS_CC);
-
- RETURN_LONG(count);
-}
-
static const zend_function_entry spl_funcs_SimpleXMLIterator[] = {
SPL_ME(SimpleXMLIterator, rewind, NULL, ZEND_ACC_PUBLIC)
SPL_ME(SimpleXMLIterator, valid, NULL, ZEND_ACC_PUBLIC)
@@ -164,7 +153,6 @@
SPL_ME(SimpleXMLIterator, next, NULL, ZEND_ACC_PUBLIC)
SPL_ME(SimpleXMLIterator, hasChildren,NULL, ZEND_ACC_PUBLIC)
SPL_ME(SimpleXMLIterator, getChildren,NULL, ZEND_ACC_PUBLIC)
- SPL_ME(SimpleXMLIterator, count, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/php_simplexml.h?r1=1.20.2.2.2.3.2.2r2=1.20.2.2.2.3.2.3diff_format=u
Index: php-src/ext/simplexml/php_simplexml.h
diff -u php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.2
php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.3
--- php-src/ext/simplexml/php_simplexml.h:1.20.2.2.2.3.2.2 Thu Jan 3
16:20:33 2008
+++ php-src/ext/simplexml/php_simplexml.h Wed Jul 9 21:27:28 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.2 2008/01/03 16:20:33 nlopess Exp $ */
+/* $Id: php_simplexml.h,v 1.20.2.2.2.3.2.3 2008/07/09 21:27:28 colder Exp $ */
#ifndef PHP_SIMPLEXML_H
#define PHP_SIMPLEXML_H
@@ -68,6 +68,7 @@
zval *data;
} iter;
zval *tmp;
+ zend_function *fptr_count;
} php_sxe_object;
#ifdef ZTS
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.15r2=1.151.2.22.2.35.2.16diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.15
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.16
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.15 Fri Jun 27
15:46:44 2008
+++ php-src/ext/simplexml/simplexml.c Wed Jul 9 21:27:28 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.15 2008/06/27 15:46:44 felipe Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.16 2008/07/09 21:27:28 colder Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1811,14 +1811,12 @@
}
/* }}} */
-static int sxe_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
+static int php_sxe_count_elements_helper(php_sxe_object *sxe, long *count
TSRMLS_DC) /* {{{ */
{
- php_sxe_object *sxe;
xmlNodePtr node;
zval*data;
*count = 0;
- sxe = php_sxe_fetch_object(object TSRMLS_CC);
data = sxe-iter.data;
sxe-iter.data = NULL;
@@ -1840,6 +1838,42 @@
}
/* }}} */
+static int sxe_count_elements(zval *object, long *count TSRMLS_DC) /* {{{ */
+{
+ php_sxe_object *intern;
+ intern = php_sxe_fetch_object(object TSRMLS_CC);
+ if (intern-fptr_count) {
+ zval *rv;
+ zend_call_method_with_0_params(object, intern-zo.ce,
intern-fptr_count, count, rv);
+ if (rv) {
+ if (intern-tmp) {
+ zval_ptr_dtor(intern-tmp);
+ }
+ MAKE_STD_ZVAL(intern-tmp);
+ ZVAL_ZVAL(intern-tmp, rv, 1, 1);
+ convert_to_long(intern-tmp);
+ *count = (long) Z_LVAL_P(intern-tmp);
+ return SUCCESS;
+ }
+ return FAILURE;
+ }
+ return php_sxe_count_elements_helper(intern, count TSRMLS_CC);
+}
+/*
[PHP-CVS] cvs: php-src /ext/standard array.c
colder Wed Jul 9 21:29:39 2008 UTC
Modified files:
/php-src/ext/standard array.c
Log:
Fix resolution rule of count vs. handler
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.454r2=1.455diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.454 php-src/ext/standard/array.c:1.455
--- php-src/ext/standard/array.c:1.454 Mon Jun 2 11:20:17 2008
+++ php-src/ext/standard/array.cWed Jul 9 21:29:39 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.454 2008/06/02 11:20:17 mattwil Exp $ */
+/* $Id: array.c,v 1.455 2008/07/09 21:29:39 colder Exp $ */
#include php.h
#include php_ini.h
@@ -325,9 +325,17 @@
break;
case IS_OBJECT: {
#ifdef HAVE_SPL
- /* it the object implements Countable we call its
count() method */
zval *retval;
-
+#endif
+ /* first, we check if an handler is defined */
+ if (Z_OBJ_HT_P(array)-count_elements) {
+ RETVAL_LONG(1);
+ if (SUCCESS ==
Z_OBJ_HT(*array)-count_elements(array, Z_LVAL_P(return_value) TSRMLS_CC)) {
+ return;
+ }
+ }
+#ifdef HAVE_SPL
+ /* if not and the object implements Countable we call
its count() method */
if (Z_OBJ_HT_P(array)-get_class_entry
instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
zend_call_method_with_0_params(array, NULL,
NULL, count, retval);
if (retval) {
@@ -338,13 +346,6 @@
return;
}
#endif
- /* if not we return the number of properties (not
taking visibility into account) */
- if (Z_OBJ_HT_P(array)-count_elements) {
- RETVAL_LONG(1);
- if (SUCCESS ==
Z_OBJ_HT(*array)-count_elements(array, Z_LVAL_P(return_value) TSRMLS_CC)) {
- return;
- }
- }
}
default:
RETURN_LONG(1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard array.c
colder Wed Jul 9 21:29:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c
Log:
MFH: Fix resolution rule of count vs. handler
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.34r2=1.308.2.21.2.37.2.35diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.34
php-src/ext/standard/array.c:1.308.2.21.2.37.2.35
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.34 Mon Jun 2 11:20:59 2008
+++ php-src/ext/standard/array.cWed Jul 9 21:29:52 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.34 2008/06/02 11:20:59 mattwil Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.35 2008/07/09 21:29:52 colder Exp $ */
#include php.h
#include php_ini.h
@@ -319,9 +319,17 @@
break;
case IS_OBJECT: {
#ifdef HAVE_SPL
- /* it the object implements Countable we call its
count() method */
zval *retval;
-
+#endif
+ /* first, we check if the handler is defined */
+ if (Z_OBJ_HT_P(array)-count_elements) {
+ RETVAL_LONG(1);
+ if (SUCCESS ==
Z_OBJ_HT(*array)-count_elements(array, Z_LVAL_P(return_value) TSRMLS_CC)) {
+ return;
+ }
+ }
+#ifdef HAVE_SPL
+ /* if not and the object implements Countable we call
its count() method */
if (Z_OBJ_HT_P(array)-get_class_entry
instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
zend_call_method_with_0_params(array, NULL,
NULL, count, retval);
if (retval) {
@@ -332,13 +340,6 @@
return;
}
#endif
- /* if not we return the number of properties (not
taking visibility into account) */
- if (Z_OBJ_HT_P(array)-count_elements) {
- RETVAL_LONG(1);
- if (SUCCESS ==
Z_OBJ_HT(*array)-count_elements(array, Z_LVAL_P(return_value) TSRMLS_CC)) {
- return;
- }
- }
}
default:
RETURN_LONG(1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
