[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Sep 16 01:39:52 2005 EDT
Modified files:
/php-srcChangeLog
Log:
ChangeLog update
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2104r2=1.2105ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2104 php-src/ChangeLog:1.2105
--- php-src/ChangeLog:1.2104Thu Sep 15 01:46:04 2005
+++ php-src/ChangeLog Fri Sep 16 01:39:45 2005
@@ -1,3 +1,77 @@
+2005-09-15 Jani Taskinen [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ ZendEngine2/tests/array_type_hint_001.phpt
+ ZendEngine2/tests/bug20240.phpt
+ ZendEngine2/tests/bug33996.phpt
+ ZendEngine2/tests/bug34199.phpt
+ tests/classes/type_hinting_001.phpt
+ tests/lang/bug24658.phpt
+ tests/lang/type_hints_001.phpt:
+ - Fix tests due to changes in the error messages.
+
+2005-09-15 Derick Rethans [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ NEWS
+ main/config.w32.h
+ main/snprintf.h:
+ - MFH: Fixed bug #34052 (date('U') returns %ld not unix timestamp).
+
+* NEWS
+ main/config.w32.h
+ main/snprintf.h:
+ - Fixed bug #34052 (date('U') returns %ld not unix timestamp).
+
+* tests/lang/catchable_error_001.phpt
+ tests/lang/catchable_error_002.phpt:
+ - Added tests.
+
+* php.ini-dist
+ php.ini-recommended
+ run-tests.php
+ ZendEngine2/zend.c
+ ZendEngine2/zend_constants.c
+ ZendEngine2/zend_errors.h
+ ZendEngine2/zend_execute.c
+ ZendEngine2/tests/array_type_hint_001.phpt
+ ZendEngine2/tests/bug33996.phpt
+ ext/mcrypt/mcrypt.c
+ ext/session/session.c
+ ext/simplexml/simplexml.c
+ ext/simplexml/tests/012.phpt
+ main/main.c
+ tests/classes/array_access_003.phpt
+ tests/classes/private_003.phpt
+ tests/classes/type_hinting_001.phpt
+ tests/lang/bug24658.phpt
+ tests/lang/type_hints_001.phpt
+ tests/run-test/test005.phpt
+ tests/run-test/test008a.phpt:
+ - Add E_RECOVERABLE.
+
+2005-09-15 Anantha Kesari H Y [EMAIL PROTECTED]
+
+* (PHP_4_4)
+ main/main.c:
+ NetWare does not have sendmail binary to send mail.
+ --Kamesh
+
+2005-09-15 Jani Taskinen [EMAIL PROTECTED]
+
+* ZendEngine2/zend_execute.c:
+ MFB
+
+* (PHP_5_1)
+ ZendEngine2/zend_execute.c:
+ - Fixed error message grammar
+
+2005-09-15 Marcus Boerger [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ NEWS:
+ - Update with latest SPLchanges
+
2005-09-14 Derick Rethans [EMAIL PROTECTED]
* (PHP_5_0)
@@ -11883,7 +11957,7 @@
* (PHP_4_3)
ext/standard/url_scanner_ex.re:
- Missing $Id: ChangeLog,v 1.2104 2005/09/15 05:46:04 changelog Exp $ tag
+ Missing $Id: ChangeLog,v 1.2105 2005/09/16 05:39:45 changelog Exp $ tag
* (PHP_5_0)
ext/standard/url_scanner_ex.c:
@@ -15284,7 +15358,7 @@
ext/session/mod_mm.h
ext/session/mod_user.h
ext/session/php_session.h:
- - Missing $Id: ChangeLog,v 1.2104 2005/09/15 05:46:04 changelog Exp $
tags
+ - Missing $Id: ChangeLog,v 1.2105 2005/09/16 05:39:45 changelog Exp $
tags
* (PHP_4_3)
ext/session/session.c:
@@ -15765,7 +15839,7 @@
* (PHP_4_3)
Zend/zend_ini_scanner.l:
- Missing $Id: ChangeLog,v 1.2104 2005/09/15 05:46:04 changelog Exp $ tag
+ ws fix
+ Missing $Id: ChangeLog,v 1.2105 2005/09/16 05:39:45 changelog Exp $ tag
+ ws fix
* ZendEngine2/zend_ini_scanner.l
ZendEngine2/zend_ini_scanner.l:
@@ -17239,7 +17313,7 @@
ext/standard/url_scanner_ex.c
ext/standard/url_scanner_ex.h
ext/standard/url_scanner_ex.re:
- Missing $Id: ChangeLog,v 1.2104 2005/09/15 05:46:04 changelog Exp $ tag
+ Missing $Id: ChangeLog,v 1.2105 2005/09/16 05:39:45 changelog Exp $ tag
* ext/standard/credits_ext.h
ext/standard/credits_sapi.h:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Sep 16 01:40:56 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.771r2=1.772ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.771 ZendEngine2/ChangeLog:1.772 --- ZendEngine2/ChangeLog:1.771 Thu Sep 15 01:48:00 2005 +++ ZendEngine2/ChangeLog Fri Sep 16 01:40:54 2005 @@ -1,3 +1,31 @@ +2005-09-15 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_1) + tests/array_type_hint_001.phpt + tests/bug20240.phpt + tests/bug33996.phpt + tests/bug34199.phpt: + - Fix tests due to changes in the error messages. + +2005-09-15 Derick Rethans [EMAIL PROTECTED] + +* zend.c + zend_constants.c + zend_errors.h + zend_execute.c + tests/array_type_hint_001.phpt + tests/bug33996.phpt: + - Add E_RECOVERABLE. + +2005-09-15 Jani Taskinen [EMAIL PROTECTED] + +* zend_execute.c: + MFB + +* (PHP_5_1) + zend_execute.c: + - Fixed error message grammar + 2005-09-14 Marcus Boerger [EMAIL PROTECTED] * zend_execute.c: @@ -10204,7 +10232,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.771 2005/09/15 05:48:00 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.772 2005/09/16 05:40:54 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -11928,7 +11956,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.771 2005/09/15 05:48:00 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.772 2005/09/16 05:40:54 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_4_4) /main main.c
hyanantha Thu Sep 15 10:06:18 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/main main.c
Log:
NetWare does not have sendmail binary to send mail.
--Kamesh
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.63.2.3r2=1.512.2.63.2.4ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.63.2.3 php-src/main/main.c:1.512.2.63.2.4
--- php-src/main/main.c:1.512.2.63.2.3 Wed Aug 17 11:34:24 2005
+++ php-src/main/main.c Thu Sep 15 10:06:15 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.63.2.3 2005/08/17 15:34:24 iliaa Exp $ */
+/* $Id: main.c,v 1.512.2.63.2.4 2005/09/15 14:06:15 hyanantha Exp $ */
/* {{{ includes
*/
@@ -257,7 +257,7 @@
# define PHP_SAFE_MODE_EXEC_DIR
#endif
-#ifdef PHP_PROG_SENDMAIL
+#if defined(PHP_PROG_SENDMAIL) !defined(NETWARE)
# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL -t -i
#else
# define DEFAULT_SENDMAIL_PATH NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c spl.php spl_directory.c spl_directory.h /ext/spl/internal fileobject.inc splfileobject.inc /ext/spl/tests fileobject_001.phpt fileobject_002.phpt
helly Thu Sep 15 10:07:39 2005 EDT
Added files:
/php-src/ext/spl/internal splfileobject.inc
Removed files:
/php-src/ext/spl/internal fileobject.inc
Modified files:
/php-src/ext/splphp_spl.c spl.php spl_directory.c spl_directory.h
/php-src/ext/spl/tests fileobject_001.phpt fileobject_002.phpt
Log:
- Rename file class again by popular demmand: calling it SplFileObject now
# Any other idea about the name? Or should i come up with a renaming plan
# for the upcoming versions? :-)
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.62r2=1.63ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.62 php-src/ext/spl/php_spl.c:1.63
--- php-src/ext/spl/php_spl.c:1.62 Wed Sep 14 23:31:36 2005
+++ php-src/ext/spl/php_spl.c Thu Sep 15 10:07:38 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.62 2005/09/15 03:31:36 helly Exp $ */
+/* $Id: php_spl.c,v 1.63 2005/09/15 14:07:38 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -159,7 +159,6 @@
SPL_ADD_CLASS(DirectoryIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(DomainException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(EmptyIterator, z_list, sub, allow, ce_flags); \
- SPL_ADD_CLASS(FileObject, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(FilterIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(InfiniteIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(InvalidArgumentException, z_list, sub, allow, ce_flags); \
@@ -181,6 +180,7 @@
SPL_ADD_CLASS(RuntimeException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SeekableIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SimpleXMLIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(SplFileObject, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplObjectStorage, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplObserver, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplSubject, z_list, sub, allow, ce_flags); \
http://cvs.php.net/diff.php/php-src/ext/spl/spl.php?r1=1.51r2=1.52ty=u
Index: php-src/ext/spl/spl.php
diff -u php-src/ext/spl/spl.php:1.51 php-src/ext/spl/spl.php:1.52
--- php-src/ext/spl/spl.php:1.51Wed Sep 14 23:31:36 2005
+++ php-src/ext/spl/spl.php Thu Sep 15 10:07:38 2005
@@ -53,7 +53,7 @@
*
* - class DirectoryIterator implements Iterator
* - class RecursiveDirectoryIterator extends DirectoryIterator implements
RecursiveIterator
- * - class FileObject implements RecursiveIterator, SeekableIterator
+ * - class SplFileObject implements RecursiveIterator, SeekableIterator
*
* 3) XML
*
@@ -761,16 +761,16 @@
*/
function __toString();
- /** Open the current file as a FileObject instance
+ /** Open the current file as a SplFileObject instance
*
* @param mode open mode
* @param use_include_path whether to search include paths (don't use)
* @param context resource context to pased to open function
* @throw RuntimeException if file cannot be opened (e.g. insufficient
* access rights).
-* @return The opened file as a FileObject instance
+* @return The opened file as a SplFileObject instance
*
-* @see FileObject
+* @see SplFileObject
* @see file()
*/
function DirectoryIterator::openFile($mode = 'r', $use_include_path =
false, $context = NULL);
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.47r2=1.48ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.47
php-src/ext/spl/spl_directory.c:1.48
--- php-src/ext/spl/spl_directory.c:1.47Wed Sep 14 23:31:36 2005
+++ php-src/ext/spl/spl_directory.c Thu Sep 15 10:07:38 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.47 2005/09/15 03:31:36 helly Exp $ */
+/* $Id: spl_directory.c,v 1.48 2005/09/15 14:07:38 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -50,7 +50,7 @@
/* decalre the class entry */
PHPAPI zend_class_entry *spl_ce_DirectoryIterator;
PHPAPI zend_class_entry *spl_ce_RecursiveDirectoryIterator;
-PHPAPI zend_class_entry *spl_ce_FileObject;
+PHPAPI zend_class_entry *spl_ce_SplFileObject;
static zend_object_value spl_file_object_new_ex(zend_class_entry *class_type,
spl_file_object **obj TSRMLS_DC);
static int spl_file_object_open(spl_file_object *intern, int use_include_path,
int silent TSRMLS_DC);
@@ -428,7 +428,7 @@
DirectoryFunction(isLink, FS_IS_LINK)
/* }}} */
-/* {{{ proto FileObject DirectoryIterator::openFile([string mode = 'r' [, bool
use_include_path [, resource context]]])
+/* {{{
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/spl php_spl.c spl.php spl_directory.c spl_directory.h /ext/spl/internal fileobject.inc splfileobject.inc /ext/spl/tests fileobject_001.phpt fileobject_002.phpt
helly Thu Sep 15 10:08:17 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/spl/internal splfileobject.inc
Removed files:
/php-src/ext/spl/internal fileobject.inc
Modified files:
/php-src/ext/splphp_spl.c spl.php spl_directory.c spl_directory.h
/php-src/ext/spl/tests fileobject_001.phpt fileobject_002.phpt
Log:
- Rename file class again by popular demmand: calling it SplFileObject now
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.52.2.4r2=1.52.2.5ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.4 php-src/ext/spl/php_spl.c:1.52.2.5
--- php-src/ext/spl/php_spl.c:1.52.2.4 Wed Sep 14 23:33:04 2005
+++ php-src/ext/spl/php_spl.c Thu Sep 15 10:08:14 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.52.2.4 2005/09/15 03:33:04 helly Exp $ */
+/* $Id: php_spl.c,v 1.52.2.5 2005/09/15 14:08:14 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -161,7 +161,6 @@
SPL_ADD_CLASS(DirectoryIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(DomainException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(EmptyIterator, z_list, sub, allow, ce_flags); \
- SPL_ADD_CLASS(FileObject, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(FilterIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(InfiniteIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(InvalidArgumentException, z_list, sub, allow, ce_flags); \
@@ -183,6 +182,7 @@
SPL_ADD_CLASS(RuntimeException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SeekableIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SimpleXMLIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(SplFileObject, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplObjectStorage, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplObserver, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplSubject, z_list, sub, allow, ce_flags); \
http://cvs.php.net/diff.php/php-src/ext/spl/spl.php?r1=1.49.2.2r2=1.49.2.3ty=u
Index: php-src/ext/spl/spl.php
diff -u php-src/ext/spl/spl.php:1.49.2.2 php-src/ext/spl/spl.php:1.49.2.3
--- php-src/ext/spl/spl.php:1.49.2.2Wed Sep 14 23:33:04 2005
+++ php-src/ext/spl/spl.php Thu Sep 15 10:08:14 2005
@@ -53,7 +53,7 @@
*
* - class DirectoryIterator implements Iterator
* - class RecursiveDirectoryIterator extends DirectoryIterator implements
RecursiveIterator
- * - class FileObject implements RecursiveIterator, SeekableIterator
+ * - class SplFileObject implements RecursiveIterator, SeekableIterator
*
* 3) XML
*
@@ -761,16 +761,16 @@
*/
function __toString();
- /** Open the current file as a FileObject instance
+ /** Open the current file as a SplFileObject instance
*
* @param mode open mode
* @param use_include_path whether to search include paths (don't use)
* @param context resource context to pased to open function
* @throw RuntimeException if file cannot be opened (e.g. insufficient
* access rights).
-* @return The opened file as a FileObject instance
+* @return The opened file as a SplFileObject instance
*
-* @see FileObject
+* @see SplFileObject
* @see file()
*/
function DirectoryIterator::openFile($mode = 'r', $use_include_path =
false, $context = NULL);
http://cvs.php.net/diff.php/php-src/ext/spl/spl_directory.c?r1=1.45.2.1r2=1.45.2.2ty=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.1
php-src/ext/spl/spl_directory.c:1.45.2.2
--- php-src/ext/spl/spl_directory.c:1.45.2.1Wed Sep 14 23:33:04 2005
+++ php-src/ext/spl/spl_directory.c Thu Sep 15 10:08:14 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.1 2005/09/15 03:33:04 helly Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.2 2005/09/15 14:08:14 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -50,7 +50,7 @@
/* decalre the class entry */
PHPAPI zend_class_entry *spl_ce_DirectoryIterator;
PHPAPI zend_class_entry *spl_ce_RecursiveDirectoryIterator;
-PHPAPI zend_class_entry *spl_ce_FileObject;
+PHPAPI zend_class_entry *spl_ce_SplFileObject;
static zend_object_value spl_file_object_new_ex(zend_class_entry *class_type,
spl_file_object **obj TSRMLS_DC);
static int spl_file_object_open(spl_file_object *intern, int use_include_path,
int silent TSRMLS_DC);
@@ -428,7 +428,7 @@
DirectoryFunction(isLink, FS_IS_LINK)
/* }}} */
-/* {{{ proto FileObject DirectoryIterator::openFile([string mode = 'r' [, bool
use_include_path [, resource context]]])
+/* {{{ proto SplFileObject
Re: [PHP-CVS] cvs: php-src /ext/standard basic_functions.c
Dmitry, While passing by ref in this case would be a bit faster, but those two functions really should not be taking arguments by reference. What we really need is pass by const. Ilia Dmitry Stogov wrote: Hi Ilia, In php 5.1 and above we can use ZEND_SEND_PREFER_REF flag instead of ZEND_SEND_BY_REF. I think we should do it. Thanks. Dmitry. -Original Message- From: Ilia Alshanetsky [mailto:[EMAIL PROTECTED] Sent: Wednesday, September 14, 2005 6:11 PM To: Dmitry Stogov Cc: 'Ilia Alshanetsky'; php-cvs@lists.php.net; Andi Gutmans; Zeev Suraski Subject: Re: [PHP-CVS] cvs: php-src /ext/standard basic_functions.c Dmitry Stogov wrote: Are you sure? Passing by value may copy whole array. It makes the functions a TINY bit slower 0.06 seconds for 100 itterations, but makes it possible to pass return values of functions that return arrays. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended run-tests.php /ext/mcrypt mcrypt.c /ext/session session.c /ext/simplexml simplexml.c /ext/simplexml/tests 012.phpt /ext/spl/tests array_0
derick Thu Sep 15 12:19:49 2005 EDT
Modified files:
/php-srcphp.ini-dist php.ini-recommended run-tests.php
/ZendEngine2zend.c zend_constants.c zend_errors.h zend_execute.c
/ZendEngine2/tests array_type_hint_001.phpt bug33996.phpt
/php-src/ext/mcrypt mcrypt.c
/php-src/ext/sessionsession.c
/php-src/ext/simplexml simplexml.c
/php-src/ext/simplexml/tests012.phpt
/php-src/ext/spl/tests array_013.phpt
/php-src/main main.c
/php-src/tests/classes array_access_003.phpt private_003.phpt
type_hinting_001.phpt
/php-src/tests/lang bug24658.phpt type_hints_001.phpt
/php-src/tests/run-test test005.phpt test008a.phpt
Log:
- Add E_RECOVERABLE.
#- Thought I did this before already actually...
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.233r2=1.234ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.233 php-src/php.ini-dist:1.234
--- php-src/php.ini-dist:1.233 Mon Aug 29 10:46:00 2005
+++ php-src/php.ini-distThu Sep 15 12:19:37 2005
@@ -254,6 +254,7 @@
; reporting level
; E_ALL - All errors and warnings (doesn't include E_STRICT)
; E_ERROR - fatal run-time errors
+; E_RECOVERABLE_ERROR - almost fatal run-time errors
; E_WARNING - run-time warnings (non-fatal errors)
; E_PARSE - compile-time parse errors
; E_NOTICE - run-time notices (these are warnings which often result
@@ -285,7 +286,7 @@
;
; - Show only errors
;
-;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
+;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
;
; - Show all errors except for notices and coding standards warnings
;
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.181r2=1.182ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.181 php-src/php.ini-recommended:1.182
--- php-src/php.ini-recommended:1.181 Mon Aug 29 10:46:00 2005
+++ php-src/php.ini-recommended Thu Sep 15 12:19:37 2005
@@ -312,6 +312,7 @@
; reporting level
; E_ALL - All errors and warnings (doesn't include E_STRICT)
; E_ERROR - fatal run-time errors
+; E_RECOVERABLE_ERROR - almost fatal run-time errors
; E_WARNING - run-time warnings (non-fatal errors)
; E_PARSE - compile-time parse errors
; E_NOTICE - run-time notices (these are warnings which often result
@@ -343,7 +344,7 @@
;
; - Show only errors
;
-;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
+;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR
;
; - Show all errors, except coding standards warnings
;
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.230r2=1.231ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.230 php-src/run-tests.php:1.231
--- php-src/run-tests.php:1.230 Mon Aug 15 18:34:37 2005
+++ php-src/run-tests.php Thu Sep 15 12:19:37 2005
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.230 2005/08/15 22:34:37 sniper Exp $ */
+/* $Id: run-tests.php,v 1.231 2005/09/15 16:19:37 derick Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -143,7 +143,7 @@
'safe_mode=0',
'disable_functions=',
'output_buffering=Off',
- 'error_reporting=4095',
+ 'error_reporting=8191',
'display_errors=1',
'log_errors=0',
'html_errors=0',
http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.322r2=1.323ty=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.322 ZendEngine2/zend.c:1.323
--- ZendEngine2/zend.c:1.322Fri Sep 9 04:19:56 2005
+++ ZendEngine2/zend.c Thu Sep 15 12:19:41 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.c,v 1.322 2005/09/09 08:19:56 dmitry Exp $ */
+/* $Id: zend.c,v 1.323 2005/09/15 16:19:41 derick Exp $ */
#include zend.h
#include zend_extensions.h
@@ -1672,6 +1672,7 @@
case E_USER_ERROR:
case E_USER_WARNING:
case E_USER_NOTICE:
+ case E_RECOVERABLE_ERROR:
if (zend_is_compiling(TSRMLS_C)) {
error_filename =
zend_get_compiled_filename(TSRMLS_C);
error_lineno =
zend_get_compiled_lineno(TSRMLS_C);
http://cvs.php.net/diff.php/ZendEngine2/zend_constants.c?r1=1.74r2=1.75ty=u
Index: ZendEngine2/zend_constants.c
diff -u ZendEngine2/zend_constants.c:1.74 ZendEngine2/zend_constants.c:1.75
--- ZendEngine2/zend_constants.c:1.74 Thu Sep 8 07:10:28 2005
+++ ZendEngine2/zend_constants.cThu Sep
[PHP-CVS] cvs: php-src /tests/lang catchable_error_001.phpt catchable_error_002.phpt
derick Thu Sep 15 12:20:06 2005 EDT
Added files:
/php-src/tests/lang catchable_error_001.phpt
catchable_error_002.phpt
Log:
- Added tests.
http://cvs.php.net/co.php/php-src/tests/lang/catchable_error_001.phpt?r=1.1p=1
Index: php-src/tests/lang/catchable_error_001.phpt
+++ php-src/tests/lang/catchable_error_001.phpt
--TEST--
Catchable fatal error [1]
--FILE--
?php
class Foo {
}
function blah (Foo $a)
{
}
function error()
{
$a = func_get_args();
var_dump($a);
}
blah (new StdClass);
echo ALIVE!\n;
?
--EXPECTF--
Catchable fatal error: Argument 1 must be an instance of Foo, called in
%scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php
on line 5
http://cvs.php.net/co.php/php-src/tests/lang/catchable_error_002.phpt?r=1.1p=1
Index: php-src/tests/lang/catchable_error_002.phpt
+++ php-src/tests/lang/catchable_error_002.phpt
--TEST--
Catchable fatal error [2]
--FILE--
?php
class Foo {
}
function blah (Foo $a)
{
}
function error()
{
$a = func_get_args();
var_dump($a);
}
set_error_handler('error');
blah (new StdClass);
echo ALIVE!\n;
?
--EXPECTF--
array(5) {
[0]=
int(4096)
[1]=
string(%d) Argument 1 must be an instance of Foo, called in
%scatchable_error_002.php on line 17 and defined
[2]=
string(%d) %scatchable_error_002.php
[3]=
int(5)
[4]=
array(0) {
}
}
ALIVE!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /main config.w32.h snprintf.h
derick Thu Sep 15 15:10:14 2005 EDT
Modified files:
/php-srcNEWS
/php-src/main config.w32.h snprintf.h
Log:
- Fixed bug #34052 (date('U') returns %ld not unix timestamp).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2060r2=1.2061ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2060 php-src/NEWS:1.2061
--- php-src/NEWS:1.2060 Mon Sep 12 07:48:26 2005
+++ php-src/NEWSThu Sep 15 15:10:10 2005
@@ -29,5 +29,6 @@
(Dmitry, Alex)
- Fixed bug #34137 (assigning array element by reference causes binary mess).
(Dmitry)
+- Fixed bug #34052 (date('U') returns %ld not unix timestamp). (Nuno)
- Fixed bug #33957 (gmdate('W')/date('W') sometimes returns wrong week number).
(Derick)
http://cvs.php.net/diff.php/php-src/main/config.w32.h?r1=1.85r2=1.86ty=u
Index: php-src/main/config.w32.h
diff -u php-src/main/config.w32.h:1.85 php-src/main/config.w32.h:1.86
--- php-src/main/config.w32.h:1.85 Tue Feb 10 13:50:10 2004
+++ php-src/main/config.w32.h Thu Sep 15 15:10:13 2005
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h,v 1.85 2004/02/10 18:50:10 zeev Exp $
+ $Id: config.w32.h,v 1.86 2005/09/15 19:10:13 derick Exp $
*/
/* Default PHP / PEAR directories */
@@ -175,7 +175,7 @@
#define SIZEOF_LONG 4
/* MSVC.6/NET don't allow 'long long' or know 'intmax_t' */
#define SIZEOF_LONG_LONG_INT 0
-#define SIZEOF_LONG_LONG 0
+#define SIZEOF_LONG_LONG 8 /* defined as __int64 */
#define SIZEOF_INTMAX_T 0
#define ssize_t SSIZE_T
#ifdef _WIN64
http://cvs.php.net/diff.php/php-src/main/snprintf.h?r1=1.32r2=1.33ty=u
Index: php-src/main/snprintf.h
diff -u php-src/main/snprintf.h:1.32 php-src/main/snprintf.h:1.33
--- php-src/main/snprintf.h:1.32Wed Aug 3 10:08:39 2005
+++ php-src/main/snprintf.h Thu Sep 15 15:10:13 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: snprintf.h,v 1.32 2005/08/03 14:08:39 sniper Exp $ */
+/* $Id: snprintf.h,v 1.33 2005/09/15 19:10:13 derick Exp $ */
/*
@@ -111,12 +111,12 @@
extern char * ap_php_fcvt(double arg, int ndigits, int *decpt, int *sign, char
*buf);
extern char * ap_php_gcvt(double number, int ndigit, char *buf, boolean_e
altform);
-#if SIZEOF_LONG_LONG_INT
+#if PHP_WIN32
+# define WIDE_INT __int64
+#elif SIZEOF_LONG_LONG_INT
# define WIDE_INT long long int
#elif SIZEOF_LONG_LONG
# define WIDE_INT long long
-#elif PHP_WIN32
-# define WIDE_INT __int64
#else
# define WIDE_INT long
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main config.w32.h snprintf.h
derick Thu Sep 15 15:11:15 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/main config.w32.h snprintf.h
Log:
- MFH: Fixed bug #34052 (date('U') returns %ld not unix timestamp).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.60r2=1.2027.2.61ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.60 php-src/NEWS:1.2027.2.61
--- php-src/NEWS:1.2027.2.60Wed Sep 14 23:42:41 2005
+++ php-src/NEWSThu Sep 15 15:11:14 2005
@@ -69,6 +69,7 @@
(Dmitry)
- Fixed bug #34062 (Crash in catch block when many arguments are used).
(Dmitry)
+- Fixed bug #34052 (date('U') returns %ld not unix timestamp). (Nuno)
- Fixed bug #34045 (Buffer overflow with serialized object). (Dmitry)
- Fixed bug #34001 (pdo_mysql truncates numberic fields at 4 chars). (Ilia)
- Fixed bug #33999 (object remains object when cast to int). (Dmitry)
http://cvs.php.net/diff.php/php-src/main/config.w32.h?r1=1.85r2=1.85.4.1ty=u
Index: php-src/main/config.w32.h
diff -u php-src/main/config.w32.h:1.85 php-src/main/config.w32.h:1.85.4.1
--- php-src/main/config.w32.h:1.85 Tue Feb 10 13:50:10 2004
+++ php-src/main/config.w32.h Thu Sep 15 15:11:15 2005
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h,v 1.85 2004/02/10 18:50:10 zeev Exp $
+ $Id: config.w32.h,v 1.85.4.1 2005/09/15 19:11:15 derick Exp $
*/
/* Default PHP / PEAR directories */
@@ -175,7 +175,7 @@
#define SIZEOF_LONG 4
/* MSVC.6/NET don't allow 'long long' or know 'intmax_t' */
#define SIZEOF_LONG_LONG_INT 0
-#define SIZEOF_LONG_LONG 0
+#define SIZEOF_LONG_LONG 8 /* defined as __int64 */
#define SIZEOF_INTMAX_T 0
#define ssize_t SSIZE_T
#ifdef _WIN64
http://cvs.php.net/diff.php/php-src/main/snprintf.h?r1=1.32r2=1.32.2.1ty=u
Index: php-src/main/snprintf.h
diff -u php-src/main/snprintf.h:1.32 php-src/main/snprintf.h:1.32.2.1
--- php-src/main/snprintf.h:1.32Wed Aug 3 10:08:39 2005
+++ php-src/main/snprintf.h Thu Sep 15 15:11:15 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: snprintf.h,v 1.32 2005/08/03 14:08:39 sniper Exp $ */
+/* $Id: snprintf.h,v 1.32.2.1 2005/09/15 19:11:15 derick Exp $ */
/*
@@ -111,12 +111,12 @@
extern char * ap_php_fcvt(double arg, int ndigits, int *decpt, int *sign, char
*buf);
extern char * ap_php_gcvt(double number, int ndigit, char *buf, boolean_e
altform);
-#if SIZEOF_LONG_LONG_INT
+#if PHP_WIN32
+# define WIDE_INT __int64
+#elif SIZEOF_LONG_LONG_INT
# define WIDE_INT long long int
#elif SIZEOF_LONG_LONG
# define WIDE_INT long long
-#elif PHP_WIN32
-# define WIDE_INT __int64
#else
# define WIDE_INT long
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /tests/classes type_hinting_001.phpt /tests/lang bug24658.phpt type_hints_001.phpt ZendEngine2/tests array_type_hint_001.phpt bug20240.phpt bug33996.phpt bug34199.php
sniper Thu Sep 15 15:49:58 2005 EDT
Modified files: (Branch: PHP_5_1)
/ZendEngine2/tests array_type_hint_001.phpt bug20240.phpt
bug33996.phpt bug34199.phpt
/php-src/tests/classes type_hinting_001.phpt
/php-src/tests/lang bug24658.phpt type_hints_001.phpt
Log:
- Fix tests due to changes in the error messages.
# Also nuked some CRLF's
http://cvs.php.net/diff.php/ZendEngine2/tests/array_type_hint_001.phpt?r1=1.2r2=1.2.2.1ty=u
Index: ZendEngine2/tests/array_type_hint_001.phpt
diff -u ZendEngine2/tests/array_type_hint_001.phpt:1.2
ZendEngine2/tests/array_type_hint_001.phpt:1.2.2.1
--- ZendEngine2/tests/array_type_hint_001.phpt:1.2 Fri Aug 5 05:34:28 2005
+++ ZendEngine2/tests/array_type_hint_001.phpt Thu Sep 15 15:49:56 2005
@@ -1,15 +1,15 @@
---TEST--
-Array type hint
---FILE--
-?php
-function foo(array $a) {
- echo count($a).\n;
-}
-
-foo(array(1,2,3));
-foo(123);
-?
---EXPECTF--
-3
-
-Fatal error: Argument 1 must be an array, called in %sarray_type_hint_001.php
on line 7 and defined in %sarray_type_hint_001.php on line 2
+--TEST--
+Array type hint
+--FILE--
+?php
+function foo(array $a) {
+ echo count($a).\n;
+}
+
+foo(array(1,2,3));
+foo(123);
+?
+--EXPECTF--
+3
+
+Fatal error: Argument 1 passed to foo() must be an array, called in
%sarray_type_hint_001.php on line 7 and defined in %sarray_type_hint_001.php on
line 2
http://cvs.php.net/diff.php/ZendEngine2/tests/bug20240.phpt?r1=1.5r2=1.5.2.1ty=u
Index: ZendEngine2/tests/bug20240.phpt
diff -u ZendEngine2/tests/bug20240.phpt:1.5
ZendEngine2/tests/bug20240.phpt:1.5.2.1
--- ZendEngine2/tests/bug20240.phpt:1.5 Thu Sep 23 16:08:07 2004
+++ ZendEngine2/tests/bug20240.phpt Thu Sep 15 15:49:56 2005
@@ -39,5 +39,5 @@
2
3
Done
-test::__destruct
test::destructor
+test::__destruct
http://cvs.php.net/diff.php/ZendEngine2/tests/bug33996.phpt?r1=1.1r2=1.1.2.1ty=u
Index: ZendEngine2/tests/bug33996.phpt
diff -u ZendEngine2/tests/bug33996.phpt:1.1
ZendEngine2/tests/bug33996.phpt:1.1.2.1
--- ZendEngine2/tests/bug33996.phpt:1.1 Fri Aug 5 05:34:28 2005
+++ ZendEngine2/tests/bug33996.phpt Thu Sep 15 15:49:56 2005
@@ -1,29 +1,29 @@
---TEST--
-Bug #33996 (No information given for fatal error on passing invalid value to
typed argument)
---INI--
-error_reporting=4095
---FILE--
-?php
-class Foo
-{
-// nothing
-}
-
-function FooTest(Foo $foo)
-{
-echo Hello!;
-}
-
-function NormalTest($a)
-{
-echo Hi!;
-}
-
-NormalTest();
-FooTest();
-FooTest(new Foo());
-?
---EXPECTF--
-Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line
17 and defined in %sbug33996.php on line 12
-Hi!
-Fatal error: Argument 1 must be an object of class Foo, called in
%sbug33996.php on line 18 and defined in %sbug33996.php on line 7
+--TEST--
+Bug #33996 (No information given for fatal error on passing invalid value to
typed argument)
+--INI--
+error_reporting=4095
+--FILE--
+?php
+class Foo
+{
+// nothing
+}
+
+function FooTest(Foo $foo)
+{
+echo Hello!;
+}
+
+function NormalTest($a)
+{
+echo Hi!;
+}
+
+NormalTest();
+FooTest();
+FooTest(new Foo());
+?
+--EXPECTF--
+Warning: Missing argument 1 for NormalTest(), called in %sbug33996.php on line
17 and defined in %sbug33996.php on line 12
+Hi!
+Fatal error: Argument 1 passed to FooTest() must be an object of class Foo,
called in %sbug33996.php on line 18 and defined in %sbug33996.php on line 7
http://cvs.php.net/diff.php/ZendEngine2/tests/bug34199.phpt?r1=1.1.2.2r2=1.1.2.3ty=u
Index: ZendEngine2/tests/bug34199.phpt
diff -u ZendEngine2/tests/bug34199.phpt:1.1.2.2
ZendEngine2/tests/bug34199.phpt:1.1.2.3
--- ZendEngine2/tests/bug34199.phpt:1.1.2.2 Mon Sep 12 07:48:57 2005
+++ ZendEngine2/tests/bug34199.phpt Thu Sep 15 15:49:56 2005
@@ -1,17 +1,18 @@
---TEST--
-Bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler)
---SKIPIF--
-?php if (!extension_loaded(simplexml)) print skip; ?
---FILE--
-?php
-$xml = root/root;
-$xml = simplexml_load_string($xml);
-$kids = $xml-children();
-var_dump((bool)$kids);
-if($kids) echo bug\n; else echo ok\n;
-if(!$kids) echo ok\n; else echo bug\n;
-?
---EXPECT--
-bool(false)
-ok
-ok
+--TEST--
+Bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler)
+--SKIPIF--
+?php if (!extension_loaded(simplexml)) print skip; ?
+--FILE--
+?php
+$xml = root/root;
+$xml = simplexml_load_string($xml);
+$kids = $xml-children();
+var_dump((bool)$kids);
+if($kids) echo bug\n; else echo ok\n;
+if(!$kids) echo ok\n; else echo bug\n;
+?
+--EXPECT--
+bool(false)
+ok
+ok
+
http://cvs.php.net/diff.php/php-src/tests/classes/type_hinting_001.phpt?r1=1.3r2=1.3.2.1ty=u
Index: php-src/tests/classes/type_hinting_001.phpt
diff -u php-src/tests/classes/type_hinting_001.phpt:1.3
php-src/tests/classes/type_hinting_001.phpt:1.3.2.1
--- php-src/tests/classes/type_hinting_001.phpt:1.3 Fri Aug 5 05:35:09 2005
+++ php-src/tests/classes/type_hinting_001.phpt Thu Sep
RE: [PHP-CVS] cvs: php-src /ext/standard basic_functions.c
ZEND_SEND_PREFER_REF does pass by reference if it is possible and pass by value in other case (constants, temporary results). So it is does the same as pass by const. Thanks. Dmitry. -Original Message- From: Ilia Alshanetsky [mailto:[EMAIL PROTECTED] Sent: Thursday, September 15, 2005 8:17 PM To: Dmitry Stogov Cc: php-cvs@lists.php.net; 'Andi Gutmans'; 'Zeev Suraski' Subject: Re: [PHP-CVS] cvs: php-src /ext/standard basic_functions.c Dmitry, While passing by ref in this case would be a bit faster, but those two functions really should not be taking arguments by reference. What we really need is pass by const. Ilia Dmitry Stogov wrote: Hi Ilia, In php 5.1 and above we can use ZEND_SEND_PREFER_REF flag instead of ZEND_SEND_BY_REF. I think we should do it. Thanks. Dmitry. -Original Message- From: Ilia Alshanetsky [mailto:[EMAIL PROTECTED] Sent: Wednesday, September 14, 2005 6:11 PM To: Dmitry Stogov Cc: 'Ilia Alshanetsky'; php-cvs@lists.php.net; Andi Gutmans; Zeev Suraski Subject: Re: [PHP-CVS] cvs: php-src /ext/standard basic_functions.c Dmitry Stogov wrote: Are you sure? Passing by value may copy whole array. It makes the functions a TINY bit slower 0.06 seconds for 100 itterations, but makes it possible to pass return values of functions that return arrays. Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
