[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Jun 17 01:37:16 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.713r2=1.714ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.713 ZendEngine2/ChangeLog:1.714 --- ZendEngine2/ChangeLog:1.713 Thu Jun 16 01:38:57 2005 +++ ZendEngine2/ChangeLog Fri Jun 17 01:37:15 2005 @@ -1,3 +1,81 @@ +2005-06-16 Marcus Boerger [EMAIL PROTECTED] + +* zend_reflection_api.c: + - Internal functions/methods can now return by reference + +* zend_execute.c: + - Fix TSRM build + +2005-06-16 Dmitry Stogov [EMAIL PROTECTED] + +* bench.php: + typo + +* zend.h + zend_API.h + zend_compile.c + zend_compile.h + zend_execute.c + zend_execute_API.c + zend_extensions.h + zend_modules.h + zend_object_handlers.c + zend_vm_def.h + zend_vm_execute.h + zend_vm_opcodes.h: + Allowed return by refrence from internal functions + +2005-06-16 Stanislav Malyshev [EMAIL PROTECTED] + +* zend_execute.c + zend_execute.h: + rename to zend_ + +2005-06-16 Dmitry Stogov [EMAIL PROTECTED] + +* zend_vm_def.h + zend_vm_execute.h + zend_vm_opcodes.h + tests/bug33318.phpt: + Fixed bug #33318 (throw 1; results in Invalid opcode 108/1/8) + +2005-06-16 Zeev Suraski [EMAIL PROTECTED] + +* zend_language_scanner.l: + Fixlet + +2005-06-16 Dmitry Stogov [EMAIL PROTECTED] + +* zend_execute.c + zend_vm_def.h + zend_vm_execute.h + zend_vm_opcodes.h: + Compilation warnings + +* zend_compile.c + zend_compile.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_opcodes.h: + ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ. + +2005-06-16 Stanislav Malyshev [EMAIL PROTECTED] + +* zend_execute.c + zend_execute.h: + export zval getters + +2005-06-16 Dmitry Stogov [EMAIL PROTECTED] + +* zend_execute.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_gen.php + zend_vm_opcodes.h: + USER_OPCODE API is improvet. + Implemented ability to dispatch from user handler to internal handler of + another opcode. + 2005-06-15 Dmitry Stogov [EMAIL PROTECTED] * zend.c @@ -8616,7 +8694,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.713 2005/06/16 05:38:57 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.714 2005/06/17 05:37:15 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -10340,7 +10418,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.713 2005/06/16 05:38:57 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.714 2005/06/17 05:37:15 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src / EXTENSIONS /ext/standard credits_ext.h
derick Thu Jun 16 06:44:41 2005 EDT Modified files: /php-srcEXTENSIONS /php-src/ext/standard credits_ext.h Log: - Update maintainers and credits. http://cvs.php.net/diff.php/php-src/EXTENSIONS?r1=1.71r2=1.72ty=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.71 php-src/EXTENSIONS:1.72 --- php-src/EXTENSIONS:1.71 Thu Feb 3 10:46:15 2005 +++ php-src/EXTENSIONS Thu Jun 16 06:44:40 2005 @@ -68,6 +68,11 @@ MAINTENANCE: Unknown STATUS: Unknown --- +EXTENSION: date +PRIMARY MAINTAINER: Derick Rethans [EMAIL PROTECTED] +MAINTENANCE: Maintained +STATUS: Working +--- EXTENSION: embed PRIMARY MAINTAINER: Edin Kadribasic [EMAIL PROTECTED] MAINTENANCE: Maintained http://cvs.php.net/diff.php/php-src/ext/standard/credits_ext.h?r1=1.28r2=1.29ty=u Index: php-src/ext/standard/credits_ext.h diff -u php-src/ext/standard/credits_ext.h:1.28 php-src/ext/standard/credits_ext.h:1.29 --- php-src/ext/standard/credits_ext.h:1.28 Mon Apr 4 14:50:54 2005 +++ php-src/ext/standard/credits_ext.h Thu Jun 16 06:44:41 2005 @@ -17,9 +17,10 @@ CREDIT_LINE(COM and .Net, Wez Furlong); CREDIT_LINE(ctype, Hartmut Holzgraefe); CREDIT_LINE(cURL, Sterling Hughes); -CREDIT_LINE(DB-LIB (MS SQL, Sybase), Wez Furlong, Frank M. Kromann); +CREDIT_LINE(Date/Time Support, Derick Rethans); CREDIT_LINE(DBA, Sascha Schumann, Marcus Boerger); CREDIT_LINE(dBase, Jim Winstead); +CREDIT_LINE(DB-LIB (MS SQL, Sybase), Wez Furlong, Frank M. Kromann); CREDIT_LINE(dbx (database abstraction), Marc Boeren, Rui Hirokawa, Frank M. Kromann); CREDIT_LINE(DOM, Christian Stocker, Rob Richards, Marcus Boerger); CREDIT_LINE(EXIF, Rasmus Lerdorf, Marcus Boerger); @@ -35,7 +36,6 @@ CREDIT_LINE(Iconv, Rui Hirokawa, Stig Bakken, Moriyoshi Koizumi ); CREDIT_LINE(IMAP, Rex Logan, Mark Musone, Brian Wang, Kaj-Michael Lang, Antoni Pamies Olive, Rasmus Lerdorf, Andrew Skalski, Chuck Hagenbuch, Daniel R Kalowsky); CREDIT_LINE(Informix, Danny Heijl, Christian Cartus, Corne' Cornelius); -CREDIT_LINE(Ingres II, David Hnot); CREDIT_LINE(InterBase, Jouni Ahto, Andrew Avdeev, Ard Biesheuvel); CREDIT_LINE(IRCG, Sascha Schumann); CREDIT_LINE(LDAP, Amitay Isaacs, Eric Warnke, Rasmus Lerdorf, Gerrit Thomson, Stig Venaas); @@ -46,13 +46,13 @@ CREDIT_LINE(mime_magic, Hartmut Holzgraefe); CREDIT_LINE(MING, Dave Hayden, Frank M. Kromann); CREDIT_LINE(mono, Sterling Hughes); -CREDIT_LINE(MS SQL, Frank M. Kromann); CREDIT_LINE(msession, Mark L. Woodward); CREDIT_LINE(mSQL, Zeev Suraski); +CREDIT_LINE(MS SQL, Frank M. Kromann); CREDIT_LINE(Multibyte String Functions, Tsukada Takuya, Rui Hirokawa); CREDIT_LINE(mySQL 3.x driver for PDO, George Schlossnagle); -CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter); CREDIT_LINE(MySQLi, Zak Greant, Georg Richter); +CREDIT_LINE(MySQL, Zeev Suraski, Zak Greant, Georg Richter); CREDIT_LINE(ncurses, Ilia Alshanetsky, Wez Furlong, Hartmut Holzgraefe, Georg Richter); CREDIT_LINE(OCI8, Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson, Maxim Maletsky, Harald Radi, Antony Dovgal); CREDIT_LINE(ODBC driver for PDO, Wez Furlong); @@ -88,8 +88,8 @@ CREDIT_LINE(tokenizer, Andrei Zmievski); CREDIT_LINE(Verisign Payflow Pro, John Donagher, David Croft); CREDIT_LINE(WDDX, Andrei Zmievski); -CREDIT_LINE(XML, Stig Bakken, Thies C. Arntzen, Sterling Hughes); CREDIT_LINE(XMLReader, Rob Richards); CREDIT_LINE(xmlrpc, Dan Libby); +CREDIT_LINE(XML, Stig Bakken, Thies C. Arntzen, Sterling Hughes); CREDIT_LINE(XSL, Christian Stocker, Rob Richards); CREDIT_LINE(Zlib, Rasmus Lerdorf, Stefan Roehrich, Zeev Suraski, Jade Nicoletti); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard array.c basic_functions.c basic_functions.h
Close the bug? Add a NEWS entry ? :) --Jani On Wed, 15 Jun 2005, Andrei Zmievski wrote: andrei Wed Jun 15 16:51:37 2005 EDT Modified files: /php-src/ext/standardbasic_functions.c basic_functions.h array.c Log: Fix FCI cache for array_walk and user array compare functions. Bug #33286. (Patch from [EMAIL PROTECTED]) -- Donate @ http://pecl.php.net/wishlist.php/sniper -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib parse_date.c /ext/date/lib/resource parse_date.re
derick Thu Jun 16 09:30:27 2005 EDT
Modified files:
/php-src/ext/date/lib parse_date.c
/php-src/ext/date/lib/resource parse_date.re
Log:
- Fixed a regression with last saturday
http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.7
php-src/ext/date/lib/parse_date.c:1.8
--- php-src/ext/date/lib/parse_date.c:1.7 Wed Jun 15 07:01:04 2005
+++ php-src/ext/date/lib/parse_date.c Thu Jun 16 09:30:25 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.8.dev on Wed Jun 15 12:56:03 2005 */
+/* Generated by re2c 0.9.8.dev on Thu Jun 16 15:24:58 2005 */
#line 1 parse_date.re
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: parse_date.c,v 1.7 2005/06/15 11:01:04 derick Exp $ */
+/* $Id: parse_date.c,v 1.8 2005/06/16 13:30:25 derick Exp $ */
#include stdlib.h
#include stdio.h
@@ -528,11 +528,11 @@
return 0;
}
-static long timelib_lookup_relative_text(char **ptr)
+static timelib_sll timelib_lookup_relative_text(char **ptr)
{
char *word;
char *begin = *ptr, *end;
- long value = 0;
+ timelib_sll value = 0;
const timelib_lookup_table *tp;
while ((**ptr = 'A' **ptr = 'Z') || (**ptr = 'a' **ptr =
'z')) {
@@ -552,7 +552,7 @@
return value;
}
-static long timelib_get_relative_text(char **ptr)
+static timelib_sll timelib_get_relative_text(char **ptr)
{
while (**ptr == ' ' || **ptr == '-' || **ptr == '/') {
++*ptr;
@@ -623,7 +623,7 @@
return value;
}
-static void timelib_set_relative(char **ptr, timelib_ull amount, Scanner *s)
+static void timelib_set_relative(char **ptr, timelib_sll amount, Scanner *s)
{
const timelib_relunit* relunit;
@@ -3128,7 +3128,7 @@
#line 1226 parse_date.re
{
- long i;
+ timelib_sll i;
TIMELIB_INIT;
TIMELIB_HAVE_RELATIVE();
http://cvs.php.net/diff.php/php-src/ext/date/lib/resource/parse_date.re?r1=1.6r2=1.7ty=u
Index: php-src/ext/date/lib/resource/parse_date.re
diff -u php-src/ext/date/lib/resource/parse_date.re:1.6
php-src/ext/date/lib/resource/parse_date.re:1.7
--- php-src/ext/date/lib/resource/parse_date.re:1.6 Wed Jun 15 07:01:07 2005
+++ php-src/ext/date/lib/resource/parse_date.re Thu Jun 16 09:30:26 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: parse_date.re,v 1.6 2005/06/15 11:01:07 derick Exp $ */
+/* $Id: parse_date.re,v 1.7 2005/06/16 13:30:26 derick Exp $ */
#include stdlib.h
#include stdio.h
@@ -526,11 +526,11 @@
return 0;
}
-static long timelib_lookup_relative_text(char **ptr)
+static timelib_sll timelib_lookup_relative_text(char **ptr)
{
char *word;
char *begin = *ptr, *end;
- long value = 0;
+ timelib_sll value = 0;
const timelib_lookup_table *tp;
while ((**ptr = 'A' **ptr = 'Z') || (**ptr = 'a' **ptr =
'z')) {
@@ -550,7 +550,7 @@
return value;
}
-static long timelib_get_relative_text(char **ptr)
+static timelib_sll timelib_get_relative_text(char **ptr)
{
while (**ptr == ' ' || **ptr == '-' || **ptr == '/') {
++*ptr;
@@ -621,7 +621,7 @@
return value;
}
-static void timelib_set_relative(char **ptr, timelib_ull amount, Scanner *s)
+static void timelib_set_relative(char **ptr, timelib_sll amount, Scanner *s)
{
const timelib_relunit* relunit;
@@ -1224,7 +1224,7 @@
relativetext
{
- long i;
+ timelib_sll i;
TIMELIB_INIT;
TIMELIB_HAVE_RELATIVE();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
dmitry Thu Jun 16 10:56:15 2005 EDT Modified files: /php-src/ext/splspl_iterators.c Log: Allowed return by refrence from internal functions http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.69r2=1.70ty=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.69 php-src/ext/spl/spl_iterators.c:1.70 --- php-src/ext/spl/spl_iterators.c:1.69Sat May 14 12:40:56 2005 +++ php-src/ext/spl/spl_iterators.c Thu Jun 16 10:56:13 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_iterators.c,v 1.69 2005/05/14 16:40:56 helly Exp $ */ +/* $Id: spl_iterators.c,v 1.70 2005/06/16 14:56:13 dmitry Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -1499,7 +1499,7 @@ } /* }}} */ static -ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_rec_it___construct, 0, ZEND_RETURN_REFERENCE_AGNOSTIC, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_rec_it___construct, 0, ZEND_RETURN_VALUE, 2) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO(); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dl.c
wez Thu Jun 16 11:36:40 2005 EDT
Modified files:
/php-src/ext/standard dl.c
Log:
Don't emit the E_STRICT dl-is-deprecated notice on SAPI's where dl() is
widely (and safely) used.
This allows our test-suite to run in E_STRICT mode.
http://cvs.php.net/diff.php/php-src/ext/standard/dl.c?r1=1.99r2=1.100ty=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.99 php-src/ext/standard/dl.c:1.100
--- php-src/ext/standard/dl.c:1.99 Wed May 4 09:26:28 2005
+++ php-src/ext/standard/dl.c Thu Jun 16 11:36:39 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dl.c,v 1.99 2005/05/04 13:26:28 hyanantha Exp $ */
+/* $Id: dl.c,v 1.100 2005/06/16 15:36:39 wez Exp $ */
#include php.h
#include dl.h
@@ -63,24 +63,27 @@
convert_to_string_ex(file);
-#ifdef ZTS
+ if (!PG(enable_dl)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Dynamically loaded
extensions aren't enabled);
+ RETURN_FALSE;
+ } else if (PG(safe_mode)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Dynamically loaded
extensions aren't allowed when running in Safe Mode);
+ RETURN_FALSE;
+ }
+
if ((strncmp(sapi_module.name, cgi, 3)!=0)
(strcmp(sapi_module.name, cli)!=0)
(strncmp(sapi_module.name, embed, 5)!=0)) {
+#ifdef ZTS
php_error_docref(NULL TSRMLS_CC, E_WARNING, Not supported in
multithreaded Web servers - use extension=%s in your php.ini,
Z_STRVAL_PP(file));
RETURN_FALSE;
- }
+#else
+ php_error_docref(NULL TSRMLS_CC, E_STRICT, dl() is deprecated
- use extension=%s in your php.ini, Z_STRVAL_PP(file));
#endif
-
- if (!PG(enable_dl)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Dynamically loaded
extensions aren't enabled);
- } else if (PG(safe_mode)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Dynamically loaded
extensions aren't allowed when running in Safe Mode);
- } else {
- zend_error(E_STRICT, dl() is deprecated - use extension=%s in
your php.ini, Z_STRVAL_PP(file));
- php_dl(*file, MODULE_TEMPORARY, return_value TSRMLS_CC);
- EG(full_tables_cleanup) = 1;
}
+
+ php_dl(*file, MODULE_TEMPORARY, return_value TSRMLS_CC);
+ EG(full_tables_cleanup) = 1;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard dl.c
On Thu, 16 Jun 2005, Wez Furlong wrote: wez Thu Jun 16 11:36:40 2005 EDT Modified files: /php-src/ext/standard dl.c Log: Don't emit the E_STRICT dl-is-deprecated notice on SAPI's where dl() is widely (and safely) used. This allows our test-suite to run in E_STRICT mode. None of our tests should use dl(), can you please point out which ones do this? Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard dl.c
The PDO tests; Cc'd to the PDO test gurus. --Wez. Derick Rethans wrote: On Thu, 16 Jun 2005, Wez Furlong wrote: wez Thu Jun 16 11:36:40 2005 EDT Modified files: /php-src/ext/standard dl.c Log: Don't emit the E_STRICT dl-is-deprecated notice on SAPI's where dl() is widely (and safely) used. This allows our test-suite to run in E_STRICT mode. None of our tests should use dl(), can you please point out which ones do this? Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
sniper Thu Jun 16 13:12:27 2005 EDT
Modified files:
/php-srcrun-tests.php
Log:
silence notices
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.213r2=1.214ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.213 php-src/run-tests.php:1.214
--- php-src/run-tests.php:1.213 Wed Jun 15 05:21:15 2005
+++ php-src/run-tests.php Thu Jun 16 13:12:26 2005
@@ -227,7 +227,7 @@
$test_files = array();
$test_results = array();
-$PHP_FAILED_TESTS = array();
+$PHP_FAILED_TESTS = array('BORKED' = array(), 'FAILED' = array());
// If parameters given assume they represent selected tests to run.
$failed_tests_file= false;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date config.m4 config.w32 php_date.c /ext/date/lib datetime.c datetime.h parse_date.c parse_tz.c timelib.c timelib.h tm2unixtime.c unixtime2tm.c /ext/date/lib/resource pa
derick Thu Jun 16 13:12:42 2005 EDT
Added files:
/php-src/ext/date/lib timelib.c timelib.h
Removed files:
/php-src/ext/date/lib datetime.c datetime.h
Modified files:
/php-src/ext/date config.m4 config.w32 php_date.c
/php-src/ext/date/lib parse_date.c parse_tz.c tm2unixtime.c
unixtime2tm.c
/php-src/ext/date/lib/resource parse_date.re
Log:
- Rename datetime.c and datetime.h to timelib.c and timelib.h to
prevent duplicate header names.
http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.2r2=1.3ty=u
Index: php-src/ext/date/config.m4
diff -u php-src/ext/date/config.m4:1.2 php-src/ext/date/config.m4:1.3
--- php-src/ext/date/config.m4:1.2 Tue Jun 14 18:50:55 2005
+++ php-src/ext/date/config.m4 Thu Jun 16 13:12:40 2005
@@ -1,5 +1,5 @@
-dnl $Id: config.m4,v 1.2 2005/06/14 22:50:55 sniper Exp $
+dnl $Id: config.m4,v 1.3 2005/06/16 17:12:40 derick Exp $
dnl config.m4 for date extension
-PHP_NEW_EXTENSION(date, php_date.c lib/datetime.c lib/dow.c lib/parse_date.c
lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c)
+PHP_NEW_EXTENSION(date, php_date.c lib/timelib.c lib/dow.c lib/parse_date.c
lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c)
PHP_ADD_BUILD_DIR([$ext_builddir/lib])
http://cvs.php.net/diff.php/php-src/ext/date/config.w32?r1=1.2r2=1.3ty=u
Index: php-src/ext/date/config.w32
diff -u php-src/ext/date/config.w32:1.2 php-src/ext/date/config.w32:1.3
--- php-src/ext/date/config.w32:1.2 Wed Jun 15 04:44:23 2005
+++ php-src/ext/date/config.w32 Thu Jun 16 13:12:40 2005
@@ -1,6 +1,6 @@
-// $Id: config.w32,v 1.2 2005/06/15 08:44:23 edink Exp $
+// $Id: config.w32,v 1.3 2005/06/16 17:12:40 derick Exp $
// vim:ft=javascript
EXTENSION(date, php_date.c, false, -Iext/date/lib);
-ADD_SOURCES(ext/date/lib, datetime.c dow.c parse_date.c parse_tz.c
tm2unixtime.c unixtime2tm.c, date);
+ADD_SOURCES(ext/date/lib, timelib.c dow.c parse_date.c parse_tz.c
tm2unixtime.c unixtime2tm.c, date);
AC_DEFINE('HAVE_DATE', 1, 'Have date/time support');
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.7 php-src/ext/date/php_date.c:1.8
--- php-src/ext/date/php_date.c:1.7 Wed Jun 15 19:30:20 2005
+++ php-src/ext/date/php_date.c Thu Jun 16 13:12:41 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.7 2005/06/15 23:30:20 iliaa Exp $ */
+/* $Id: php_date.c,v 1.8 2005/06/16 17:12:41 derick Exp $ */
#include php.h
#include php_streams.h
@@ -26,7 +26,7 @@
#include ext/standard/info.h
#include php_date.h
#include lib/timelib_structs.h
-#include lib/datetime.h
+#include lib/timelib.h
#include time.h
function_entry date_functions[] = {
http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.8r2=1.9ty=u
Index: php-src/ext/date/lib/parse_date.c
diff -u php-src/ext/date/lib/parse_date.c:1.8
php-src/ext/date/lib/parse_date.c:1.9
--- php-src/ext/date/lib/parse_date.c:1.8 Thu Jun 16 09:30:25 2005
+++ php-src/ext/date/lib/parse_date.c Thu Jun 16 13:12:41 2005
@@ -18,12 +18,12 @@
+--+
*/
-/* $Id: parse_date.c,v 1.8 2005/06/16 13:30:25 derick Exp $ */
+/* $Id: parse_date.c,v 1.9 2005/06/16 17:12:41 derick Exp $ */
#include stdlib.h
#include stdio.h
#include string.h
-#include datetime.h
+#include timelib.h
#if defined(_MSC_VER)
#define strcasecmp stricmp
http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_tz.c?r1=1.4r2=1.5ty=u
Index: php-src/ext/date/lib/parse_tz.c
diff -u php-src/ext/date/lib/parse_tz.c:1.4 php-src/ext/date/lib/parse_tz.c:1.5
--- php-src/ext/date/lib/parse_tz.c:1.4 Wed Jun 15 07:01:04 2005
+++ php-src/ext/date/lib/parse_tz.c Thu Jun 16 13:12:41 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: parse_tz.c,v 1.4 2005/06/15 11:01:04 derick Exp $ */
+/* $Id: parse_tz.c,v 1.5 2005/06/16 17:12:41 derick Exp $ */
#include stdio.h
#ifdef WIN32
@@ -26,7 +26,7 @@
#endif
#include string.h
-#include datetime.h
+#include timelib.h
#include timezonedb.h
static void read_header(char **tzf, timelib_tzinfo *tz)
http://cvs.php.net/diff.php/php-src/ext/date/lib/tm2unixtime.c?r1=1.4r2=1.5ty=u
Index: php-src/ext/date/lib/tm2unixtime.c
diff -u php-src/ext/date/lib/tm2unixtime.c:1.4
php-src/ext/date/lib/tm2unixtime.c:1.5
--- php-src/ext/date/lib/tm2unixtime.c:1.4 Wed Jun 15 19:42:55 2005
+++ php-src/ext/date/lib/tm2unixtime.c Thu Jun 16 13:12:41 2005
@@ -16,9 +16,9 @@
+--+
*/
-/* $Id: tm2unixtime.c,v 1.4 2005/06/15 23:42:55 iliaa Exp $ */
+/* $Id: tm2unixtime.c,v 1.5 2005/06/16 17:12:41 derick Exp $ */
-#include
[PHP-CVS] cvs: php-src /ext/date/tests 002-win32.phpt 002.phpt bug13142.phpt bug17988.phpt bug20382.phpt bug26198.phpt bug26317.phpt bug26320.phpt bug27780.phpt bug28599.phpt /ext/standard/tests/time
derick Thu Jun 16 13:35:08 2005 EDT
Added files:
/php-src/ext/date/tests 002-win32.phpt 002.phpt bug13142.phpt
bug17988.phpt bug20382.phpt bug26198.phpt
bug26317.phpt bug26320.phpt bug27780.phpt
bug28599.phpt
Removed files:
/php-src/ext/standard/tests/time002-win32.phpt 002.phpt
bug13142.phpt bug17988.phpt
bug20382.phpt bug26198.phpt
bug26317.phpt bug26320.phpt
bug27780.phpt bug28599.phpt
Log:
- Move strtotime() related testcases to ext/date/tests.
http://cvs.php.net/co.php/php-src/ext/date/tests/002-win32.phpt?r=1.1p=1
Index: php-src/ext/date/tests/002-win32.phpt
+++ php-src/ext/date/tests/002-win32.phpt
--TEST--
strtotime() function
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) != 'WIN') {
print 'skip test for win32 only';
}
if ([EMAIL PROTECTED](TZ=GST-1GDT) || getenv(TZ) != 'GST-1GDT') {
die(skip unable to change TZ enviroment variable\n);
}
?
--FILE--
?php
$dates = array (
1999-10-13,
Oct 13 1999,
2000-01-19,
Jan 19 2000,
2001-12-21,
Dec 21 2001,
2001-12-21 12:16,
Dec 21 2001 12:16,
2001-10-22 21:19:58,
2001-10-22 21:19:58-02,
2001-10-22 21:19:58-0213,
2001-10-22 21:19:58+02,
2001-10-22 21:19:58+0213
);
putenv (TZ=GMT);
foreach ($dates as $date) {
echo date(Y-m-d H:i:s\n, strtotime ($date));
}
putenv (TZ=GST-1GDT);
foreach ($dates as $date) {
echo date(Y-m-d H:i:s\n, strtotime ($date));
}
?
--EXPECT--
1999-10-13 00:00:00
1999-10-13 00:00:00
2000-01-19 00:00:00
2000-01-19 00:00:00
2001-12-21 00:00:00
2001-12-21 00:00:00
2001-12-21 12:16:00
2001-12-21 12:16:00
2001-10-22 21:19:58
2001-10-22 23:19:58
2001-10-22 23:32:58
2001-10-22 19:19:58
2001-10-22 19:06:58
1999-10-13 00:00:00
1999-10-13 00:00:00
2000-01-19 00:00:00
2000-01-19 00:00:00
2001-12-21 00:00:00
2001-12-21 00:00:00
2001-12-21 12:16:00
2001-12-21 12:16:00
2001-10-22 21:19:58
2001-10-23 01:19:58
2001-10-23 01:32:58
2001-10-22 21:19:58
2001-10-22 21:06:58
http://cvs.php.net/co.php/php-src/ext/date/tests/002.phpt?r=1.1p=1
Index: php-src/ext/date/tests/002.phpt
+++ php-src/ext/date/tests/002.phpt
--TEST--
strtotime() function
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip Windows does not support dates prior to midnight (00:00:00),
January 1, 1970');
}
if ([EMAIL PROTECTED](TZ=EST5) || getenv(TZ) != 'EST5') {
die(skip unable to change TZ enviroment variable\n);
}
?
--FILE--
?php
$dates = array (
1999-10-13,
Oct 13 1999,
2000-01-19,
Jan 19 2000,
2001-12-21,
Dec 21 2001,
2001-12-21 12:16,
Dec 21 2001 12:16,
Dec 21 12:16,
2001-10-22 21:19:58,
2001-10-22 21:19:58-02,
2001-10-22 21:19:58-0213,
2001-10-22 21:19:58+02,
2001-10-22 21:19:58+0213,
2001-10-22T21:20:58-03:40,
2001-10-22T211958-2,
20011022T211958+0213,
20011022T21:20+0215,
1997W011,
2004W101T05:00+0,
);
echo *** GMT0\n;
putenv (TZ=GMT0);
foreach ($dates as $date) {
echo date (Y-m-d H:i:s\n, strtotime ($date));
}
echo *** US/Eastern\n;
putenv(TZ=US/Eastern);
if( date(T) == GMT ) {
// POSIX style
putenv (TZ=EST5EDT4,M4.1.0,M10.5.0);
}
foreach ($dates as $date) {
echo date (Y-m-d H:i:s\n, strtotime ($date));
}
?
--EXPECTF--
*** GMT0
1999-10-13 00:00:00
1999-10-13 00:00:00
2000-01-19 00:00:00
2000-01-19 00:00:00
2001-12-21 00:00:00
2001-12-21 00:00:00
2001-12-21 12:16:00
2001-12-21 12:16:00
%d-12-21 12:16:00
2001-10-22 21:19:58
2001-10-22 23:19:58
2001-10-22 23:32:58
2001-10-22 19:19:58
2001-10-22 19:06:58
2001-10-23 01:00:58
2001-10-22 23:19:58
2001-10-22 19:06:58
2001-10-22 19:05:00
1996-12-30 00:00:00
2004-03-01 05:00:00
*** US/Eastern
1999-10-13 00:00:00
1999-10-13 00:00:00
2000-01-19 00:00:00
2000-01-19 00:00:00
2001-12-21 00:00:00
2001-12-21 00:00:00
2001-12-21 12:16:00
2001-12-21 12:16:00
%d-12-21 12:16:00
2001-10-22 21:19:58
2001-10-22 19:19:58
2001-10-22 19:32:58
2001-10-22 15:19:58
2001-10-22 15:06:58
2001-10-22 21:00:58
2001-10-22 19:19:58
2001-10-22 15:06:58
2001-10-22 15:05:00
1996-12-30 00:00:00
2004-03-01 00:00:00
http://cvs.php.net/co.php/php-src/ext/date/tests/bug13142.phpt?r=1.1p=1
Index: php-src/ext/date/tests/bug13142.phpt
+++ php-src/ext/date/tests/bug13142.phpt
--TEST--
Bug #13142 strtotime handling of M d
[PHP-CVS] cvs: php-src /ext/date/tests 002-win32.phpt 002.phpt bug13142.phpt bug17988.phpt
derick Thu Jun 16 14:13:40 2005 EDT
Removed files:
/php-src/ext/date/tests 002-win32.phpt
Modified files:
/php-src/ext/date/tests 002.phpt bug13142.phpt bug17988.phpt
Log:
- Fix up tests, remove windows specific test.
http://cvs.php.net/diff.php/php-src/ext/date/tests/002.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/date/tests/002.phpt
diff -u php-src/ext/date/tests/002.phpt:1.1 php-src/ext/date/tests/002.phpt:1.2
--- php-src/ext/date/tests/002.phpt:1.1 Thu Jun 16 13:35:08 2005
+++ php-src/ext/date/tests/002.phpt Thu Jun 16 14:13:40 2005
@@ -2,9 +2,6 @@
strtotime() function
--SKIPIF--
?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-die('skip Windows does not support dates prior to midnight (00:00:00),
January 1, 1970');
-}
if ([EMAIL PROTECTED](TZ=EST5) || getenv(TZ) != 'EST5') {
die(skip unable to change TZ enviroment variable\n);
}
http://cvs.php.net/diff.php/php-src/ext/date/tests/bug13142.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/date/tests/bug13142.phpt
diff -u php-src/ext/date/tests/bug13142.phpt:1.1
php-src/ext/date/tests/bug13142.phpt:1.2
--- php-src/ext/date/tests/bug13142.phpt:1.1Thu Jun 16 13:35:08 2005
+++ php-src/ext/date/tests/bug13142.phptThu Jun 16 14:13:40 2005
@@ -1,5 +1,5 @@
--TEST--
-Bug #13142 strtotime handling of M d H:i:s Y format
+Bug #13142 (strtotime handling of M d H:i:s Y format)
--SKIPIF--
?php
if ([EMAIL PROTECTED](TZ=US/Eastern) || getenv(TZ) != 'US/Eastern') {
http://cvs.php.net/diff.php/php-src/ext/date/tests/bug17988.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/date/tests/bug17988.phpt
diff -u php-src/ext/date/tests/bug17988.phpt:1.1
php-src/ext/date/tests/bug17988.phpt:1.2
--- php-src/ext/date/tests/bug17988.phpt:1.1Thu Jun 16 13:35:08 2005
+++ php-src/ext/date/tests/bug17988.phptThu Jun 16 14:13:40 2005
@@ -1,5 +1,5 @@
--TEST--
-Bug #17988 strtotime handling of postgresql timestamps
+Bug #17988 (strtotime handling of postgresql timestamps)
--FILE--
?php
putenv(TZ=GMT);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date config.m4
derick Thu Jun 16 14:15:30 2005 EDT Modified files: /php-src/ext/date config.m4 Log: - Added include dir. http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.3r2=1.4ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.3 php-src/ext/date/config.m4:1.4 --- php-src/ext/date/config.m4:1.3 Thu Jun 16 13:12:40 2005 +++ php-src/ext/date/config.m4 Thu Jun 16 14:15:30 2005 @@ -1,5 +1,6 @@ -dnl $Id: config.m4,v 1.3 2005/06/16 17:12:40 derick Exp $ +dnl $Id: config.m4,v 1.4 2005/06/16 18:15:30 derick Exp $ dnl config.m4 for date extension PHP_NEW_EXTENSION(date, php_date.c lib/timelib.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c) +PHP_ADD_INCLUDE([$ext_builddir/lib]) PHP_ADD_BUILD_DIR([$ext_builddir/lib]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib parse_tz.c timelib.h timelib_structs.h
derick Thu Jun 16 14:34:43 2005 EDT
Modified files:
/php-src/ext/date/lib parse_tz.c timelib.h timelib_structs.h
Log:
- Fixed headers for FreeBSD
- Moved from ntohl to own macro
- Export timelib_dump_tzinfo
http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_tz.c?r1=1.5r2=1.6ty=u
Index: php-src/ext/date/lib/parse_tz.c
diff -u php-src/ext/date/lib/parse_tz.c:1.5 php-src/ext/date/lib/parse_tz.c:1.6
--- php-src/ext/date/lib/parse_tz.c:1.5 Thu Jun 16 13:12:41 2005
+++ php-src/ext/date/lib/parse_tz.c Thu Jun 16 14:34:42 2005
@@ -16,30 +16,32 @@
+--+
*/
-/* $Id: parse_tz.c,v 1.5 2005/06/16 17:12:41 derick Exp $ */
+/* $Id: parse_tz.c,v 1.6 2005/06/16 18:34:42 derick Exp $ */
#include stdio.h
#ifdef WIN32
#include winsock2.h
#else
-#include netinet/in.h
+#include inttypes.h
#endif
#include string.h
#include timelib.h
#include timezonedb.h
+#define timelib_conv_int(l) ((l 0x00ff) 24) + ((l 0xff00) 8)
+ ((l 0x00ff) 8) + ((l 0xff00) 24)
+
static void read_header(char **tzf, timelib_tzinfo *tz)
{
uint32_t buffer[6];
memcpy(buffer, *tzf, sizeof(buffer));
- tz-ttisgmtcnt = htonl(buffer[0]);
- tz-ttisstdcnt = htonl(buffer[1]);
- tz-leapcnt= htonl(buffer[2]);
- tz-timecnt= htonl(buffer[3]);
- tz-typecnt= htonl(buffer[4]);
- tz-charcnt= htonl(buffer[5]);
+ tz-ttisgmtcnt = timelib_conv_int(buffer[0]);
+ tz-ttisstdcnt = timelib_conv_int(buffer[1]);
+ tz-leapcnt= timelib_conv_int(buffer[2]);
+ tz-timecnt= timelib_conv_int(buffer[3]);
+ tz-typecnt= timelib_conv_int(buffer[4]);
+ tz-charcnt= timelib_conv_int(buffer[5]);
*tzf += sizeof(buffer);
}
@@ -57,7 +59,7 @@
memcpy(buffer, *tzf, sizeof(int32_t) * tz-timecnt);
*tzf += (sizeof(int32_t) * tz-timecnt);
for (i = 0; i tz-timecnt; i++) {
- buffer[i] = htonl(buffer[i]);
+ buffer[i] = timelib_conv_int(buffer[i]);
}
cbuffer = (unsigned char*) malloc(tz-timecnt * sizeof(unsigned
char));
@@ -114,8 +116,8 @@
return;
}
for (i = 0; i tz-leapcnt; i++) {
- tz-leap_times[i].trans = htonl(leap_buffer[i * 2]);
- tz-leap_times[i].offset = htonl(leap_buffer[i * 2 + 1]);
+ tz-leap_times[i].trans = timelib_conv_int(leap_buffer[i * 2]);
+ tz-leap_times[i].offset = timelib_conv_int(leap_buffer[i * 2 +
1]);
}
free(leap_buffer);
@@ -144,8 +146,7 @@
free(buffer);
}
-#if 0
-static void dumpinfo(timelib_tzinfo *tz)
+void timelib_dump_tzinfo(timelib_tzinfo *tz)
{
uint32_t i;
@@ -159,7 +160,7 @@
for (i = 0; i tz-timecnt; i++) {
printf (%08X (%12d) = %3d [%5ld %1d %3d '%s' (%d,%d)]\n,
tz-trans[i], tz-trans[i], tz-trans_idx[i],
- tz-type[tz-trans_idx[i]].offset,
+ (long int) tz-type[tz-trans_idx[i]].offset,
tz-type[tz-trans_idx[i]].isdst,
tz-type[tz-trans_idx[i]].abbr_idx,
tz-timezone_abbr[tz-type[tz-trans_idx[i]].abbr_idx],
@@ -174,7 +175,6 @@
tz-leap_times[i].offset);
}
}
-#endif
static int seek_to_tz_position(char **tzf, char *timezone)
{
http://cvs.php.net/diff.php/php-src/ext/date/lib/timelib.h?r1=1.1r2=1.2ty=u
Index: php-src/ext/date/lib/timelib.h
diff -u php-src/ext/date/lib/timelib.h:1.1 php-src/ext/date/lib/timelib.h:1.2
--- php-src/ext/date/lib/timelib.h:1.1 Thu Jun 16 13:12:41 2005
+++ php-src/ext/date/lib/timelib.h Thu Jun 16 14:34:42 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: timelib.h,v 1.1 2005/06/16 17:12:41 derick Exp $ */
+/* $Id: timelib.h,v 1.2 2005/06/16 18:34:42 derick Exp $ */
#include timelib_structs.h
@@ -53,6 +53,7 @@
timelib_tzinfo *timelib_parse_tzfile(char *timezone);
int timelib_timestamp_is_in_dst(timelib_sll ts, timelib_tzinfo *tz);
timelib_time_offset *timelib_get_time_zone_info(timelib_sll ts, timelib_tzinfo
*tz);
+void timelib_dump_tzinfo(timelib_tzinfo *tz);
/* From timelib.c */
timelib_tzinfo* timelib_tzinfo_ctor();
http://cvs.php.net/diff.php/php-src/ext/date/lib/timelib_structs.h?r1=1.5r2=1.6ty=u
Index: php-src/ext/date/lib/timelib_structs.h
diff -u php-src/ext/date/lib/timelib_structs.h:1.5
php-src/ext/date/lib/timelib_structs.h:1.6
--- php-src/ext/date/lib/timelib_structs.h:1.5 Wed Jun 15 07:01:05 2005
+++ php-src/ext/date/lib/timelib_structs.h Thu Jun 16 14:34:42 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: timelib_structs.h,v 1.5
[PHP-CVS] cvs: php-src / Makefile.global
helly Thu Jun 16 14:58:05 2005 EDT Modified files: /php-srcMakefile.global Log: - No more memory_limit for running tests http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.54r2=1.55ty=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.54 php-src/Makefile.global:1.55 --- php-src/Makefile.global:1.54Fri May 27 09:10:01 2005 +++ php-src/Makefile.global Thu Jun 16 14:58:04 2005 @@ -57,7 +57,7 @@ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC=$(CC) \ - $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \ + $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \ else \ echo ERROR: Cannot run tests without CLI sapi.; \ fi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date config.m4
sniper Thu Jun 16 17:23:16 2005 EDT Modified files: /php-src/ext/date config.m4 Log: Fix VPATH build (again) http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.4r2=1.5ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.4 php-src/ext/date/config.m4:1.5 --- php-src/ext/date/config.m4:1.4 Thu Jun 16 14:15:30 2005 +++ php-src/ext/date/config.m4 Thu Jun 16 17:23:16 2005 @@ -1,6 +1,9 @@ -dnl $Id: config.m4,v 1.4 2005/06/16 18:15:30 derick Exp $ +dnl $Id: config.m4,v 1.5 2005/06/16 21:23:16 sniper Exp $ dnl config.m4 for date extension -PHP_NEW_EXTENSION(date, php_date.c lib/timelib.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/tm2unixtime.c lib/unixtime2tm.c) -PHP_ADD_INCLUDE([$ext_builddir/lib]) +PHP_DATE_CFLAGS=[EMAIL PROTECTED]@/lib +timelib_sources=lib/dow.c lib/parse_date.c lib/parse_tz.c + lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c + +PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS) PHP_ADD_BUILD_DIR([$ext_builddir/lib]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/internal fileobject.inc
johannesThu Jun 16 17:27:51 2005 EDT
Modified files:
/php-src/ext/spl/internal fileobject.inc
Log:
fix typos
http://cvs.php.net/diff.php/php-src/ext/spl/internal/fileobject.inc?r1=1.4r2=1.5ty=u
Index: php-src/ext/spl/internal/fileobject.inc
diff -u php-src/ext/spl/internal/fileobject.inc:1.4
php-src/ext/spl/internal/fileobject.inc:1.5
--- php-src/ext/spl/internal/fileobject.inc:1.4 Mon May 30 16:10:38 2005
+++ php-src/ext/spl/internal/fileobject.inc Thu Jun 16 17:27:51 2005
@@ -31,9 +31,9 @@
* @param $open_mode The file open mode
* @param $use_include_path Whether to search in include paths
* @param $context A stream context
-* @throw RuntimeException If file cannot be opened (e.g.
insufficient
-* access rights).
-*/
+* @throw RuntimeException If file cannot be opened (e.g.
insufficient
+* access rights).
+*/
function __construct($file_name, $open_mode = 'r', $use_include_path =
false, $context = NULL)
{
$this-fp = fopen($file_name, $open_mode, $use_include_path,
$context);
@@ -53,7 +53,7 @@
}
/**
-* @return whethe rend of stream is reached
+* @return whether the end of the stream is reached
*/
function eof()
{
@@ -85,7 +85,7 @@
}
/**
-* @param operation lock opeation (LOCK_SH, LOCK_EX, LOCK_UN, LOCK_NB)
+* @param operation lock operation (LOCK_SH, LOCK_EX, LOCK_UN, LOCK_NB)
* @retval $wouldblock whether the operation would block
*/
function flock($operation, $wouldblock)
@@ -210,7 +210,7 @@
}
/**
-* @return curren tsetting for max line
+* @return current setting for max line
*/
function getMaxLineLen()
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.h
sniper Thu Jun 16 18:03:05 2005 EDT Modified files: /php-src/ext/date php_date.h Log: nuke unused entries http://cvs.php.net/diff.php/php-src/ext/date/php_date.h?r1=1.1r2=1.2ty=u Index: php-src/ext/date/php_date.h diff -u php-src/ext/date/php_date.h:1.1 php-src/ext/date/php_date.h:1.2 --- php-src/ext/date/php_date.h:1.1 Tue Jun 14 17:32:27 2005 +++ php-src/ext/date/php_date.h Thu Jun 16 18:03:04 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.h,v 1.1 2005/06/14 21:32:27 derick Exp $ */ +/* $Id: php_date.h,v 1.2 2005/06/16 22:03:04 sniper Exp $ */ #ifndef PHP_DATE_H #define PHP_DATE_H @@ -28,8 +28,6 @@ PHP_MINIT_FUNCTION(date); PHP_MSHUTDOWN_FUNCTION(date); -PHP_RINIT_FUNCTION(date); -PHP_RSHUTDOWN_FUNCTION(date); PHP_MINFO_FUNCTION(date); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / Makefile.global
You meant Use memory_limit for running tests., right ? (memory_limit=1 switches it on..afaik :) -Jani On Thu, 16 Jun 2005, Marcus Boerger wrote: helly Thu Jun 16 14:58:05 2005 EDT Modified files: /php-src Makefile.global Log: - No more memory_limit for running tests http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.54r2=1.55ty=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.54 php-src/Makefile.global:1.55 --- php-src/Makefile.global:1.54Fri May 27 09:10:01 2005 +++ php-src/Makefile.global Thu Jun 16 14:58:04 2005 @@ -57,7 +57,7 @@ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC=$(CC) \ - $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \ + $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \ else \ echo ERROR: Cannot run tests without CLI sapi.; \ fi -- Donate @ http://pecl.php.net/wishlist.php/sniper -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_soap.h soap.c
bfrance Thu Jun 16 18:35:15 2005 EDT Modified files: /php-src/ext/soap php_soap.h soap.c Log: ifdef'ed the code but not the includes http://cvs.php.net/diff.php/php-src/ext/soap/php_soap.h?r1=1.36r2=1.37ty=u Index: php-src/ext/soap/php_soap.h diff -u php-src/ext/soap/php_soap.h:1.36 php-src/ext/soap/php_soap.h:1.37 --- php-src/ext/soap/php_soap.h:1.36Wed Feb 2 05:34:39 2005 +++ php-src/ext/soap/php_soap.h Thu Jun 16 18:35:11 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_soap.h,v 1.36 2005/02/02 10:34:39 dmitry Exp $ */ +/* $Id: php_soap.h,v 1.37 2005/06/16 22:35:11 bfrance Exp $ */ #ifndef PHP_SOAP_H #define PHP_SOAP_H @@ -26,7 +26,9 @@ #include php_globals.h #include ext/standard/info.h #include ext/standard/php_standard.h +#if HAVE_PHP_SESSION !defined(COMPILE_DL_SESSION) #include ext/session/php_session.h +#endif #include ext/standard/php_smart_str.h #include php_ini.h #include SAPI.h http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.151r2=1.152ty=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.151 php-src/ext/soap/soap.c:1.152 --- php-src/ext/soap/soap.c:1.151 Fri Jun 3 03:34:49 2005 +++ php-src/ext/soap/soap.c Thu Jun 16 18:35:11 2005 @@ -17,13 +17,15 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: soap.c,v 1.151 2005/06/03 07:34:49 gschlossnagle Exp $ */ +/* $Id: soap.c,v 1.152 2005/06/16 22:35:11 bfrance Exp $ */ #ifdef HAVE_CONFIG_H #include config.h #endif #include php_soap.h +#if HAVE_PHP_SESSION !defined(COMPILE_DL_SESSION) #include ext/session/php_session.h +#endif #ifdef ZEND_ENGINE_2 # include zend_exceptions.h #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd gdxpm.c
iliaa Thu Jun 16 18:50:36 2005 EDT Modified files: /php-src/ext/gd/libgd gdxpm.c Log: Fixed memory corruption. http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdxpm.c?r1=1.7r2=1.8ty=u Index: php-src/ext/gd/libgd/gdxpm.c diff -u php-src/ext/gd/libgd/gdxpm.c:1.7 php-src/ext/gd/libgd/gdxpm.c:1.8 --- php-src/ext/gd/libgd/gdxpm.c:1.7Sun Dec 28 15:11:08 2003 +++ php-src/ext/gd/libgd/gdxpm.cThu Jun 16 18:50:32 2005 @@ -46,10 +46,10 @@ buf[0] = image.colorTable[i].c_color[1]; red = strtol(buf, NULL, 16); - buf[0] = image.colorTable[i].c_color[3]; + buf[0] = image.colorTable[i].c_color[2]; green = strtol(buf, NULL, 16); - buf[0] = image.colorTable[i].c_color[5]; + buf[0] = image.colorTable[i].c_color[3]; blue = strtol(buf, NULL, 16); break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / Makefile.global
Hello Jani, no i meant switching it off (i wrote memory_limit=-1) since in my case the ini default of 8M no longer works. marcus Friday, June 17, 2005, 12:34:39 AM, you wrote: You meant Use memory_limit for running tests., right ? (memory_limit=1 switches it on..afaik :) -Jani On Thu, 16 Jun 2005, Marcus Boerger wrote: helly Thu Jun 16 14:58:05 2005 EDT Modified files: /php-src Makefile.global Log: - No more memory_limit for running tests http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.54r2=1.55ty=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.54 php-src/Makefile.global:1.55 --- php-src/Makefile.global:1.54 Fri May 27 09:10:01 2005 +++ php-src/Makefile.global Thu Jun 16 14:58:04 2005 @@ -57,7 +57,7 @@ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC=$(CC) \ - $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' $(top_srcdir)/run-tests.php $(TESTS); \ + $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php $(TESTS); \ else \ echo ERROR: Cannot run tests without CLI sapi.; \ fi -- Best regards, Marcusmailto:[EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date config.m4 php_date.c /ext/date/lib .cvsignore dow.c parse_date.c parse_tz.c timelib.c timelib.h timelib.m4 timelib_structs.h tm2unixtime.c unixtime2tm.c /ext/date/li
sniper Thu Jun 16 19:12:11 2005 EDT Added files: /php-src/ext/date/lib timelib.m4 Modified files: /php-src/ext/date config.m4 php_date.c /php-src/ext/date/lib .cvsignore dow.c parse_date.c parse_tz.c timelib.c timelib.h timelib_structs.h tm2unixtime.c unixtime2tm.c /php-src/ext/date/lib/resource parse_date.re Log: - Improve portability. # TODO: The standalone lib needs it's own build stuff, pretty much same as # Zend has for standalone builds. http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.5r2=1.6ty=u Index: php-src/ext/date/config.m4 diff -u php-src/ext/date/config.m4:1.5 php-src/ext/date/config.m4:1.6 --- php-src/ext/date/config.m4:1.5 Thu Jun 16 17:23:16 2005 +++ php-src/ext/date/config.m4 Thu Jun 16 19:12:08 2005 @@ -1,9 +1,22 @@ -dnl $Id: config.m4,v 1.5 2005/06/16 21:23:16 sniper Exp $ +dnl $Id: config.m4,v 1.6 2005/06/16 23:12:08 sniper Exp $ dnl config.m4 for date extension -PHP_DATE_CFLAGS=[EMAIL PROTECTED]@/lib +sinclude(ext/date/lib/timelib.m4) +sinclude(lib/timelib.m4) + +PHP_DATE_CFLAGS=[EMAIL PROTECTED]@/lib timelib_sources=lib/dow.c lib/parse_date.c lib/parse_tz.c lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS) -PHP_ADD_BUILD_DIR([$ext_builddir/lib]) +PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1) + +cat $ext_builddir/lib/tl_config.h EOF +#if PHP_WIN32 +# include config.w32.h +#elif defined(NETWARE) +# include config.nw.h +#else +# include php_config.h +#endif +EOF http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.8r2=1.9ty=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.8 php-src/ext/date/php_date.c:1.9 --- php-src/ext/date/php_date.c:1.8 Thu Jun 16 13:12:41 2005 +++ php-src/ext/date/php_date.c Thu Jun 16 19:12:08 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.8 2005/06/16 17:12:41 derick Exp $ */ +/* $Id: php_date.c,v 1.9 2005/06/16 23:12:08 sniper Exp $ */ #include php.h #include php_streams.h @@ -25,7 +25,6 @@ #include php_ini.h #include ext/standard/info.h #include php_date.h -#include lib/timelib_structs.h #include lib/timelib.h #include time.h http://cvs.php.net/diff.php/php-src/ext/date/lib/.cvsignore?r1=1.2r2=1.3ty=u Index: php-src/ext/date/lib/.cvsignore diff -u php-src/ext/date/lib/.cvsignore:1.2 php-src/ext/date/lib/.cvsignore:1.3 --- php-src/ext/date/lib/.cvsignore:1.2 Thu Jun 16 17:22:33 2005 +++ php-src/ext/date/lib/.cvsignore Thu Jun 16 19:12:09 2005 @@ -5,3 +5,4 @@ .libs *.gcda *.gcno +tl_config.h http://cvs.php.net/diff.php/php-src/ext/date/lib/dow.c?r1=1.2r2=1.3ty=u Index: php-src/ext/date/lib/dow.c diff -u php-src/ext/date/lib/dow.c:1.2 php-src/ext/date/lib/dow.c:1.3 --- php-src/ext/date/lib/dow.c:1.2 Wed Jun 15 07:01:04 2005 +++ php-src/ext/date/lib/dow.c Thu Jun 16 19:12:09 2005 @@ -16,7 +16,9 @@ +--+ */ -/* $Id: dow.c,v 1.2 2005/06/15 11:01:04 derick Exp $ */ +/* $Id: dow.c,v 1.3 2005/06/16 23:12:09 sniper Exp $ */ + +#include tl_config.h #include timelib_structs.h http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_date.c?r1=1.9r2=1.10ty=u Index: php-src/ext/date/lib/parse_date.c diff -u php-src/ext/date/lib/parse_date.c:1.9 php-src/ext/date/lib/parse_date.c:1.10 --- php-src/ext/date/lib/parse_date.c:1.9 Thu Jun 16 13:12:41 2005 +++ php-src/ext/date/lib/parse_date.c Thu Jun 16 19:12:09 2005 @@ -18,11 +18,21 @@ +--+ */ -/* $Id: parse_date.c,v 1.9 2005/06/16 17:12:41 derick Exp $ */ +/* $Id: parse_date.c,v 1.10 2005/06/16 23:12:09 sniper Exp $ */ + +#include tl_config.h -#include stdlib.h #include stdio.h + +#ifdef HAVE_STDLIB_H +#include stdlib.h +#endif +#ifdef HAVE_STRING_H #include string.h +#else +#include strings.h +#endif + #include timelib.h #if defined(_MSC_VER) http://cvs.php.net/diff.php/php-src/ext/date/lib/parse_tz.c?r1=1.6r2=1.7ty=u Index: php-src/ext/date/lib/parse_tz.c diff -u php-src/ext/date/lib/parse_tz.c:1.6 php-src/ext/date/lib/parse_tz.c:1.7 --- php-src/ext/date/lib/parse_tz.c:1.6 Thu Jun 16 14:34:42 2005 +++ php-src/ext/date/lib/parse_tz.c Thu Jun 16 19:12:10 2005 @@ -16,15 +16,17 @@ +--+ */ -/* $Id: parse_tz.c,v 1.6 2005/06/16 18:34:42 derick Exp $ */ +/* $Id: parse_tz.c,v 1.7 2005/06/16 23:12:10 sniper Exp $ */ + +#include tl_config.h #include stdio.h -#ifdef WIN32 -#include winsock2.h + +#ifdef HAVE_STRING_H +#include string.h #else -#include inttypes.h +#include strings.h #endif -#include string.h #include timelib.h #include timezonedb.h
[PHP-CVS] cvs: php-src /ext/date config.w32
fmk Fri Jun 17 01:10:12 2005 EDT
Modified files:
/php-src/ext/date config.w32
Log:
Attempt to fix win32 build by creating the missing hader file
http://cvs.php.net/diff.php/php-src/ext/date/config.w32?r1=1.3r2=1.4ty=u
Index: php-src/ext/date/config.w32
diff -u php-src/ext/date/config.w32:1.3 php-src/ext/date/config.w32:1.4
--- php-src/ext/date/config.w32:1.3 Thu Jun 16 13:12:40 2005
+++ php-src/ext/date/config.w32 Fri Jun 17 01:10:12 2005
@@ -1,6 +1,10 @@
-// $Id: config.w32,v 1.3 2005/06/16 17:12:40 derick Exp $
+// $Id: config.w32,v 1.4 2005/06/17 05:10:12 fmk Exp $
// vim:ft=javascript
EXTENSION(date, php_date.c, false, -Iext/date/lib);
ADD_SOURCES(ext/date/lib, timelib.c dow.c parse_date.c parse_tz.c
tm2unixtime.c unixtime2tm.c, date);
AC_DEFINE('HAVE_DATE', 1, 'Have date/time support');
+
+var tl_config = FSO.CreateTextFile(ext/date/lib/tl_config.h, true);
+tl_config.WriteLine(#include \config.w32.h\);
+tl_config.Close();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: excuse me
Antispam complete -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
