[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu May 11 05:31:48 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2341r2=1.2342diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2341 php-src/ChangeLog:1.2342 --- php-src/ChangeLog:1.2341Wed May 10 05:31:50 2006 +++ php-src/ChangeLog Thu May 11 05:31:48 2006 @@ -1,3 +1,197 @@ +2006-05-10 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ZendEngine2/tests/bug33771.phpt: + change it to be consistent with the others + +2006-05-10 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + ZendEngine2/tests/array_type_hint_001.phpt + ZendEngine2/tests/bug26166.phpt + ZendEngine2/tests/bug26166.phpt + ZendEngine2/tests/bug28444.phpt + ZendEngine2/tests/bug30791.phpt + ZendEngine2/tests/bug33771.phpt + ZendEngine2/tests/bug33996.phpt + tests/classes/interfaces_003.phpt: + - Fix tests + +* (PHP_5_2) + tests/lang/bug22367.phpt: + - No more ze1 + +* (PHP_5_2) + tests/run-test/test005.phpt + tests/run-test/test008.phpt + tests/run-test/test008a.phpt: + - Hardcoded error mode was changed to 8191 + +2006-05-10 Rasmus Lerdorf [EMAIL PROTECTED] + +* main/SAPI.c + sapi/apache/mod_php5.c: + MFB input filter hook for getenv() + +* main/php_variables.h: + MFB filter defines + +* (PHP_5_2) + NEWS + main/SAPI.c + sapi/apache/mod_php5.c: + Add input_filter hook call in getenv() + +2006-05-10 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + ZendEngine2/zend.c: + - Missing __ToString() sync + +* tests/classes/tostring_003.phpt + tests/classes/tostring_003.phpt: + + - Fix tests + +* ZendEngine2/zend_object_handlers.c + ZendEngine2/zend_object_handlers.c: + - Enforece rule of disallowing throw in __toString() + +2006-05-10 Rasmus Lerdorf [EMAIL PROTECTED] + +* (PHP_5_2) + main/php_variables.h: + Now that ext/filter is bundled, we should be defining these in one place + +2006-05-10 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/zend_compile.c: + - MFB missing initialization + +* (PHP_5_2) + php.ini-dist + php.ini-recommended + ZendEngine2/zend_execute.c + ext/dom/php_dom.c + ext/simplexml/simplexml.c: + - ze1 cleanup (bjori) /thx + +* (PHP_5_2) + ZendEngine2/zend.c + ZendEngine2/zend_API.c: + - Missing __tostring() conversion snippets + +* (PHP_5_2) + NEWS: + - Missed my name + +2006-05-10 Frank M. Kromann [EMAIL PROTECTED] + +* (PHP_5_2) + ext/dom/dom_iterators.c: + Fix win32 build + +2006-05-10 Rob Richards [EMAIL PROTECTED] + +* (PHP_5_2) + ext/com_dotnet/com_extension.c + ext/com_dotnet/com_handlers.c + ext/com_dotnet/com_iterator.c + ext/com_dotnet/com_saproxy.c + ext/com_dotnet/php_com_dotnet_internal.h: + - Update after api changes + +2006-05-10 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ZendEngine2/tests/error_reporting01.phpt + ZendEngine2/tests/error_reporting02.phpt + ZendEngine2/tests/error_reporting03.phpt + ZendEngine2/tests/error_reporting04.phpt + ZendEngine2/tests/error_reporting05.phpt + ZendEngine2/tests/error_reporting06.phpt + ZendEngine2/tests/error_reporting07.phpt + ZendEngine2/tests/error_reporting08.phpt + ZendEngine2/tests/error_reporting09.phpt + ZendEngine2/tests/error_reporting10.phpt: + fix tests + +* (PHP_5_2) + ZendEngine2/zend.c + ZendEngine2/zend_constants.c + main/main.c: + add missing parts of E_RECOVERABLE merge + +* (PHP_5_2) + ZendEngine2/zend_compile.c: + add missing ZEND_API to the implementation + +* (PHP_5_2) + ZendEngine2/zend_API.c: + nuke extra semi-colon + +2006-05-10 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/standard/string.c: + MFB: Fixed bug #37394 (substr_compare() returns an error when offset equals + string length). + +* (PHP_5_2) + NEWS + ext/standard/string.c: + Fixed bug #37394 (substr_compare() returns an error when offset equals + string length). + +2006-05-10 Andrey Hristov [EMAIL PROTECTED] + +* ext/mysqli/mysqli.c + ext/mysqli/mysqli_api.c: + MFB + +* (PHP_5_2) + ext/mysqli/mysqli.c + ext/mysqli/mysqli_api.c: + Don't allocate 2 chunks of memory when one can fit. Reduces memory + fragmentation. There is one more place that fragments memory but it will + complicate the ongoing Unicode upgrade of mysqli so leaving it away for + now. + +2006-05-10 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS + NEWS + ext/oci8/oci8.c + ext/oci8/oci8.c: + MFH: fix #37392 (Unnecessary call to OCITransRollback() at the end of + request) + +*
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu May 11 05:31:54 2006 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/ZendEngine2/ChangeLog?r1=1.908r2=1.909diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.908 ZendEngine2/ChangeLog:1.909 --- ZendEngine2/ChangeLog:1.908 Wed May 10 05:31:56 2006 +++ ZendEngine2/ChangeLog Thu May 11 05:31:54 2006 @@ -1,3 +1,82 @@ +2006-05-10 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + tests/bug33771.phpt: + change it to be consistent with the others + +2006-05-10 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + tests/array_type_hint_001.phpt + tests/bug26166.phpt + tests/bug26166.phpt + tests/bug28444.phpt + tests/bug30791.phpt + tests/bug33771.phpt + tests/bug33996.phpt: + - Fix tests + +* (PHP_5_2) + zend.c: + - Missing __ToString() sync + +* zend_object_handlers.c + zend_object_handlers.c: + - Enforece rule of disallowing throw in __toString() + +* zend_compile.c: + - MFB missing initialization + +* (PHP_5_2) + zend_execute.c: + - ze1 cleanup (bjori) /thx + +* (PHP_5_2) + zend.c + zend_API.c: + - Missing __tostring() conversion snippets + +2006-05-10 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + tests/error_reporting01.phpt + tests/error_reporting02.phpt + tests/error_reporting03.phpt + tests/error_reporting04.phpt + tests/error_reporting05.phpt + tests/error_reporting06.phpt + tests/error_reporting07.phpt + tests/error_reporting08.phpt + tests/error_reporting09.phpt + tests/error_reporting10.phpt: + fix tests + +* (PHP_5_2) + zend.c + zend_constants.c: + add missing parts of E_RECOVERABLE merge + +* (PHP_5_2) + zend_compile.c: + add missing ZEND_API to the implementation + +* (PHP_5_2) + zend_API.c: + nuke extra semi-colon + +2006-05-10 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + tests/bug27641.phpt + tests/bug30332.phpt + tests/bug31828.phpt + tests/bug32080.phpt + tests/bug32852.phpt + tests/bug33243.phpt + tests/bug34712.phpt + tests/bug34767.phpt: + i- ZE1_compat tests are no longer necessary + 2006-05-09 Marcus Boerger [EMAIL PROTECTED] * (PHP_5_2) @@ -13332,7 +13411,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.908 2006/05/10 05:31:56 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.909 2006/05/11 05:31:54 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -15056,7 +15135,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.908 2006/05/10 05:31:56 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.909 2006/05/11 05:31:54 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
helly Wed May 10 09:27:23 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - MFH news http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.8r2=1.2027.2.547.2.9diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.8 php-src/NEWS:1.2027.2.547.2.9 --- php-src/NEWS:1.2027.2.547.2.8 Wed May 10 02:47:21 2006 +++ php-src/NEWSWed May 10 09:27:23 2006 @@ -1,6 +1,15 @@ PHPNEWS ||| ?? ??? 2006, PHP 5.2.0 +- Removed ze1 compatibility mode. +- Added support for constructors in interfaces to force constructor signature + checks in implementations. (Marcus) +- Changed __toString to be called whereever applicable. (Marcus) +- Improved SPL: (Marcus) + . Added RegExIterator and RecursiveRegExIterator + . Added full caching support and ArrayAccess to CachingIterator. + . Added array functions to ArrayObject/ArrayIterator and made them faster. + . Added support for reading csv and skipping empty lines in SplFileObject. - Added run-time configurable backtracking/recursion limits for PCRE. (Andrei) - Added preg_last_error(). (Andrei) - Added support for Apache 2.2 handler in the Windows distro. (Edin) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 oci8.c
tony2001Wed May 10 10:06:57 2006 UTC
Modified files:
/php-src/ext/oci8 oci8.c
Log:
fix #37392 (Unnecessary call to OCITransRollback() at the end of request)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.297r2=1.298diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.297 php-src/ext/oci8/oci8.c:1.298
--- php-src/ext/oci8/oci8.c:1.297 Wed Apr 12 19:22:12 2006
+++ php-src/ext/oci8/oci8.c Wed May 10 10:06:57 2006
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.297 2006/04/12 19:22:12 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.298 2006/05/10 10:06:57 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -647,7 +647,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.297 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.298 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1718,7 +1718,9 @@
connection-descriptors = NULL;
}
- php_oci_connection_rollback(connection TSRMLS_CC);
+ if (connection-needs_commit) {
+ php_oci_connection_rollback(connection
TSRMLS_CC);
+ }
if (OCI_G(persistent_timeout) 0) {
connection-idle_expiry = timestamp +
OCI_G(persistent_timeout);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/oci8 oci8.c
tony2001Wed May 10 10:07:28 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/oci8 oci8.c
/php-srcNEWS
Log:
MFH: fix #37392 (Unnecessary call to OCITransRollback() at the end of request)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16r2=1.269.2.16.2.1diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16
php-src/ext/oci8/oci8.c:1.269.2.16.2.1
--- php-src/ext/oci8/oci8.c:1.269.2.16 Wed Apr 12 19:21:35 2006
+++ php-src/ext/oci8/oci8.c Wed May 10 10:07:28 2006
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.16 2006/04/12 19:21:35 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.1 2006/05/10 10:07:28 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -647,7 +647,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.269.2.16 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.269.2.16.2.1 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1718,7 +1718,9 @@
connection-descriptors = NULL;
}
- php_oci_connection_rollback(connection TSRMLS_CC);
+ if (connection-needs_commit) {
+ php_oci_connection_rollback(connection
TSRMLS_CC);
+ }
if (OCI_G(persistent_timeout) 0) {
connection-idle_expiry = timestamp +
OCI_G(persistent_timeout);
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.9r2=1.2027.2.547.2.10diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.9 php-src/NEWS:1.2027.2.547.2.10
--- php-src/NEWS:1.2027.2.547.2.9 Wed May 10 09:27:23 2006
+++ php-src/NEWSWed May 10 10:07:28 2006
@@ -15,6 +15,8 @@
- Added support for Apache 2.2 handler in the Windows distro. (Edin)
- Added pg_field_table() function. (Edin)
- Add implementation of curl_multi_info_read (Brian)
+- Fixed bug #37392 (Unnecessary call to OCITransRollback() at the end of
+ request). (Tony)
- Fixed bug #37376 (fastcgi.c compile fail with gcc 2.95.4). (Ilia)
- Fixed bug #37348 (make PEAR install ignore open_basedir). (Ilia)
- Fixed bug #37313 (sigemptyset() used without including signal.h).
--
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 /ext/oci8 oci8.c
tony2001Wed May 10 10:08:24 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/oci8 oci8.c
/php-srcNEWS
Log:
MFH: fix #37392 (Unnecessary call to OCITransRollback() at the end of request)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16r2=1.269.2.17diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16 php-src/ext/oci8/oci8.c:1.269.2.17
--- php-src/ext/oci8/oci8.c:1.269.2.16 Wed Apr 12 19:21:35 2006
+++ php-src/ext/oci8/oci8.c Wed May 10 10:08:23 2006
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.16 2006/04/12 19:21:35 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.17 2006/05/10 10:08:23 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -647,7 +647,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.269.2.16 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.269.2.17 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1718,7 +1718,9 @@
connection-descriptors = NULL;
}
- php_oci_connection_rollback(connection TSRMLS_CC);
+ if (connection-needs_commit) {
+ php_oci_connection_rollback(connection
TSRMLS_CC);
+ }
if (OCI_G(persistent_timeout) 0) {
connection-idle_expiry = timestamp +
OCI_G(persistent_timeout);
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.550r2=1.2027.2.551diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.550 php-src/NEWS:1.2027.2.551
--- php-src/NEWS:1.2027.2.550 Mon May 8 11:56:15 2006
+++ php-src/NEWSWed May 10 10:08:23 2006
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.?.?
+- Fixed bug #37392 (Unnecessary call to OCITransRollback() at the end of
+ request). (Tony)
- Fixed bug #37313 (sigemptyset() used without including signal.h).
(jdolecek)
- Fixed bug #37346 (invalid colormap format) (Pierre)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mysqli mysqli.c mysqli_api.c
andrey Wed May 10 11:53:13 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysqli mysqli.c mysqli_api.c
Log:
Don't allocate 2 chunks of memory when one can fit. Reduces memory
fragmentation. There is one more place that fragments memory but it will
complicate the ongoing Unicode upgrade of mysqli so leaving it away for now.
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.2r2=1.72.2.16.2.3diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.2
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.3
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.2 Tue May 9 23:58:46 2006
+++ php-src/ext/mysqli/mysqli.c Wed May 10 11:53:13 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.2 2006/05/09 23:58:46 helly Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.3 2006/05/10 11:53:13 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -69,10 +69,6 @@
return;
}
- if (bbuf.is_null) {
- efree(bbuf.is_null);
- }
-
for (i=0; i bbuf.var_cnt; i++) {
/* free temporary bind buffer */
@@ -89,9 +85,18 @@
efree(bbuf.vars);
}
+ /*
+ Don't free bbuf.is_null for FETCH_RESULT since we have allocated
+ is_null and buf in one block so we free only buf, which is the
beginning
+ of the block. When FETCH_SIMPLE then buf wasn't allocated together
with
+ buf and we have to free it.
+ */
if (type == FETCH_RESULT) {
efree(bbuf.buf);
+ } else if (type == FETCH_SIMPLE){
+ efree(bbuf.is_null);
}
+
bbuf.var_cnt = 0;
return;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.1r2=1.118.2.22.2.2diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.1
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.2
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.1 Mon May 8 15:06:51 2006
+++ php-src/ext/mysqli/mysqli_api.c Wed May 10 11:53:13 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.1 2006/05/08 15:06:51 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.2 2006/05/10 11:53:13 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -250,12 +250,16 @@
}
bind = (MYSQL_BIND *)ecalloc(var_cnt, sizeof(MYSQL_BIND));
- stmt-result.buf = (VAR_BUFFER *)ecalloc(var_cnt,sizeof(VAR_BUFFER));
- stmt-result.is_null = (char *)ecalloc(var_cnt, sizeof(char));
+ {
+ int size;
+ char *p= emalloc(size= var_cnt * (sizeof(char) +
sizeof(VAR_BUFFER)));
+ stmt-result.buf = (VAR_BUFFER *) p;
+ stmt-result.is_null = p + var_cnt * sizeof(VAR_BUFFER);
+ memset(p, 0, size);
+ }
for (i=start; i var_cnt + start ; i++) {
ofs = i - start;
- stmt-result.is_null[ofs] = 0;
col_type = (stmt-stmt-fields) ? stmt-stmt-fields[ofs].type
: MYSQL_TYPE_STRING;
switch (col_type) {
@@ -373,8 +377,8 @@
efree(stmt-result.buf[i].val);
}
}
+ /* Don't free stmt-result.is_null because is_null buf are
one block of memory */
efree(stmt-result.buf);
- efree(stmt-result.is_null);
RETVAL_FALSE;
} else {
stmt-result.var_cnt = var_cnt;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xmlreader php_xmlreader.c php_xmlreader.h
rrichards Wed May 10 11:58:57 2006 UTC
Modified files:
/php-src/ext/xmlreader php_xmlreader.c php_xmlreader.h
Log:
- revert back to using internal buffer
origional string may be modified during parse causing possible crash
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.32r2=1.33diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.32
php-src/ext/xmlreader/php_xmlreader.c:1.33
--- php-src/ext/xmlreader/php_xmlreader.c:1.32 Fri Mar 31 23:20:58 2006
+++ php-src/ext/xmlreader/php_xmlreader.c Wed May 10 11:58:56 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_xmlreader.c,v 1.32 2006/03/31 23:20:58 pajoye Exp $ */
+/* $Id: php_xmlreader.c,v 1.33 2006/05/10 11:58:56 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -54,6 +54,7 @@
#define XMLREADER_LOAD_STRING 0
#define XMLREADER_LOAD_FILE 1
+
/* {{{ xmlreader_register_prop_handler */
static void xmlreader_register_prop_handler(HashTable *prop_handler, char
*name, xmlreader_read_int_t read_int_func, xmlreader_read_const_char_t
read_char_func, int rettype TSRMLS_DC)
{
@@ -65,6 +66,7 @@
zend_hash_add(prop_handler, name, strlen(name)+1, hnd,
sizeof(xmlreader_prop_handler), NULL);
}
/* }}} */
+
/* {{{ xmlreader_property_reader */
static int xmlreader_property_reader(xmlreader_object *obj,
xmlreader_prop_handler *hnd, zval **retval TSRMLS_DC)
{
@@ -359,6 +361,11 @@
/* {{{ xmlreader_free_resources */
static void xmlreader_free_resources(xmlreader_object *intern) {
if (intern) {
+ if (intern-input) {
+ xmlFreeParserInputBuffer(intern-input);
+ intern-input = NULL;
+ }
+
if (intern-ptr) {
xmlFreeTextReader(intern-ptr);
intern-ptr = NULL;
@@ -396,6 +403,7 @@
intern = emalloc(sizeof(xmlreader_object));
memset(intern-std, 0, sizeof(zend_object));
intern-ptr = NULL;
+ intern-input = NULL;
intern-schema = NULL;
intern-prop_handler = xmlreader_prop_handlers;
@@ -1050,6 +1058,7 @@
char *source, *uri = NULL, *encoding = NULL;
int resolved_path_len;
char *directory=NULL, resolved_path[MAXPATHLEN];
+ xmlParserInputBufferPtr inputbfr;
xmlTextReaderPtr reader;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s!l, source,
source_len, encoding, encoding_len, options) == FAILURE) {
@@ -1070,39 +1079,43 @@
RETURN_FALSE;
}
+ inputbfr = xmlParserInputBufferCreateMem(source, source_len,
XML_CHAR_ENCODING_NONE);
+
+if (inputbfr != NULL) {
/* Get the URI of the current script so that we can set the base directory in
libxml */
#if HAVE_GETCWD
- directory = VCWD_GETCWD(resolved_path, MAXPATHLEN);
+ directory = VCWD_GETCWD(resolved_path, MAXPATHLEN);
#elif HAVE_GETWD
- directory = VCWD_GETWD(resolved_path);
+ directory = VCWD_GETWD(resolved_path);
#endif
- if (directory) {
- resolved_path_len = strlen(resolved_path);
- if (resolved_path[resolved_path_len - 1] != DEFAULT_SLASH) {
- resolved_path[resolved_path_len] = DEFAULT_SLASH;
- resolved_path[++resolved_path_len] = '\0';
+ if (directory) {
+ resolved_path_len = strlen(resolved_path);
+ if (resolved_path[resolved_path_len - 1] !=
DEFAULT_SLASH) {
+ resolved_path[resolved_path_len] =
DEFAULT_SLASH;
+ resolved_path[++resolved_path_len] = '\0';
+ }
+ uri = (char *) xmlCanonicPath((const xmlChar *)
resolved_path);
}
- uri = (char *) xmlCanonicPath((const xmlChar *) resolved_path);
- }
-
- reader = xmlReaderForMemory(source, source_len, uri, encoding, options);
-
- if (uri) {
- xmlFree(uri);
- }
-
- if (reader != NULL) {
- if (id == NULL) {
- object_init_ex(return_value, xmlreader_class_entry);
- intern = (xmlreader_object
*)zend_objects_get_address(return_value TSRMLS_CC);
+ reader = xmlNewTextReader(inputbfr, uri);
+ if (uri) {
+ xmlFree(uri);
+ }
+ if (reader != NULL) {
+ if (id == NULL) {
+ object_init_ex(return_value,
xmlreader_class_entry);
+ intern = (xmlreader_object
*)zend_objects_get_address(return_value TSRMLS_CC);
+ } else {
+ RETVAL_TRUE;
+ }
+
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlreader php_xmlreader.c php_xmlreader.h /ext/xmlreader/tests 013.phpt 013.xsd
rrichards Wed May 10 12:04:47 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/xmlreader/tests013.phpt 013.xsd
Modified files:
/php-src/ext/xmlreader php_xmlreader.c php_xmlreader.h
Log:
Synch with HEAD
add readInnerXML, readOuterXML, readString, and setSchema functionality
allow parser options to be passed when loading reader
optimization: use xmlTextReader const functions for string properties
add test
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.14r2=1.13.2.14.2.1diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14
php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14.2.1
--- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.14 Mon Apr 3 14:59:30 2006
+++ php-src/ext/xmlreader/php_xmlreader.c Wed May 10 12:04:46 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_xmlreader.c,v 1.13.2.14 2006/04/03 14:59:30 tony2001 Exp $ */
+/* $Id: php_xmlreader.c,v 1.13.2.14.2.1 2006/05/10 12:04:46 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -40,21 +40,23 @@
typedef int (*xmlreader_read_int_t)(xmlTextReaderPtr reader);
typedef unsigned char *(*xmlreader_read_char_t)(xmlTextReaderPtr reader);
+typedef const unsigned char *(*xmlreader_read_const_char_t)(xmlTextReaderPtr
reader);
typedef int (*xmlreader_write_t)(xmlreader_object *obj, zval *newval
TSRMLS_DC);
typedef unsigned char *(*xmlreader_read_one_char_t)(xmlTextReaderPtr reader,
const unsigned char *);
typedef struct _xmlreader_prop_handler {
xmlreader_read_int_t read_int_func;
- xmlreader_read_char_t read_char_func;
+ xmlreader_read_const_char_t read_char_func;
xmlreader_write_t write_func;
int type;
} xmlreader_prop_handler;
#define XMLREADER_LOAD_STRING 0
#define XMLREADER_LOAD_FILE 1
+
/* {{{ xmlreader_register_prop_handler */
-static void xmlreader_register_prop_handler(HashTable *prop_handler, char
*name, xmlreader_read_int_t read_int_func, xmlreader_read_char_t
read_char_func, int rettype TSRMLS_DC)
+static void xmlreader_register_prop_handler(HashTable *prop_handler, char
*name, xmlreader_read_int_t read_int_func, xmlreader_read_const_char_t
read_char_func, int rettype TSRMLS_DC)
{
xmlreader_prop_handler hnd;
@@ -68,7 +70,7 @@
/* {{{ xmlreader_property_reader */
static int xmlreader_property_reader(xmlreader_object *obj,
xmlreader_prop_handler *hnd, zval **retval TSRMLS_DC)
{
- char *retchar = NULL;
+ const xmlChar *retchar = NULL;
int retint = 0;
if (obj-ptr != NULL) {
@@ -90,8 +92,7 @@
switch (hnd-type) {
case IS_STRING:
if (retchar) {
- ZVAL_STRING(*retval, retchar, 1);
- xmlFree(retchar);
+ ZVAL_STRING(*retval, (xmlChar *) retchar, 1);
} else {
ZVAL_EMPTY_STRING(*retval);
}
@@ -377,20 +378,8 @@
{
xmlreader_object *intern = (xmlreader_object *)object;
-#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION == 1 PHP_RELEASE_VERSION
2) || (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION 1) || (PHP_MAJOR_VERSION
5)
zend_object_std_dtor(intern-std TSRMLS_CC);
-#else
- if (intern-std.guards) {
- zend_hash_destroy(intern-std.guards);
- FREE_HASHTABLE(intern-std.guards);
- }
-
- if (intern-std.properties) {
- zend_hash_destroy(intern-std.properties);
- FREE_HASHTABLE(intern-std.properties);
- }
-#endif
-
+
xmlreader_free_resources(intern);
efree(object);
@@ -405,21 +394,13 @@
zval *tmp;
intern = emalloc(sizeof(xmlreader_object));
+ memset(intern-std, 0, sizeof(zend_object));
intern-ptr = NULL;
intern-input = NULL;
intern-schema = NULL;
intern-prop_handler = xmlreader_prop_handlers;
-#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION == 1 PHP_RELEASE_VERSION
2) || (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION 1) || (PHP_MAJOR_VERSION
5)
zend_object_std_init(intern-std, class_type TSRMLS_CC);
-#else
- ALLOC_HASHTABLE(intern-std.properties);
- zend_hash_init(intern-std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-
- intern-std.ce = class_type;
- intern-std.guards = NULL;
-#endif
-
zend_hash_copy(intern-std.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t) xmlreader_objects_free_storage,
xmlreader_objects_clone TSRMLS_CC);
intern-handle =
[PHP-CVS] cvs: php-src /ext/mysqli mysqli.c mysqli_api.c
andrey Wed May 10 12:29:10 2006 UTC
Modified files:
/php-src/ext/mysqli mysqli.c mysqli_api.c
Log:
MFB
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli.c?r1=1.87r2=1.88diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.87 php-src/ext/mysqli/mysqli.c:1.88
--- php-src/ext/mysqli/mysqli.c:1.87Tue May 9 11:27:20 2006
+++ php-src/ext/mysqli/mysqli.c Wed May 10 12:29:09 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.87 2006/05/09 11:27:20 georg Exp $
+ $Id: mysqli.c,v 1.88 2006/05/10 12:29:09 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -69,10 +69,6 @@
return;
}
- if (bbuf.is_null) {
- efree(bbuf.is_null);
- }
-
for (i=0; i bbuf.var_cnt; i++) {
/* free temporary bind buffer */
@@ -89,9 +85,18 @@
efree(bbuf.vars);
}
+ /*
+ Don't free bbuf.is_null for FETCH_RESULT since we have allocated
+ is_null and buf in one block so we free only buf, which is the
beginning
+ of the block. When FETCH_SIMPLE then buf wasn't allocated together
with
+ buf and we have to free it.
+ */
if (type == FETCH_RESULT) {
efree(bbuf.buf);
+ } else if (type == FETCH_SIMPLE){
+ efree(bbuf.is_null);
}
+
bbuf.var_cnt = 0;
return;
}
@@ -158,16 +163,16 @@
efree(mysql);
my_res-ptr = NULL;
}
- } else if (instanceof_function(intern-zo.ce, mysqli_stmt_class_entry
TSRMLS_CC)) { /* stmt obj */
+ } else if (instanceof_function(intern-zo.ce, mysqli_stmt_class_entry
TSRMLS_CC)) { /* stmt object */
if (my_res my_res-ptr) {
MY_STMT *stmt = (MY_STMT *)my_res-ptr;
php_clear_stmt_bind(stmt);
}
- } else if (instanceof_function(intern-zo.ce, mysqli_result_class_entry
TSRMLS_CC)) { /* result obj */
+ } else if (instanceof_function(intern-zo.ce, mysqli_result_class_entry
TSRMLS_CC)) { /* result object */
if (my_res my_res-ptr) {
mysql_free_result(my_res-ptr);
}
- } else if (instanceof_function(intern-zo.ce,
mysqli_warning_class_entry TSRMLS_CC)) { /* warning obj */
+ } else if (instanceof_function(intern-zo.ce,
mysqli_warning_class_entry TSRMLS_CC)) { /* warning object */
if (my_res my_res-ptr) {
php_clear_warnings((MYSQLI_WARNING *)my_res-info);
}
@@ -453,7 +458,7 @@
zend_hash_init(mysqli_driver_properties, 0, NULL, NULL, 1);
MYSQLI_ADD_PROPERTIES(mysqli_driver_properties,
mysqli_driver_property_entries);
zend_hash_add(classes, ce-name.s, ce-name_length+1,
mysqli_driver_properties, sizeof(mysqli_driver_properties), NULL);
-ce-ce_flags |= ZEND_ACC_FINAL_CLASS;
+ ce-ce_flags |= ZEND_ACC_FINAL_CLASS;
REGISTER_MYSQLI_CLASS_ENTRY(mysqli, mysqli_link_class_entry,
mysqli_link_methods);
ce = mysqli_link_class_entry;
@@ -463,7 +468,7 @@
REGISTER_MYSQLI_CLASS_ENTRY(mysqli_warning,
mysqli_warning_class_entry, mysqli_warning_methods);
ce = mysqli_warning_class_entry;
-ce-ce_flags |= ZEND_ACC_FINAL_CLASS | ZEND_ACC_PROTECTED;
+ ce-ce_flags |= ZEND_ACC_FINAL_CLASS | ZEND_ACC_PROTECTED;
zend_hash_init(mysqli_warning_properties, 0, NULL, NULL, 1);
MYSQLI_ADD_PROPERTIES(mysqli_warning_properties,
mysqli_warning_property_entries);
zend_hash_add(classes, ce-name.s, ce-name_length+1,
mysqli_warning_properties, sizeof(mysqli_warning_properties), NULL);
@@ -560,11 +565,14 @@
REGISTER_LONG_CONSTANT(MYSQLI_TYPE_CHAR, FIELD_TYPE_CHAR, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQLI_TYPE_INTERVAL, FIELD_TYPE_INTERVAL,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQLI_TYPE_GEOMETRY, FIELD_TYPE_GEOMETRY,
CONST_CS | CONST_PERSISTENT);
+
#if MYSQL_VERSION_ID 50002
REGISTER_LONG_CONSTANT(MYSQLI_TYPE_NEWDECIMAL, FIELD_TYPE_NEWDECIMAL,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQLI_TYPE_BIT, FIELD_TYPE_BIT, CONST_CS |
CONST_PERSISTENT);
#endif
+
+
/* replication */
REGISTER_LONG_CONSTANT(MYSQLI_RPL_MASTER, MYSQL_RPL_MASTER, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(MYSQLI_RPL_SLAVE, MYSQL_RPL_SLAVE, CONST_CS |
CONST_PERSISTENT);
@@ -693,7 +701,7 @@
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1,
sizeof(MYSQLI_RESOURCE));
mysqli_resource-ptr = (void *)stmt;
mysqli_resource-status = (ZEND_NUM_ARGS() == 1) ?
MYSQLI_STATUS_INITIALIZED : MYSQLI_STATUS_VALID;
-
+
((mysqli_object
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard string.c
iliaa Wed May 10 13:07:15 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/standard string.c
Log:
Fixed bug #37394 (substr_compare() returns an error when offset equals
string length).
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.10r2=1.2027.2.547.2.11diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.10 php-src/NEWS:1.2027.2.547.2.11
--- php-src/NEWS:1.2027.2.547.2.10 Wed May 10 10:07:28 2006
+++ php-src/NEWSWed May 10 13:07:15 2006
@@ -15,6 +15,8 @@
- Added support for Apache 2.2 handler in the Windows distro. (Edin)
- Added pg_field_table() function. (Edin)
- Add implementation of curl_multi_info_read (Brian)
+- Fixed bug #37394 (substr_compare() returns an error when offset equals
+ string length). (Ilia)
- Fixed bug #37392 (Unnecessary call to OCITransRollback() at the end of
request). (Tony)
- Fixed bug #37376 (fastcgi.c compile fail with gcc 2.95.4). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/string.c?r1=1.445.2.14r2=1.445.2.14.2.1diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14
php-src/ext/standard/string.c:1.445.2.14.2.1
--- php-src/ext/standard/string.c:1.445.2.14Tue Apr 25 12:48:41 2006
+++ php-src/ext/standard/string.c Wed May 10 13:07:15 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14 2006/04/25 12:48:41 tony2001 Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.1 2006/05/10 13:07:15 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4894,7 +4894,7 @@
offset = (offset 0) ? 0 : offset;
}
- if ((offset + len) = s1_len) {
+ if ((offset + len) s1_len) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, The start position
cannot exceed initial string length);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
iliaa Wed May 10 13:07:56 2006 UTC
Modified files:
/php-src/ext/standard string.c
Log:
MFB: Fixed bug #37394 (substr_compare() returns an error when offset equals
string length).
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/string.c?r1=1.541r2=1.542diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.541 php-src/ext/standard/string.c:1.542
--- php-src/ext/standard/string.c:1.541 Tue Apr 25 12:49:04 2006
+++ php-src/ext/standard/string.c Wed May 10 13:07:56 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.541 2006/04/25 12:49:04 tony2001 Exp $ */
+/* $Id: string.c,v 1.542 2006/05/10 13:07:56 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -6824,7 +6824,7 @@
offset = (offset 0) ? 0 : offset;
}
- if ((offset + len) = s1_len) {
+ if ((offset + len) s1_len) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, The start position
cannot exceed initial string length);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main main.c ZendEngine2 zend.c zend_constants.c
tony2001Wed May 10 14:04:18 2006 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2zend.c zend_constants.c
/php-src/main main.c
Log:
add missing parts of E_RECOVERABLE merge
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.1r2=1.308.2.12.2.2diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.308.2.12.2.1 ZendEngine2/zend.c:1.308.2.12.2.2
--- ZendEngine2/zend.c:1.308.2.12.2.1 Tue May 9 23:53:22 2006
+++ ZendEngine2/zend.c Wed May 10 14:04:18 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.c,v 1.308.2.12.2.1 2006/05/09 23:53:22 helly Exp $ */
+/* $Id: zend.c,v 1.308.2.12.2.2 2006/05/10 14:04:18 tony2001 Exp $ */
#include zend.h
#include zend_extensions.h
@@ -923,6 +923,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/viewcvs.cgi/ZendEngine2/zend_constants.c?r1=1.71.2.5r2=1.71.2.5.2.1diff_format=u
Index: ZendEngine2/zend_constants.c
diff -u ZendEngine2/zend_constants.c:1.71.2.5
ZendEngine2/zend_constants.c:1.71.2.5.2.1
--- ZendEngine2/zend_constants.c:1.71.2.5 Wed Mar 15 14:12:26 2006
+++ ZendEngine2/zend_constants.cWed May 10 14:04:18 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_constants.c,v 1.71.2.5 2006/03/15 14:12:26 dmitry Exp $ */
+/* $Id: zend_constants.c,v 1.71.2.5.2.1 2006/05/10 14:04:18 tony2001 Exp $ */
#include zend.h
#include zend_constants.h
@@ -96,6 +96,7 @@
void zend_register_standard_constants(TSRMLS_D)
{
REGISTER_MAIN_LONG_CONSTANT(E_ERROR, E_ERROR, CONST_PERSISTENT |
CONST_CS);
+ REGISTER_MAIN_LONG_CONSTANT(E_RECOVERABLE_ERROR, E_RECOVERABLE_ERROR,
CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT(E_WARNING, E_WARNING, CONST_PERSISTENT |
CONST_CS);
REGISTER_MAIN_LONG_CONSTANT(E_PARSE, E_PARSE, CONST_PERSISTENT |
CONST_CS);
REGISTER_MAIN_LONG_CONSTANT(E_NOTICE, E_NOTICE, CONST_PERSISTENT |
CONST_CS);
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.23r2=1.640.2.23.2.1diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23 php-src/main/main.c:1.640.2.23.2.1
--- php-src/main/main.c:1.640.2.23 Wed Apr 12 12:49:39 2006
+++ php-src/main/main.c Wed May 10 14:04:18 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23 2006/04/12 12:49:39 tony2001 Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.1 2006/05/10 14:04:18 tony2001 Exp $ */
/* {{{ includes
*/
@@ -725,6 +725,9 @@
case E_USER_ERROR:
error_type_str = Fatal error;
break;
+ case E_RECOVERABLE_ERROR:
+ error_type_str = Catchable fatal error;
+ break;
case E_WARNING:
case E_CORE_WARNING:
case E_COMPILE_WARNING:
@@ -814,6 +817,7 @@
}
/* no break - intentionally */
case E_ERROR:
+ case E_RECOVERABLE_ERROR:
/* case E_PARSE: the parser would return 1 (failure), we can
bail out nicely */
case E_COMPILE_ERROR:
case E_USER_ERROR:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/com_dotnet com_extension.c com_handlers.c com_iterator.c com_saproxy.c php_com_dotnet_internal.h
rrichards Wed May 10 14:39:11 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/com_dotnet com_extension.c com_handlers.c
com_iterator.c com_saproxy.c
php_com_dotnet_internal.h
Log:
- Update after api changes
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_extension.c?r1=1.17.2.2r2=1.17.2.2.2.1diff_format=u
Index: php-src/ext/com_dotnet/com_extension.c
diff -u php-src/ext/com_dotnet/com_extension.c:1.17.2.2
php-src/ext/com_dotnet/com_extension.c:1.17.2.2.2.1
--- php-src/ext/com_dotnet/com_extension.c:1.17.2.2 Sun Jan 1 12:50:00 2006
+++ php-src/ext/com_dotnet/com_extension.c Wed May 10 14:39:10 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_extension.c,v 1.17.2.2 2006/01/01 12:50:00 sniper Exp $ */
+/* $Id: com_extension.c,v 1.17.2.2.2.1 2006/05/10 14:39:10 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -192,7 +192,7 @@
php_com_persist_minit(INIT_FUNC_ARGS_PASSTHRU);
INIT_CLASS_ENTRY(ce, com_exception, NULL);
- php_com_exception_class_entry = zend_register_internal_class_ex(ce,
zend_exception_get_default(), NULL TSRMLS_CC);
+ php_com_exception_class_entry = zend_register_internal_class_ex(ce,
zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);
php_com_exception_class_entry-ce_flags |= ZEND_ACC_FINAL;
/* php_com_exception_class_entry-constructor-common.fn_flags |=
ZEND_ACC_PROTECTED; */
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_handlers.c?r1=1.30.2.5r2=1.30.2.5.2.1diff_format=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.30.2.5
php-src/ext/com_dotnet/com_handlers.c:1.30.2.5.2.1
--- php-src/ext/com_dotnet/com_handlers.c:1.30.2.5 Tue Feb 7 11:50:54 2006
+++ php-src/ext/com_dotnet/com_handlers.c Wed May 10 14:39:10 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_handlers.c,v 1.30.2.5 2006/02/07 11:50:54 rrichards Exp $ */
+/* $Id: com_handlers.c,v 1.30.2.5.2.1 2006/05/10 14:39:10 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -486,17 +486,12 @@
return ret;
}
-static int com_object_cast(zval *readobj, zval *writeobj, int type, int
should_free TSRMLS_DC)
+static int com_object_cast(zval *readobj, zval *writeobj, int type TSRMLS_DC)
{
php_com_dotnet_object *obj;
VARIANT v;
VARTYPE vt = VT_EMPTY;
- zval free_obj;
HRESULT res = S_OK;
-
- if (should_free) {
- free_obj = *writeobj;
- }
obj = CDNO_FETCH(readobj);
ZVAL_NULL(writeobj);
@@ -538,10 +533,6 @@
VariantClear(v);
- if (should_free) {
- zval_dtor(free_obj);
- }
-
if (SUCCEEDED(res)) {
return SUCCESS;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_iterator.c?r1=1.9.2.2r2=1.9.2.2.2.1diff_format=u
Index: php-src/ext/com_dotnet/com_iterator.c
diff -u php-src/ext/com_dotnet/com_iterator.c:1.9.2.2
php-src/ext/com_dotnet/com_iterator.c:1.9.2.2.2.1
--- php-src/ext/com_dotnet/com_iterator.c:1.9.2.2 Tue Feb 7 11:50:54 2006
+++ php-src/ext/com_dotnet/com_iterator.c Wed May 10 14:39:10 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_iterator.c,v 1.9.2.2 2006/02/07 11:50:54 rrichards Exp $ */
+/* $Id: com_iterator.c,v 1.9.2.2.2.1 2006/05/10 14:39:10 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -139,7 +139,7 @@
NULL
};
-zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object
TSRMLS_DC)
+zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int
by_ref TSRMLS_DC)
{
php_com_dotnet_object *obj;
struct php_com_iterator *I;
@@ -149,6 +149,10 @@
unsigned long n_fetched;
zval *ptr;
+ if (by_ref) {
+ zend_error(E_ERROR, An iterator cannot be used with foreach by
reference);
+ }
+
obj = CDNO_FETCH(object);
if (V_VT(obj-v) != VT_DISPATCH !V_ISARRAY(obj-v)) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_saproxy.c?r1=1.15.2.2r2=1.15.2.2.2.1diff_format=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.15.2.2
php-src/ext/com_dotnet/com_saproxy.c:1.15.2.2.2.1
--- php-src/ext/com_dotnet/com_saproxy.c:1.15.2.2 Sun Jan 1 12:50:00 2006
+++ php-src/ext/com_dotnet/com_saproxy.cWed May 10 14:39:10 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: com_saproxy.c,v 1.15.2.2 2006/01/01 12:50:00 sniper Exp $ */
+/* $Id: com_saproxy.c,v 1.15.2.2.2.1 2006/05/10 14:39:10 rrichards Exp $ */
/* This module
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_iterators.c spl_iterators.h /ext/spl/tests iterator_029.phpt
andrei Wed May 10 16:50:58 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/splspl_iterators.c spl_iterators.h
/php-src/ext/spl/tests iterator_029.phpt
Log:
Rename RegExIterator - RegexIterator.
Also rename recursive one.
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.2r2=1.73.2.30.2.3diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.2
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.3
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.2 Wed May 10 00:29:42 2006
+++ php-src/ext/spl/spl_iterators.c Wed May 10 16:50:57 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.2 2006/05/10 00:29:42 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.3 2006/05/10 16:50:57 andrei Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -55,8 +55,8 @@
PHPAPI zend_class_entry *spl_ce_InfiniteIterator;
PHPAPI zend_class_entry *spl_ce_EmptyIterator;
PHPAPI zend_class_entry *spl_ce_AppendIterator;
-PHPAPI zend_class_entry *spl_ce_RegExIterator;
-PHPAPI zend_class_entry *spl_ce_RecursiveRegExIterator;
+PHPAPI zend_class_entry *spl_ce_RegexIterator;
+PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
zend_function_entry spl_funcs_RecursiveIterator[] = {
SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL)
@@ -933,8 +933,8 @@
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
return intern;
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
- case DIT_RegExIterator:
- case DIT_RecursiveRegExIterator: {
+ case DIT_RegexIterator:
+ case DIT_RecursiveRegexIterator: {
char *regex;
int len, poptions, coptions;
pcre_extra *extra = NULL;
@@ -1280,16 +1280,16 @@
} /* }}} */
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
-/* {{{ proto void RegExIterator::__construct(Iterator it, string $regex [, int
$flags])
- Create an RegExIterator from another iterator and a regular expression */
-SPL_METHOD(RegExIterator, __construct)
+/* {{{ proto void RegexIterator::__construct(Iterator it, string $regex [, int
$flags])
+ Create an RegexIterator from another iterator and a regular expression */
+SPL_METHOD(RegexIterator, __construct)
{
- spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RegExIterator, zend_ce_iterator, DIT_RegExIterator);
+ spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RegexIterator, zend_ce_iterator, DIT_RegexIterator);
} /* }}} */
-/* {{{ proto bool RegExIterator::accept()
+/* {{{ proto bool RegexIterator::accept()
Match (string)current() against regular expression */
-SPL_METHOD(RegExIterator, accept)
+SPL_METHOD(RegexIterator, accept)
{
spl_dual_it_object *intern;
int count;
@@ -1330,11 +1330,11 @@
RETURN_BOOL(count = 0);
} /* }}} */
-/* {{{ proto void RecursiveRegExIterator::__construct(RecursiveIterator it,
string $regex [, int $flags])
- Create an RecursiveRegExIterator from another recursive iterator and a
regular expression */
-SPL_METHOD(RecursiveRegExIterator, __construct)
+/* {{{ proto void RecursiveRegexIterator::__construct(RecursiveIterator it,
string $regex [, int $flags])
+ Create an RecursiveRegexIterator from another recursive iterator and a
regular expression */
+SPL_METHOD(RecursiveRegexIterator, __construct)
{
- spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RecursiveRegExIterator, spl_ce_RecursiveIterator,
DIT_RecursiveRegExIterator);
+ spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RecursiveRegexIterator, spl_ce_RecursiveIterator,
DIT_RecursiveRegexIterator);
} /* }}} */
#endif
@@ -1368,7 +1368,7 @@
}
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
- if (object-dit_type == DIT_RegExIterator || object-dit_type ==
DIT_RecursiveRegExIterator) {
+ if (object-dit_type == DIT_RegexIterator || object-dit_type ==
DIT_RecursiveRegexIterator) {
if (object-u.regex.pce) {
object-u.regex.pce-refcount--;
}
@@ -1448,9 +1448,9 @@
ZEND_ARG_INFO(0, flags)
ZEND_END_ARG_INFO();
-static zend_function_entry spl_funcs_RegExIterator[] = {
- SPL_ME(RegExIterator, __construct, arginfo_regex_it___construct,
ZEND_ACC_PUBLIC)
- SPL_ME(RegExIterator, accept, NULL, ZEND_ACC_PUBLIC)
+static zend_function_entry spl_funcs_RegexIterator[] = {
+ SPL_ME(RegexIterator, __construct, arginfo_regex_it___construct,
ZEND_ACC_PUBLIC)
+ SPL_ME(RegexIterator, accept, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
@@ -1461,8 +1461,8 @@
ZEND_ARG_INFO(0, flags)
ZEND_END_ARG_INFO();
-static zend_function_entry
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c spl_iterators.h /ext/spl/tests iterator_029.phpt
andrei Wed May 10 16:51:18 2006 UTC
Modified files:
/php-src/ext/splspl_iterators.c spl_iterators.h
/php-src/ext/spl/tests iterator_029.phpt
Log:
MFB
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.124r2=1.125diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.124
php-src/ext/spl/spl_iterators.c:1.125
--- php-src/ext/spl/spl_iterators.c:1.124 Thu Apr 13 13:21:59 2006
+++ php-src/ext/spl/spl_iterators.c Wed May 10 16:51:18 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.124 2006/04/13 13:21:59 tony2001 Exp $ */
+/* $Id: spl_iterators.c,v 1.125 2006/05/10 16:51:18 andrei Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -55,8 +55,8 @@
PHPAPI zend_class_entry *spl_ce_InfiniteIterator;
PHPAPI zend_class_entry *spl_ce_EmptyIterator;
PHPAPI zend_class_entry *spl_ce_AppendIterator;
-PHPAPI zend_class_entry *spl_ce_RegExIterator;
-PHPAPI zend_class_entry *spl_ce_RecursiveRegExIterator;
+PHPAPI zend_class_entry *spl_ce_RegexIterator;
+PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
zend_function_entry spl_funcs_RecursiveIterator[] = {
SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL)
@@ -942,8 +942,8 @@
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
return intern;
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
- case DIT_RegExIterator:
- case DIT_RecursiveRegExIterator: {
+ case DIT_RegexIterator:
+ case DIT_RecursiveRegexIterator: {
char *regex;
int len, poptions, coptions;
pcre_extra *extra = NULL;
@@ -1291,16 +1291,16 @@
} /* }}} */
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
-/* {{{ proto void RegExIterator::__construct(Iterator it, string $regex [, int
$flags])
- Create an RegExIterator from another iterator and a regular expression */
-SPL_METHOD(RegExIterator, __construct)
+/* {{{ proto void RegexIterator::__construct(Iterator it, string $regex [, int
$flags])
+ Create an RegexIterator from another iterator and a regular expression */
+SPL_METHOD(RegexIterator, __construct)
{
- spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RegExIterator, zend_ce_iterator, DIT_RegExIterator);
+ spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RegexIterator, zend_ce_iterator, DIT_RegexIterator);
} /* }}} */
-/* {{{ proto bool RegExIterator::accept()
+/* {{{ proto bool RegexIterator::accept()
Match (string)current() against regular expression */
-SPL_METHOD(RegExIterator, accept)
+SPL_METHOD(RegexIterator, accept)
{
spl_dual_it_object *intern;
int count;
@@ -1341,11 +1341,11 @@
RETURN_BOOL(count = 0);
} /* }}} */
-/* {{{ proto void RecursiveRegExIterator::__construct(RecursiveIterator it,
string $regex [, int $flags])
- Create an RecursiveRegExIterator from another recursive iterator and a
regular expression */
-SPL_METHOD(RecursiveRegExIterator, __construct)
+/* {{{ proto void RecursiveRegexIterator::__construct(RecursiveIterator it,
string $regex [, int $flags])
+ Create an RecursiveRegexIterator from another recursive iterator and a
regular expression */
+SPL_METHOD(RecursiveRegexIterator, __construct)
{
- spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RecursiveRegExIterator, spl_ce_RecursiveIterator,
DIT_RecursiveRegExIterator);
+ spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RecursiveRegexIterator, spl_ce_RecursiveIterator,
DIT_RecursiveRegexIterator);
} /* }}} */
#endif
@@ -1379,7 +1379,7 @@
}
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
- if (object-dit_type == DIT_RegExIterator || object-dit_type ==
DIT_RecursiveRegExIterator) {
+ if (object-dit_type == DIT_RegexIterator || object-dit_type ==
DIT_RecursiveRegexIterator) {
if (object-u.regex.pce) {
object-u.regex.pce-refcount--;
}
@@ -1459,9 +1459,9 @@
ZEND_ARG_INFO(0, flags)
ZEND_END_ARG_INFO();
-static zend_function_entry spl_funcs_RegExIterator[] = {
- SPL_ME(RegExIterator, __construct, arginfo_regex_it___construct,
ZEND_ACC_PUBLIC)
- SPL_ME(RegExIterator, accept, NULL, ZEND_ACC_PUBLIC)
+static zend_function_entry spl_funcs_RegexIterator[] = {
+ SPL_ME(RegexIterator, __construct, arginfo_regex_it___construct,
ZEND_ACC_PUBLIC)
+ SPL_ME(RegexIterator, accept, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
@@ -1472,8 +1472,8 @@
ZEND_ARG_INFO(0, flags)
ZEND_END_ARG_INFO();
-static zend_function_entry spl_funcs_RecursiveRegExIterator[] = {
- SPL_ME(RecursiveRegExIterator, __construct,
arginfo_rec_regex_it___construct, ZEND_ACC_PUBLIC)
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom dom_iterators.c
fmk Wed May 10 18:32:51 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/domdom_iterators.c
Log:
Fix win32 build
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/dom_iterators.c?r1=1.9.2.3.2.1r2=1.9.2.3.2.2diff_format=u
Index: php-src/ext/dom/dom_iterators.c
diff -u php-src/ext/dom/dom_iterators.c:1.9.2.3.2.1
php-src/ext/dom/dom_iterators.c:1.9.2.3.2.2
--- php-src/ext/dom/dom_iterators.c:1.9.2.3.2.1 Tue May 9 23:55:24 2006
+++ php-src/ext/dom/dom_iterators.c Wed May 10 18:32:50 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: dom_iterators.c,v 1.9.2.3.2.1 2006/05/09 23:55:24 helly Exp $ */
+/* $Id: dom_iterators.c,v 1.9.2.3.2.2 2006/05/10 18:32:50 fmk Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -262,12 +262,13 @@
int ret, curindex = 0;
HashTable *nodeht;
zval **entry;
+ php_dom_iterator *iterator;
if (by_ref) {
zend_error(E_ERROR, An iterator cannot be used with foreach by
reference);
}
- php_dom_iterator *iterator = emalloc(sizeof(php_dom_iterator));
-
+ iterator = emalloc(sizeof(php_dom_iterator));
+
object-refcount++;
iterator-intern.data = (void*)object;
iterator-intern.funcs = php_dom_iterator_funcs;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
helly Wed May 10 19:20:34 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - Missed my name http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.11r2=1.2027.2.547.2.12diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.11 php-src/NEWS:1.2027.2.547.2.12 --- php-src/NEWS:1.2027.2.547.2.11 Wed May 10 13:07:15 2006 +++ php-src/NEWSWed May 10 19:20:34 2006 @@ -1,7 +1,7 @@ PHPNEWS ||| ?? ??? 2006, PHP 5.2.0 -- Removed ze1 compatibility mode. +- Removed ze1 compatibility mode. (Marcus) - Added support for constructors in interfaces to force constructor signature checks in implementations. (Marcus) - Changed __toString to be called whereever applicable. (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xmlwriter php_xmlwriter.c
rrichards Wed May 10 19:34:47 2006 UTC
Modified files:
/php-src/ext/xmlwriter php_xmlwriter.c
Log:
fix compiler warnings
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.33
php-src/ext/xmlwriter/php_xmlwriter.c:1.34
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.33 Tue May 9 22:12:50 2006
+++ php-src/ext/xmlwriter/php_xmlwriter.c Wed May 10 19:34:47 2006
@@ -4,7 +4,7 @@
+--+
| Copyright (c) 1997-2006 The PHP Group|
+--+
- | This source file is subject to version 3.01 of the PHP license, |
+ | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt. |
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_xmlwriter.c,v 1.33 2006/05/09 22:12:50 helly Exp $ */
+/* $Id: php_xmlwriter.c,v 1.34 2006/05/10 19:34:47 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -246,8 +246,8 @@
int isFileUri = 0;
uri = xmlCreateURI();
- escsource = xmlURIEscapeStr(source, :);
- xmlParseURIReference(uri, escsource);
+ escsource = xmlURIEscapeStr((xmlChar *)source, (xmlChar *) :);
+ xmlParseURIReference(uri, (char *)escsource);
xmlFree(escsource);
if (uri-scheme != NULL) {
@@ -386,7 +386,7 @@
ptr = intern-ptr;
if (ptr) {
- retval = internal_function(ptr, name);
+ retval = internal_function(ptr, (xmlChar *) name);
if (retval != -1) {
RETURN_TRUE;
}
@@ -528,7 +528,7 @@
ptr = intern-ptr;
if (ptr) {
- retval = xmlTextWriterStartAttributeNS(ptr, prefix, name, uri);
+ retval = xmlTextWriterStartAttributeNS(ptr, (xmlChar *)prefix,
(xmlChar *)name, (xmlChar *)uri);
if (retval != -1) {
RETURN_TRUE;
}
@@ -573,7 +573,7 @@
ptr = intern-ptr;
if (ptr) {
- retval = xmlTextWriterWriteAttribute(ptr, name, content);
+ retval = xmlTextWriterWriteAttribute(ptr, (xmlChar *)name,
(xmlChar *)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -618,7 +618,7 @@
ptr = intern-ptr;
if (ptr) {
- retval = xmlTextWriterWriteAttributeNS(ptr, prefix, name, uri,
content);
+ retval = xmlTextWriterWriteAttributeNS(ptr, (xmlChar *)prefix,
(xmlChar *)name, (xmlChar *)uri, (xmlChar *)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -671,7 +671,7 @@
ptr = intern-ptr;
if (ptr) {
- retval = xmlTextWriterStartElementNS(ptr, prefix, name, uri);
+ retval = xmlTextWriterStartElementNS(ptr, (xmlChar *)prefix,
(xmlChar *)name, (xmlChar *)uri);
if (retval != -1) {
RETURN_TRUE;
}
@@ -731,7 +731,7 @@
ptr = intern-ptr;
if (ptr) {
- retval = xmlTextWriterWriteElement(ptr, name, content);
+ retval = xmlTextWriterWriteElement(ptr, (xmlChar *)name,
(xmlChar *)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -775,7 +775,7 @@
ptr = intern-ptr;
if (ptr) {
- retval = xmlTextWriterWriteElementNS(ptr, prefix, name, uri,
content);
+ retval = xmlTextWriterWriteElementNS(ptr, (xmlChar *)prefix,
(xmlChar *)name, (xmlChar *)uri, (xmlChar *)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -835,7 +835,7 @@
ptr = intern-ptr;
if (ptr) {
- retval = xmlTextWriterWritePI(ptr, name, content);
+ retval = xmlTextWriterWritePI(ptr, (xmlChar *)name, (xmlChar
*)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -1045,7 +1045,7 @@
ptr = intern-ptr;
if (ptr) {
- retval = xmlTextWriterStartDTD(ptr, name, pubid, sysid);
+ retval = xmlTextWriterStartDTD(ptr, (xmlChar *)name, (xmlChar
*)pubid, (xmlChar *)sysid);
if (retval != -1) {
RETURN_TRUE;
}
@@ -1095,7 +1095,7 @@
ptr = intern-ptr;
if (ptr) {
- retval = xmlTextWriterWriteDTD(ptr, name,
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlwriter php_xmlwriter.c php_xmlwriter.h
rrichards Wed May 10 19:38:35 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/xmlwriter php_xmlwriter.c php_xmlwriter.h
Log:
Synch with HEAD
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.12.2.1r2=1.20.2.12.2.2diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.1
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.2
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.12.2.1 Tue May 9 23:54:31 2006
+++ php-src/ext/xmlwriter/php_xmlwriter.c Wed May 10 19:38:35 2006
@@ -7,7 +7,7 @@
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
| available through the world-wide-web at the following url: |
- | http://www.php.net/license/3_01.txt |
+ | http://www.php.net/license/3_01.txt. |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| [EMAIL PROTECTED] so we can mail you a copy immediately. |
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.1 2006/05/09 23:54:31 helly Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.2 2006/05/10 19:38:35 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -34,6 +34,9 @@
static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC);
static void xmlwriter_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
+typedef int (*xmlwriter_read_one_char_t)(xmlTextWriterPtr writer, const
xmlChar *content);
+typedef int (*xmlwriter_read_int_t)(xmlTextWriterPtr writer);
+
/* {{{ xmlwriter_object_free_storage */
static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC)
{
@@ -77,21 +80,8 @@
xmlwriter_free_resource_ptr(intern-xmlwriter_ptr TSRMLS_CC);
}
intern-xmlwriter_ptr = NULL;
-
-#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION == 1 PHP_RELEASE_VERSION
2) || (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION 1) || (PHP_MAJOR_VERSION
5)
zend_object_std_dtor(intern-zo TSRMLS_CC);
-#else
- if (intern-zo.guards) {
- zend_hash_destroy(intern-zo.guards);
- FREE_HASHTABLE(intern-zo.guards);
- }
-
- if (intern-zo.properties) {
- zend_hash_destroy(intern-zo.properties);
- FREE_HASHTABLE(intern-zo.properties);
- }
-#endif
-
+
efree(intern);
}
/* }}} */
@@ -107,17 +97,8 @@
intern = emalloc(sizeof(ze_xmlwriter_object));
memset(intern-zo, 0, sizeof(zend_object));
intern-xmlwriter_ptr = NULL;
-
-#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION == 1 PHP_RELEASE_VERSION
2) || (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION 1) || (PHP_MAJOR_VERSION
5)
+
zend_object_std_init(intern-zo, class_type TSRMLS_CC);
-#else
- ALLOC_HASHTABLE(intern-zo.properties);
- zend_hash_init(intern-zo.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-
- intern-zo.ce = class_type;
- intern-zo.guards = NULL;
-#endif
-
zend_hash_copy(intern-zo.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref,
(void *) tmp, sizeof(zval *));
@@ -160,6 +141,7 @@
#endif
PHP_FE(xmlwriter_start_element, NULL)
PHP_FE(xmlwriter_end_element, NULL)
+ PHP_FE(xmlwriter_full_end_element, NULL)
PHP_FE(xmlwriter_start_element_ns, NULL)
PHP_FE(xmlwriter_write_element, NULL)
PHP_FE(xmlwriter_write_element_ns, NULL)
@@ -170,6 +152,7 @@
PHP_FE(xmlwriter_end_cdata, NULL)
PHP_FE(xmlwriter_write_cdata, NULL)
PHP_FE(xmlwriter_text, NULL)
+ PHP_FE(xmlwriter_write_raw, NULL)
PHP_FE(xmlwriter_start_document,NULL)
PHP_FE(xmlwriter_end_document, NULL)
PHP_FE(xmlwriter_write_comment, NULL)
@@ -212,6 +195,7 @@
#endif
PHP_ME_MAPPING(startElement,xmlwriter_start_element,NULL, 0)
PHP_ME_MAPPING(endElement, xmlwriter_end_element,
NULL, 0)
+ PHP_ME_MAPPING(fullEndElement, xmlwriter_full_end_element, NULL, 0)
PHP_ME_MAPPING(startElementNs, xmlwriter_start_element_ns, NULL, 0)
PHP_ME_MAPPING(writeElement,xmlwriter_write_element,NULL, 0)
PHP_ME_MAPPING(writeElementNs, xmlwriter_write_element_ns, NULL, 0)
@@ -222,6 +206,7 @@
PHP_ME_MAPPING(endCdata,xmlwriter_end_cdata,
NULL, 0)
PHP_ME_MAPPING(writeCdata, xmlwriter_write_cdata,
NULL, 0)
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom php_dom.c /ext/simplexml simplexml.c
helly Wed May 10 19:39:46 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/domphp_dom.c
/php-src/ext/simplexml simplexml.c
Log:
- ze1 cleanup (bjori) /thx
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.12.2.1r2=1.73.2.12.2.2diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.12.2.1
php-src/ext/dom/php_dom.c:1.73.2.12.2.2
--- php-src/ext/dom/php_dom.c:1.73.2.12.2.1 Tue May 9 23:55:24 2006
+++ php-src/ext/dom/php_dom.c Wed May 10 19:39:46 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.73.2.12.2.1 2006/05/09 23:55:24 helly Exp $ */
+/* $Id: php_dom.c,v 1.73.2.12.2.2 2006/05/10 19:39:46 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -69,7 +69,6 @@
zend_class_entry *dom_namespace_node_class_entry;
zend_object_handlers dom_object_handlers;
-zend_object_handlers dom_ze1_object_handlers;
static HashTable classes;
@@ -451,13 +450,6 @@
return retval;
}
-zend_object_value dom_objects_ze1_clone_obj(zval *zobject TSRMLS_DC)
-{
- php_error(E_ERROR, Cannot clone object of class %s due to
'zend.ze1_compatibility_mode', Z_OBJCE_P(zobject)-name);
- /* Return zobject-value.obj just to satisfy compiler */
- return zobject-value.obj;
-}
-
static zend_function_entry dom_functions[] = {
PHP_FE(dom_import_simplexml, NULL)
{NULL, NULL, NULL}
@@ -503,13 +495,6 @@
dom_object_handlers.clone_obj = dom_objects_store_clone_obj;
dom_object_handlers.has_property = dom_property_exists;
- memcpy(dom_ze1_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
- dom_ze1_object_handlers.read_property = dom_read_property;
- dom_ze1_object_handlers.write_property = dom_write_property;
- dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
- dom_ze1_object_handlers.clone_obj = dom_objects_ze1_clone_obj;
- dom_ze1_object_handlers.has_property = dom_property_exists;
-
zend_hash_init(classes, 0, NULL, NULL, 1);
INIT_CLASS_ENTRY(ce, DOMException,
php_dom_domexception_class_functions);
http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.1r2=1.151.2.22.2.2diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.1
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.2
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.1Tue May 9 23:58:46 2006
+++ php-src/ext/simplexml/simplexml.c Wed May 10 19:39:46 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.1 2006/05/09 23:58:46 helly Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.2 2006/05/10 19:39:46 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1682,38 +1682,6 @@
sxe_count_elements
};
-static zend_object_handlers sxe_ze1_object_handlers = {
- ZEND_OBJECTS_STORE_HANDLERS,
- sxe_property_read,
- sxe_property_write,
- sxe_dimension_read,
- sxe_dimension_write,
- sxe_property_get_adr,
- sxe_get_value, /* get */
- NULL,
- sxe_property_exists,
- sxe_property_delete,
- sxe_dimension_exists,
- sxe_dimension_delete,
- sxe_properties_get,
- NULL, /* zend_get_std_object_handlers()-get_method,*/
- NULL, /* zend_get_std_object_handlers()-call_method,*/
- NULL, /* zend_get_std_object_handlers()-get_constructor, */
- NULL, /* zend_get_std_object_handlers()-get_class_entry,*/
- NULL, /* zend_get_std_object_handlers()-get_class_name,*/
- sxe_objects_compare,
- sxe_object_cast,
- sxe_count_elements
-};
-
-static zend_object_value sxe_object_ze1_clone(zval *zobject TSRMLS_DC)
-{
- php_error(E_ERROR, Cannot clone object of class %s due to
'zend.ze1_compatibility_mode', Z_OBJCE_P(zobject)-name);
- /* Return zobject-value.obj just to satisfy compiler */
- /* FIXME: Should not be a fatal */
- return zobject-value.obj;
-}
-
/* {{{ sxe_object_clone()
*/
static void
@@ -2270,12 +2238,6 @@
sxe_object_handlers.get_class_entry =
zend_get_std_object_handlers()-get_class_entry;
sxe_object_handlers.get_class_name =
zend_get_std_object_handlers()-get_class_name;
- sxe_ze1_object_handlers.get_method =
zend_get_std_object_handlers()-get_method;
- sxe_ze1_object_handlers.get_constructor =
zend_get_std_object_handlers()-get_constructor;
- sxe_ze1_object_handlers.get_class_entry =
zend_get_std_object_handlers()-get_class_entry;
- sxe_ze1_object_handlers.get_class_name =
zend_get_std_object_handlers()-get_class_name;
- sxe_ze1_object_handlers.clone_obj = sxe_object_ze1_clone;
-
#ifdef HAVE_SPL
if (zend_get_module_started(spl) == SUCCESS)
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
helly Wed May 10 19:41:34 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: - ze1 cleanup (bjori) /thx http://cvs.php.net/viewcvs.cgi/php-src/php.ini-dist?r1=1.231.2.10r2=1.231.2.10.2.1diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10 php-src/php.ini-dist:1.231.2.10.2.1 --- php-src/php.ini-dist:1.231.2.10 Wed Feb 8 23:43:48 2006 +++ php-src/php.ini-distWed May 10 19:41:34 2006 @@ -71,9 +71,6 @@ ; Enable the PHP scripting language engine under Apache. engine = On -; Enable compatibility mode with Zend Engine 1 (PHP 4.x) -zend.ze1_compatibility_mode = Off - ; Allow the ? tag. Otherwise, only ?php and script tags are recognized. ; NOTE: Using short tags should be avoided when developing applications or ; libraries that are meant for redistribution, or deployment on PHP http://cvs.php.net/viewcvs.cgi/php-src/php.ini-recommended?r1=1.179.2.11r2=1.179.2.11.2.1diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11 php-src/php.ini-recommended:1.179.2.11.2.1 --- php-src/php.ini-recommended:1.179.2.11 Wed Feb 8 23:43:48 2006 +++ php-src/php.ini-recommended Wed May 10 19:41:34 2006 @@ -129,9 +129,6 @@ ; Enable the PHP scripting language engine under Apache. engine = On -; Enable compatibility mode with Zend Engine 1 (PHP 4.x) -zend.ze1_compatibility_mode = Off - ; Allow the ? tag. Otherwise, only ?php and script tags are recognized. ; NOTE: Using short tags should be avoided when developing applications or ; libraries that are meant for redistribution, or deployment on PHP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / run-tests.php
helly Wed May 10 20:00:26 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcrun-tests.php Log: - MFH add E_RECOVERABLE as default http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.37r2=1.226.2.37.2.1diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37 php-src/run-tests.php:1.226.2.37.2.1 --- php-src/run-tests.php:1.226.2.37Wed May 3 21:37:16 2006 +++ php-src/run-tests.php Wed May 10 20:00:26 2006 @@ -23,7 +23,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37 2006/05/03 21:37:16 pajoye Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.1 2006/05/10 20:00:26 helly 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 @@ -158,7 +158,7 @@ 'safe_mode=0', 'disable_functions=', 'output_buffering=Off', - 'error_reporting=4095', + 'error_reporting=8191', 'display_errors=1', 'log_errors=0', 'html_errors=0', @@ -397,7 +397,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37 $'.\n; + echo '$Revision: 1.226.2.37.2.1 $'.\n; exit(1); default: echo Illegal switch '$switch' specified!\n; -- 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
helly Wed May 10 21:09:31 2006 UTC Modified files: /php-src/ext/splphp_spl.c Log: - s/RegExIterator/RegexIterator/ http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/php_spl.c?r1=1.89r2=1.90diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.89 php-src/ext/spl/php_spl.c:1.90 --- php-src/ext/spl/php_spl.c:1.89 Thu Mar 23 19:34:20 2006 +++ php-src/ext/spl/php_spl.c Wed May 10 21:09:31 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_spl.c,v 1.89 2006/03/23 19:34:20 helly Exp $ */ +/* $Id: php_spl.c,v 1.90 2006/05/10 21:09:31 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -178,8 +178,8 @@ SPL_ADD_CLASS(RecursiveFilterIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveIteratorIterator, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(RecursiveRegExIterator, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(RegExIterator, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(RecursiveRegexIterator, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(RegexIterator, z_list, sub, allow, ce_flags); \ 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); \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /main php_variables.h
rasmus Wed May 10 21:10:46 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/main php_variables.h Log: Now that ext/filter is bundled, we should be defining these in one place http://cvs.php.net/viewcvs.cgi/php-src/main/php_variables.h?r1=1.22.2.3r2=1.22.2.3.2.1diff_format=u Index: php-src/main/php_variables.h diff -u php-src/main/php_variables.h:1.22.2.3 php-src/main/php_variables.h:1.22.2.3.2.1 --- php-src/main/php_variables.h:1.22.2.3 Wed Mar 8 08:43:25 2006 +++ php-src/main/php_variables.hWed May 10 21:10:45 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_variables.h,v 1.22.2.3 2006/03/08 08:43:25 mike Exp $ */ +/* $Id: php_variables.h,v 1.22.2.3.2.1 2006/05/10 21:10:45 rasmus Exp $ */ #ifndef PHP_VARIABLES_H #define PHP_VARIABLES_H @@ -29,6 +29,9 @@ #define PARSE_GET 1 #define PARSE_COOKIE 2 #define PARSE_STRING 3 +#define PARSE_ENV 4 +#define PARSE_SERVER 5 +#define PARSE_SESSION 6 BEGIN_EXTERN_C() void php_startup_auto_globals(TSRMLS_D); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes interfaces_003.phpt tostring_003.phpt
helly Wed May 10 21:12:31 2006 UTC
Modified files:
/php-src/tests/classes interfaces_003.phpt tostring_003.phpt
Log:
- Fix tests
http://cvs.php.net/viewcvs.cgi/php-src/tests/classes/interfaces_003.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/classes/interfaces_003.phpt
diff -u php-src/tests/classes/interfaces_003.phpt:1.1
php-src/tests/classes/interfaces_003.phpt:1.2
--- php-src/tests/classes/interfaces_003.phpt:1.1 Thu Oct 6 18:32:28 2005
+++ php-src/tests/classes/interfaces_003.phpt Wed May 10 21:12:31 2006
@@ -7,27 +7,20 @@
interface MyInterface
{
- public function __construct(Object $o);
+ public function __construct(MyObject $o);
}
class MyTestClass implements MyInterface
{
- public function __construct(Object $o)
+ public function __construct(MyObject $o)
{
}
}
$obj = new MyTestClass;
-class MyTestFail
-{
- public function __construct()
- {
- }
-}
-
?
===DONE===
--EXPECTF--
-Catchable fatal error: Argument 1 passed to MyTestClass::__construct() must be
an object of class Object, called in %sinterfaces_003.php on line %d
+Catchable fatal error: Argument 1 passed to MyTestClass::__construct() must be
an object of class MyObject, called in %sinterfaces_003.php on line %d
http://cvs.php.net/viewcvs.cgi/php-src/tests/classes/tostring_003.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/tests/classes/tostring_003.phpt
diff -u php-src/tests/classes/tostring_003.phpt:1.3
php-src/tests/classes/tostring_003.phpt:1.4
--- php-src/tests/classes/tostring_003.phpt:1.3 Thu Oct 6 18:41:01 2005
+++ php-src/tests/classes/tostring_003.phpt Wed May 10 21:12:31 2006
@@ -1,7 +1,5 @@
--TEST--
ZE2 __toString() in __destruct/exception
---SKIPIF--
-?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip
ZendEngine 2 needed'); ?
--FILE--
?php
@@ -32,4 +30,4 @@
?
DONE
--EXPECTF--
-Fatal error: Object of class Test could not be converted to string in
%stostring_003.php on line %d
+Fatal error: Method Test::__toString() must not throw an exception in
%stostring_003.php on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main SAPI.c /sapi/apache mod_php5.c
rasmus Wed May 10 21:19:32 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main SAPI.c
/php-src/sapi/apachemod_php5.c
Log:
Add input_filter hook call in getenv()
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.12r2=1.2027.2.547.2.13diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.12 php-src/NEWS:1.2027.2.547.2.13
--- php-src/NEWS:1.2027.2.547.2.12 Wed May 10 19:20:34 2006
+++ php-src/NEWSWed May 10 21:19:32 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.2.0
+- Added support for getenv() input filtering. (Rasmus)
- Removed ze1 compatibility mode. (Marcus)
- Added support for constructors in interfaces to force constructor signature
checks in implementations. (Marcus)
http://cvs.php.net/viewcvs.cgi/php-src/main/SAPI.c?r1=1.202.2.7r2=1.202.2.7.2.1diff_format=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.202.2.7 php-src/main/SAPI.c:1.202.2.7.2.1
--- php-src/main/SAPI.c:1.202.2.7 Sun Jan 1 12:50:17 2006
+++ php-src/main/SAPI.c Wed May 10 21:19:32 2006
@@ -18,13 +18,14 @@
+--+
*/
-/* $Id: SAPI.c,v 1.202.2.7 2006/01/01 12:50:17 sniper Exp $ */
+/* $Id: SAPI.c,v 1.202.2.7.2.1 2006/05/10 21:19:32 rasmus Exp $ */
#include ctype.h
#include sys/stat.h
#include php.h
#include SAPI.h
+#include php_variables.h
#include php_ini.h
#include ext/standard/php_string.h
#include ext/standard/pageinfo.h
@@ -914,11 +915,15 @@
SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC)
{
- if (sapi_module.getenv) {
- return sapi_module.getenv(name, name_len TSRMLS_CC);
+ if (sapi_module.getenv) {
+ char *value, *tmp = sapi_module.getenv(name, name_len
TSRMLS_CC);
+ if(tmp) value = estrdup(tmp);
+ else return NULL;
+ sapi_module.input_filter(PARSE_ENV, name, value,
strlen(value), NULL TSRMLS_CC);
+ return value;
} else {
- return NULL;
- }
+ return NULL;
+ }
}
SAPI_API int sapi_get_fd(int *fd TSRMLS_DC)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache/mod_php5.c?r1=1.19.2.7r2=1.19.2.7.2.1diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.19.2.7
php-src/sapi/apache/mod_php5.c:1.19.2.7.2.1
--- php-src/sapi/apache/mod_php5.c:1.19.2.7 Sun Apr 2 17:58:17 2006
+++ php-src/sapi/apache/mod_php5.c Wed May 10 21:19:32 2006
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php5.c,v 1.19.2.7 2006/04/02 17:58:17 iliaa Exp $ */
+/* $Id: mod_php5.c,v 1.19.2.7.2.1 2006/05/10 21:19:32 rasmus Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -254,13 +254,17 @@
for (i = 0; i arr-nelts; i++) {
char *val;
+ int val_len, new_val_len;
if (elts[i].val) {
val = elts[i].val;
} else {
val = ;
}
- php_register_variable(elts[i].key, val, track_vars_array
TSRMLS_CC);
+ val_len = strlen(val);
+ if (sapi_module.input_filter(PARSE_SERVER, elts[i].key, val,
val_len, new_val_len TSRMLS_CC)) {
+ php_register_variable_safe(elts[i].key, val,
new_val_len, track_vars_array TSRMLS_CC);
+ }
}
/* If PATH_TRANSLATED doesn't exist, copy it from SCRIPT_FILENAME */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/classes abstract_static.phpt abstract_user_call.phpt interface_construct.phpt interfaces_003.phpt tostring.phpt tostring_001.phpt tostring_002.phpt tostring_003.
helly Wed May 10 21:19:37 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/tests/classes abstract_user_call.phpt tostring_001.phpt
tostring_002.phpt tostring_003.phpt
Removed files:
/php-src/tests/classes interface_construct.phpt tostring.phpt
Modified files:
/php-src/tests/classes abstract_static.phpt interfaces_003.phpt
type_hinting_001.phpt type_hinting_003.phpt
Log:
- MFH tests
http://cvs.php.net/viewcvs.cgi/php-src/tests/classes/abstract_static.phpt?r1=1.3r2=1.3.6.1diff_format=u
Index: php-src/tests/classes/abstract_static.phpt
diff -u php-src/tests/classes/abstract_static.phpt:1.3
php-src/tests/classes/abstract_static.phpt:1.3.6.1
--- php-src/tests/classes/abstract_static.phpt:1.3 Sat Aug 9 14:48:47 2003
+++ php-src/tests/classes/abstract_static.phpt Wed May 10 21:19:37 2006
@@ -1,21 +1,29 @@
--TEST--
-ZE2 A static abstrcat method may not be called
---SKIPIF--
-?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip
ZendEngine 2 needed'); ?
+ZE2 A static abstrcat methods
--FILE--
?php
-abstract class fail {
- abstract static function show();
+interface showable
+{
+ static function show();
}
-class pass extends fail {
+class pass implements showable
+{
static function show() {
echo Call to function show()\n;
}
}
pass::show();
+
+eval('
+class fail
+{
+ abstract static function func();
+}
+');
+
fail::show();
echo Done\n; // shouldn't be displayed
@@ -23,4 +31,4 @@
--EXPECTF--
Call to function show()
-Fatal error: Cannot call abstract method fail::show() in %s on line %d
+Fatal error: Static function fail::func() cannot be abstract in %s on line %d
http://cvs.php.net/viewcvs.cgi/php-src/tests/classes/interfaces_003.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u
Index: php-src/tests/classes/interfaces_003.phpt
diff -u php-src/tests/classes/interfaces_003.phpt:1.1.2.2
php-src/tests/classes/interfaces_003.phpt:1.1.2.2.2.1
--- php-src/tests/classes/interfaces_003.phpt:1.1.2.2 Thu Oct 6 18:34:16 2005
+++ php-src/tests/classes/interfaces_003.phpt Wed May 10 21:19:37 2006
@@ -7,27 +7,20 @@
interface MyInterface
{
- public function __construct(Object $o);
+ public function __construct(MyObject $o);
}
class MyTestClass implements MyInterface
{
- public function __construct(Object $o)
+ public function __construct(MyObject $o)
{
}
}
$obj = new MyTestClass;
-class MyTestFail
-{
- public function __construct()
- {
- }
-}
-
?
===DONE===
--EXPECTF--
-Fatal error: Argument 1 passed to MyTestClass::__construct() must be an object
of class Object, called in %sinterfaces_003.php on line %d
+Catchable fatal error: Argument 1 passed to MyTestClass::__construct() must be
an object of class MyObject, called in %sinterfaces_003.php on line %d
http://cvs.php.net/viewcvs.cgi/php-src/tests/classes/type_hinting_001.phpt?r1=1.3.2.1r2=1.3.2.1.2.1diff_format=u
Index: php-src/tests/classes/type_hinting_001.phpt
diff -u php-src/tests/classes/type_hinting_001.phpt:1.3.2.1
php-src/tests/classes/type_hinting_001.phpt:1.3.2.1.2.1
--- php-src/tests/classes/type_hinting_001.phpt:1.3.2.1 Thu Sep 15 19:49:58 2005
+++ php-src/tests/classes/type_hinting_001.phpt Wed May 10 21:19:37 2006
@@ -35,4 +35,4 @@
?
--EXPECTF--
-Fatal error: Argument 1 passed to FooBar::a() must implement interface Foo,
called in %s on line 27 and defined in %s on line 12
+Catchable fatal error: Argument 1 passed to FooBar::a() must implement
interface Foo, called in %s on line 27 and defined in %s on line 12
http://cvs.php.net/viewcvs.cgi/php-src/tests/classes/type_hinting_003.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u
Index: php-src/tests/classes/type_hinting_003.phpt
diff -u php-src/tests/classes/type_hinting_003.phpt:1.1.2.2
php-src/tests/classes/type_hinting_003.phpt:1.1.2.2.2.1
--- php-src/tests/classes/type_hinting_003.phpt:1.1.2.2 Tue Nov 15 21:33:10 2005
+++ php-src/tests/classes/type_hinting_003.phpt Wed May 10 21:19:37 2006
@@ -57,4 +57,4 @@
int(25)
}
-Fatal error: Argument 1 passed to Test::f1() must be an array, called in
%stype_hinting_003.php on line %d and defined in %stype_hinting_003.php on line
%d
+Catchable fatal error: Argument 1 passed to Test::f1() must be an array,
called in %stype_hinting_003.php on line %d and defined in
%stype_hinting_003.php on line %d
http://cvs.php.net/viewcvs.cgi/php-src/tests/classes/abstract_user_call.phpt?view=markuprev=1.1
Index: php-src/tests/classes/abstract_user_call.phpt
+++ php-src/tests/classes/abstract_user_call.phpt
--TEST--
ZE2 An abstrcat method cannot be called indirectly
--FILE--
?php
abstract class test_base
{
abstract function func();
}
class test extends test_base
{
function func()
{
echo __METHOD__ . ()\n;
[PHP-CVS] cvs: php-src /main php_variables.h
rasmus Wed May 10 21:23:46 2006 UTC Modified files: /php-src/main php_variables.h Log: MFB filter defines http://cvs.php.net/viewcvs.cgi/php-src/main/php_variables.h?r1=1.26r2=1.27diff_format=u Index: php-src/main/php_variables.h diff -u php-src/main/php_variables.h:1.26 php-src/main/php_variables.h:1.27 --- php-src/main/php_variables.h:1.26 Thu Mar 2 13:12:45 2006 +++ php-src/main/php_variables.hWed May 10 21:23:46 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_variables.h,v 1.26 2006/03/02 13:12:45 dmitry Exp $ */ +/* $Id: php_variables.h,v 1.27 2006/05/10 21:23:46 rasmus Exp $ */ #ifndef PHP_VARIABLES_H #define PHP_VARIABLES_H @@ -29,6 +29,9 @@ #define PARSE_GET 1 #define PARSE_COOKIE 2 #define PARSE_STRING 3 +#define PARSE_ENV 4 +#define PARSE_SERVER 5 +#define PARSE_SESSION 6 BEGIN_EXTERN_C() void php_treat_data(int arg, char *str, zval* destArray TSRMLS_DC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main SAPI.c /sapi/apache mod_php5.c
rasmus Wed May 10 21:25:01 2006 UTC
Modified files:
/php-src/main SAPI.c
/php-src/sapi/apachemod_php5.c
Log:
MFB input filter hook for getenv()
http://cvs.php.net/viewcvs.cgi/php-src/main/SAPI.c?r1=1.213r2=1.214diff_format=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.213 php-src/main/SAPI.c:1.214
--- php-src/main/SAPI.c:1.213 Fri Mar 24 00:25:49 2006
+++ php-src/main/SAPI.c Wed May 10 21:25:01 2006
@@ -18,13 +18,14 @@
+--+
*/
-/* $Id: SAPI.c,v 1.213 2006/03/24 00:25:49 andrei Exp $ */
+/* $Id: SAPI.c,v 1.214 2006/05/10 21:25:01 rasmus Exp $ */
#include ctype.h
#include sys/stat.h
#include php.h
#include SAPI.h
+#include php_variables.h
#include php_ini.h
#include ext/standard/php_string.h
#include ext/standard/pageinfo.h
@@ -876,11 +877,15 @@
SAPI_API char *sapi_getenv(char *name, size_t name_len TSRMLS_DC)
{
- if (sapi_module.getenv) {
- return sapi_module.getenv(name, name_len TSRMLS_CC);
+ if (sapi_module.getenv) {
+ char *value, *tmp = sapi_module.getenv(name, name_len
TSRMLS_CC);
+ if(tmp) value = estrdup(tmp);
+ else return NULL;
+ sapi_module.input_filter(PARSE_ENV, name, value,
strlen(value), NULL TSRMLS_CC);
+ return value;
} else {
- return NULL;
- }
+ return NULL;
+ }
}
SAPI_API int sapi_get_fd(int *fd TSRMLS_DC)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache/mod_php5.c?r1=1.31r2=1.32diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.31 php-src/sapi/apache/mod_php5.c:1.32
--- php-src/sapi/apache/mod_php5.c:1.31 Sun Apr 2 17:58:06 2006
+++ php-src/sapi/apache/mod_php5.c Wed May 10 21:25:01 2006
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php5.c,v 1.31 2006/04/02 17:58:06 iliaa Exp $ */
+/* $Id: mod_php5.c,v 1.32 2006/05/10 21:25:01 rasmus Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -250,13 +250,17 @@
for (i = 0; i arr-nelts; i++) {
char *val;
+ int val_len, new_val_len;
if (elts[i].val) {
val = elts[i].val;
} else {
val = ;
}
- php_register_variable(elts[i].key, val, track_vars_array
TSRMLS_CC);
+ val_len = strlen(val);
+ if (sapi_module.input_filter(PARSE_SERVER, elts[i].key, val,
val_len, new_val_len TSRMLS_CC)) {
+ php_register_variable_safe(elts[i].key, val,
new_val_len, track_vars_array TSRMLS_CC);
+ }
}
/* If PATH_TRANSLATED doesn't exist, copy it from SCRIPT_FILENAME */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/run-test test005.phpt test008.phpt test008a.phpt
helly Wed May 10 21:47:00 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/run-test test005.phpt test008.phpt test008a.phpt Log: - Hardcoded error mode was changed to 8191 http://cvs.php.net/viewcvs.cgi/php-src/tests/run-test/test005.phpt?r1=1.3r2=1.3.6.1diff_format=u Index: php-src/tests/run-test/test005.phpt diff -u php-src/tests/run-test/test005.phpt:1.3 php-src/tests/run-test/test005.phpt:1.3.6.1 --- php-src/tests/run-test/test005.phpt:1.3 Sun Nov 30 13:57:20 2003 +++ php-src/tests/run-test/test005.phpt Wed May 10 21:46:59 2006 @@ -24,7 +24,7 @@ ? --EXPECTF-- string(1) 1 -string(4) 4095 +string(4) 8191 string(1) 0 string(1) 1 string(1) 0 http://cvs.php.net/viewcvs.cgi/php-src/tests/run-test/test008.phpt?r1=1.3r2=1.3.6.1diff_format=u Index: php-src/tests/run-test/test008.phpt diff -u php-src/tests/run-test/test008.phpt:1.3 php-src/tests/run-test/test008.phpt:1.3.6.1 --- php-src/tests/run-test/test008.phpt:1.3 Sun Nov 30 13:57:20 2003 +++ php-src/tests/run-test/test008.phpt Wed May 10 21:46:59 2006 @@ -25,7 +25,7 @@ --EXPECTF-- %s: %sivision by zero in %s on line %d string(1) 1 -string(4) 4095 +string(4) 8191 string(1) 0 string(1) 1 string(1) 0 http://cvs.php.net/viewcvs.cgi/php-src/tests/run-test/test008a.phpt?r1=1.2r2=1.2.6.1diff_format=u Index: php-src/tests/run-test/test008a.phpt diff -u php-src/tests/run-test/test008a.phpt:1.2 php-src/tests/run-test/test008a.phpt:1.2.6.1 --- php-src/tests/run-test/test008a.phpt:1.2Sun Nov 30 13:57:20 2003 +++ php-src/tests/run-test/test008a.phptWed May 10 21:46:59 2006 @@ -24,7 +24,7 @@ ? --EXPECTF-- string(1) 1 -string(4) 4095 +string(4) 8191 string(1) 0 string(1) 1 string(1) 0 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/lang bug22367.phpt
helly Wed May 10 22:36:49 2006 UTC Removed files: (Branch: PHP_5_2) /php-src/tests/lang bug22367.phpt Log: - No more ze1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/lang bug24658.phpt type_hints_001.phpt type_hints_002.phpt type_hints_003.phpt
helly Wed May 10 22:38:35 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/tests/lang type_hints_002.phpt type_hints_003.phpt
Modified files:
/php-src/tests/lang bug24658.phpt type_hints_001.phpt
Log:
- Update tests after MFH
http://cvs.php.net/viewcvs.cgi/php-src/tests/lang/bug24658.phpt?r1=1.3.4.1r2=1.3.4.1.2.1diff_format=u
Index: php-src/tests/lang/bug24658.phpt
diff -u php-src/tests/lang/bug24658.phpt:1.3.4.1
php-src/tests/lang/bug24658.phpt:1.3.4.1.2.1
--- php-src/tests/lang/bug24658.phpt:1.3.4.1Thu Sep 15 19:49:58 2005
+++ php-src/tests/lang/bug24658.phptWed May 10 22:38:35 2006
@@ -53,4 +53,4 @@
object(foo)#%d (0) {
}
-Fatal error: Argument 1 passed to typehint() must be an object of class foo in
%s on line %d
+Catchable fatal error: Argument 1 passed to typehint() must be an object of
class foo in %s on line %d
http://cvs.php.net/viewcvs.cgi/php-src/tests/lang/type_hints_001.phpt?r1=1.3.2.1r2=1.3.2.1.2.1diff_format=u
Index: php-src/tests/lang/type_hints_001.phpt
diff -u php-src/tests/lang/type_hints_001.phpt:1.3.2.1
php-src/tests/lang/type_hints_001.phpt:1.3.2.1.2.1
--- php-src/tests/lang/type_hints_001.phpt:1.3.2.1 Thu Sep 15 19:49:58 2005
+++ php-src/tests/lang/type_hints_001.phpt Wed May 10 22:38:35 2006
@@ -23,4 +23,4 @@
?
--EXPECTF--
-Fatal error: Argument 1 passed to type_hint_foo() must be an instance of Foo,
called in %s on line 16 and defined in %s on line 9
+Catchable fatal error: Argument 1 passed to type_hint_foo() must be an
instance of Foo, called in %s on line 16 and defined in %s on line 9
http://cvs.php.net/viewcvs.cgi/php-src/tests/lang/type_hints_002.phpt?view=markuprev=1.1
Index: php-src/tests/lang/type_hints_002.phpt
+++ php-src/tests/lang/type_hints_002.phpt
--TEST--
ZE2 type hinting
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip
ZendEngine 2 needed'); ?
--FILE--
?php
class P { }
class T {
function f(P $p = NULL) {
var_dump($p);
echo -\n;
}
}
$o=new T();
$o-f(new P);
$o-f();
$o-f(NULL);
?
--EXPECT--
object(P)#2 (0) {
}
-
NULL
-
NULL
-
http://cvs.php.net/viewcvs.cgi/php-src/tests/lang/type_hints_003.phpt?view=markuprev=1.1
Index: php-src/tests/lang/type_hints_003.phpt
+++ php-src/tests/lang/type_hints_003.phpt
--TEST--
ZE2 type hinting
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip
ZendEngine 2 needed'); ?
--FILE--
?php
class T {
function f(P $p = 42) {
}
}
?
--EXPECTF--
Fatal error: Default value for parameters with a class type hint can only be
NULL in %stest.php on line 3
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Thu May 11 03:24:36 2006 UTC Modified files: /CVSROOTavail Log: phpdoc karma for ramsey http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1131r2=1.1132diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1131 CVSROOT/avail:1.1132 --- CVSROOT/avail:1.1131Mon May 8 08:45:55 2006 +++ CVSROOT/avail Thu May 11 03:24:35 2006 @@ -37,7 +37,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief977,shlomi,raful! ,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,h! assen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,li uming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,p! reilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,lsmith,tessus,gavinfo,rant,colder|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,p! hpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,p hpdoc-zh,phpdoc-ca
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date php_date.c
rasmus Thu May 11 03:47:55 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date php_date.c
Log:
This spelling mistake finally annoyed me enough to fix it.
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.1r2=1.43.2.45.2.2diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.1
php-src/ext/date/php_date.c:1.43.2.45.2.2
--- php-src/ext/date/php_date.c:1.43.2.45.2.1 Tue May 9 23:55:11 2006
+++ php-src/ext/date/php_date.c Thu May 11 03:47:55 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.1 2006/05/09 23:55:11 helly Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.2 2006/05/11 03:47:55 rasmus Exp $ */
#include php.h
#include php_streams.h
@@ -1288,7 +1288,7 @@
}
/* Advanced Interface */
-static zval * date_instanciate(zend_class_entry *pce, zval *object TSRMLS_DC)
+static zval * date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC)
{
if (!object) {
ALLOC_ZVAL(object);
@@ -1314,7 +1314,7 @@
RETURN_FALSE;
}
- date_instanciate(date_ce_date, return_value TSRMLS_CC);
+ date_instantiate(date_ce_date, return_value TSRMLS_CC);
dateobj = (php_date_obj *) zend_object_store_get_object(return_value
TSRMLS_CC);
dateobj-time = timelib_strtotime(time_str_len ? time_str : now,
time_str_len ? time_str_len : sizeof(now) -1, NULL, DATE_TIMEZONEDB);
@@ -1498,7 +1498,7 @@
}
dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
if (dateobj-time-is_localtime dateobj-time-tz_info) {
- date_instanciate(date_ce_timezone, return_value TSRMLS_CC);
+ date_instantiate(date_ce_timezone, return_value TSRMLS_CC);
tzobj = (php_timezone_obj *)
zend_object_store_get_object(return_value TSRMLS_CC);
tzobj-tz = timelib_tzinfo_clone(dateobj-time-tz_info);
} else {
@@ -1622,7 +1622,7 @@
}
/* If we find it we instantiate the object otherwise, well, we don't
and return false */
if (tzi) {
- date_instanciate(date_ce_timezone, return_value TSRMLS_CC);
+ date_instantiate(date_ce_timezone, return_value TSRMLS_CC);
tzobj = (php_timezone_obj *)
zend_object_store_get_object(return_value TSRMLS_CC);
tzobj-tz = tzi;
} else {
--
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.c
rasmus Thu May 11 03:49:13 2006 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
MFB
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.91r2=1.92diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.91 php-src/ext/date/php_date.c:1.92
--- php-src/ext/date/php_date.c:1.91Sun Apr 9 12:58:29 2006
+++ php-src/ext/date/php_date.c Thu May 11 03:49:12 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.91 2006/04/09 12:58:29 derick Exp $ */
+/* $Id: php_date.c,v 1.92 2006/05/11 03:49:12 rasmus Exp $ */
#include php.h
#include php_streams.h
@@ -1417,7 +1417,7 @@
#ifdef EXPERIMENTAL_DATE_SUPPORT
/* Advanced Interface */
-static zval * date_instanciate(zend_class_entry *pce, zval *object TSRMLS_DC)
+static zval * date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC)
{
if (!object) {
ALLOC_ZVAL(object);
@@ -1443,7 +1443,7 @@
RETURN_FALSE;
}
- date_instanciate(date_ce_date, return_value TSRMLS_CC);
+ date_instantiate(date_ce_date, return_value TSRMLS_CC);
dateobj = (php_date_obj *) zend_object_store_get_object(return_value
TSRMLS_CC);
dateobj-time = timelib_strtotime(time_str_len ? time_str : now,
time_str_len ? time_str_len : sizeof(now) -1, NULL, DATE_TIMEZONEDB);
@@ -1652,7 +1652,7 @@
}
dateobj = (php_date_obj *) zend_object_store_get_object(object
TSRMLS_CC);
if (dateobj-time-is_localtime dateobj-time-tz_info) {
- date_instanciate(date_ce_timezone, return_value TSRMLS_CC);
+ date_instantiate(date_ce_timezone, return_value TSRMLS_CC);
tzobj = (php_timezone_obj *)
zend_object_store_get_object(return_value TSRMLS_CC);
tzobj-tz = timelib_tzinfo_clone(dateobj-time-tz_info);
} else {
@@ -1776,7 +1776,7 @@
}
/* If we find it we instantiate the object otherwise, well, we don't
and return false */
if (tzi) {
- date_instanciate(date_ce_timezone, return_value TSRMLS_CC);
+ date_instantiate(date_ce_timezone, return_value TSRMLS_CC);
tzobj = (php_timezone_obj *)
zend_object_store_get_object(return_value TSRMLS_CC);
tzobj-tz = tzi;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
