[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue May 23 05:31:52 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2353r2=1.2354diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2353 php-src/ChangeLog:1.2354 --- php-src/ChangeLog:1.2353Mon May 22 05:31:52 2006 +++ php-src/ChangeLog Tue May 23 05:31:51 2006 @@ -1,3 +1,96 @@ +2006-05-22 Marcus Boerger [EMAIL PROTECTED] + +* .gdbinit: + - Provide user func printztype to retrieve the name of a zval type + +* (PHP_5_2) + NEWS: + - Update + +2006-05-22 Rob Richards [EMAIL PROTECTED] + +* (PHP_5_2) + ext/dom/attr.c + ext/dom/document.c + ext/dom/dom_fe.h + ext/dom/php_dom.c + ext/dom/php_dom.h + ext/dom/xml_common.h + ext/dom/tests/regsiter_node_class.phpt: + MFH: add registerNodeClass() method + - update attribute isID functionality + - add test + +* ext/dom/tests/regsiter_node_class.phpt + ext/dom/tests/regsiter_node_class.phpt: + + add test + +2006-05-22 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/ming/ming.c: + MFB: E_ERROR E_RECOVERABLE_ERROR + +* (PHP_5_2) + ext/ming/ming.c: + E_ERROR E_RECOVERABLE_ERROR + +2006-05-22 Greg Beaver [EMAIL PROTECTED] + +* (PHP_4_4) + pear/install-pear.php + pear/PEAR/Downloader.php + pear/PEAR/REST.php: + fix PEAR build + +* pear/packages/PEAR-1.4.9.tar + pear/packages/PEAR-1.4.9.tar: + + file PEAR-1.4.9.tar was initially added on branch PHP_4_4. + +* (PHP_4_4) + pear/PEAR.php + pear/System.php + pear/install-pear.php + pear/PEAR/ChannelFile.php + pear/PEAR/Common.php + pear/PEAR/Config.php + pear/PEAR/Dependency2.php + pear/PEAR/Downloader.php + pear/PEAR/Frontend.php + pear/PEAR/Installer.php + pear/PEAR/PackageFile.php + pear/PEAR/REST.php + pear/PEAR/Registry.php + pear/PEAR/Remote.php + pear/PEAR/Validate.php + pear/PEAR/Command/Install.php + pear/PEAR/Frontend/CLI.php + pear/packages/PEAR-1.4.6.tar: + sync to PEAR 1.4.9 + add PEAR 1.4.9 to installed tarballs + +2006-05-22 Dmitry Stogov [EMAIL PROTECTED] + +* sapi/cgi/fastcgi.c + sapi/cgi/fastcgi.c + sapi/cgi/fastcgi.c: + Fixed bug #37496 (FastCGI output buffer overrun) + +2006-05-22 Antony Dovgal [EMAIL PROTECTED] + +* sapi/cgi/fastcgi.c + sapi/cgi/fastcgi.c: + fix typo + +* (PHP_5_1) + ext/oci8/config.w32 + ext/oci8/config.w32: + re-enable OCILobRead2() support + +* ext/oci8/config.w32: + re-enable OCILobRead2() support on win32 + 2006-05-21 Marcus Boerger [EMAIL PROTECTED] * (PHP_4_4)
[PHP-CVS] cvs: php-src /sapi/cgi fastcgi.c
tony2001Mon May 22 06:49:44 2006 UTC Modified files: /php-src/sapi/cgi fastcgi.c Log: fix typo http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.16r2=1.17diff_format=u Index: php-src/sapi/cgi/fastcgi.c diff -u php-src/sapi/cgi/fastcgi.c:1.16 php-src/sapi/cgi/fastcgi.c:1.17 --- php-src/sapi/cgi/fastcgi.c:1.16 Mon May 15 14:30:50 2006 +++ php-src/sapi/cgi/fastcgi.c Mon May 22 06:49:44 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: fastcgi.c,v 1.16 2006/05/15 14:30:50 dmitry Exp $ */ +/* $Id: fastcgi.c,v 1.17 2006/05/22 06:49:44 tony2001 Exp $ */ #include php.h #include fastcgi.h @@ -484,7 +484,7 @@ break; case FCGI_FILTER: val = strdup(FILTER); - zend_hash_update(req-env, FCGI_ROLE, sizeof(FCGI_ROLE), val, sizeof(char*), NULL); + zend_hash_update(req-env, FCGI_ROLE, sizeof(FCGI_ROLE), val, sizeof(char*), NULL); break; default: return 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) /sapi/cgi fastcgi.c
tony2001Mon May 22 06:49:49 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/cgi fastcgi.c Log: fix typo http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.2r2=1.4.2.13.2.3diff_format=u Index: php-src/sapi/cgi/fastcgi.c diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.2 php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.3 --- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.2 Mon May 15 14:30:31 2006 +++ php-src/sapi/cgi/fastcgi.c Mon May 22 06:49:48 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: fastcgi.c,v 1.4.2.13.2.2 2006/05/15 14:30:31 dmitry Exp $ */ +/* $Id: fastcgi.c,v 1.4.2.13.2.3 2006/05/22 06:49:48 tony2001 Exp $ */ #include php.h #include fastcgi.h @@ -484,7 +484,7 @@ break; case FCGI_FILTER: val = strdup(FILTER); - zend_hash_update(req-env, FCGI_ROLE, sizeof(FCGI_ROLE), val, sizeof(char*), NULL); + zend_hash_update(req-env, FCGI_ROLE, sizeof(FCGI_ROLE), val, sizeof(char*), NULL); break; default: return 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) /sapi/cgi fastcgi.c
dmitry Mon May 22 09:22:20 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi fastcgi.c
Log:
Fixed bug #37496 (FastCGI output buffer overrun)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.3r2=1.4.2.13.2.4diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.3
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.4
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.3 Mon May 22 06:49:48 2006
+++ php-src/sapi/cgi/fastcgi.c Mon May 22 09:22:20 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.13.2.3 2006/05/22 06:49:48 tony2001 Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.4 2006/05/22 09:22:20 dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -764,15 +764,17 @@
if (req-out_hdr req-out_hdr-type != type) {
close_packet(req);
}
- rest = len;
#if 0
- /* Unoptinmzed, but clear version */
+ /* Unoptimized, but clear version */
+ rest = len;
while (rest 0) {
limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
if (!req-out_hdr) {
if (limit sizeof(fcgi_header)) {
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
}
open_packet(req, type);
}
@@ -786,32 +788,38 @@
req-out_pos += limit;
rest -= limit;
str += limit;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
}
}
#else
- /* Optinmzed version */
+ /* Optimized version */
+ limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
if (!req-out_hdr) {
- rest += sizeof(fcgi_header);
+ limit -= sizeof(fcgi_header);
}
- limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
- if (rest limit) {
+ if (len limit) {
if (!req-out_hdr) {
open_packet(req, type);
}
memcpy(req-out_pos, str, len);
req-out_pos += len;
- } else if (rest - limit sizeof(req-out_buf) - sizeof(fcgi_header)) {
+ } else if (len - limit sizeof(req-out_buf) - sizeof(fcgi_header)) {
if (!req-out_hdr) {
open_packet(req, type);
}
memcpy(req-out_pos, str, limit);
req-out_pos += limit;
- fcgi_flush(req, 0);
- open_packet(req, type);
- memcpy(req-out_pos, str + limit, len - limit);
- req-out_pos += len - limit;
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
+ if (len limit) {
+ open_packet(req, type);
+ memcpy(req-out_pos, str + limit, len - limit);
+ req-out_pos += len - limit;
+ }
} else {
int pos = 0;
int pad;
@@ -821,7 +829,9 @@
open_packet(req, type);
fcgi_make_header(req-out_hdr, type, req-id, 0xfff8);
req-out_hdr = NULL;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
if (safe_write(req, str + pos, 0xfff8) != 0xfff8) {
req-keep = 0;
return -1;
@@ -835,7 +845,9 @@
open_packet(req, type);
fcgi_make_header(req-out_hdr, type, req-id, (len - pos) -
rest);
req-out_hdr = NULL;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
if (safe_write(req, str + pos, (len - pos) - rest) != (len -
pos) - rest) {
req-keep = 0;
return -1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /sapi/cgi fastcgi.c
dmitry Mon May 22 09:22:40 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/sapi/cgi fastcgi.c
Log:
Fixed bug #37496 (FastCGI output buffer overrun)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13r2=1.4.2.14diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13 php-src/sapi/cgi/fastcgi.c:1.4.2.14
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13 Fri May 5 07:05:34 2006
+++ php-src/sapi/cgi/fastcgi.c Mon May 22 09:22:40 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.13 2006/05/05 07:05:34 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.14 2006/05/22 09:22:40 dmitry Exp $ */
#include fastcgi.h
#include php.h
@@ -769,15 +769,17 @@
if (req-out_hdr req-out_hdr-type != type) {
close_packet(req);
}
- rest = len;
#if 0
- /* Unoptinmzed, but clear version */
+ /* Unoptimized, but clear version */
+ rest = len;
while (rest 0) {
limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
if (!req-out_hdr) {
if (limit sizeof(fcgi_header)) {
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
}
open_packet(req, type);
}
@@ -791,32 +793,38 @@
req-out_pos += limit;
rest -= limit;
str += limit;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
}
}
#else
- /* Optinmzed version */
+ /* Optimized version */
+ limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
if (!req-out_hdr) {
- rest += sizeof(fcgi_header);
+ limit -= sizeof(fcgi_header);
}
- limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
- if (rest limit) {
+ if (len limit) {
if (!req-out_hdr) {
open_packet(req, type);
}
memcpy(req-out_pos, str, len);
req-out_pos += len;
- } else if (rest - limit sizeof(req-out_buf) - sizeof(fcgi_header)) {
+ } else if (len - limit sizeof(req-out_buf) - sizeof(fcgi_header)) {
if (!req-out_hdr) {
open_packet(req, type);
}
memcpy(req-out_pos, str, limit);
req-out_pos += limit;
- fcgi_flush(req, 0);
- open_packet(req, type);
- memcpy(req-out_pos, str + limit, len - limit);
- req-out_pos += len - limit;
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
+ if (len limit) {
+ open_packet(req, type);
+ memcpy(req-out_pos, str + limit, len - limit);
+ req-out_pos += len - limit;
+ }
} else {
int pos = 0;
int pad;
@@ -826,7 +834,9 @@
open_packet(req, type);
fcgi_make_header(req-out_hdr, type, req-id, 0xfff8);
req-out_hdr = NULL;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
if (safe_write(req, str + pos, 0xfff8) != 0xfff8) {
req-keep = 0;
return -1;
@@ -840,7 +850,9 @@
open_packet(req, type);
fcgi_make_header(req-out_hdr, type, req-id, (len - pos) -
rest);
req-out_hdr = NULL;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
if (safe_write(req, str + pos, (len - pos) - rest) != (len -
pos) - rest) {
req-keep = 0;
return -1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi fastcgi.c
dmitry Mon May 22 09:23:01 2006 UTC
Modified files:
/php-src/sapi/cgi fastcgi.c
Log:
Fixed bug #37496 (FastCGI output buffer overrun)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.17r2=1.18diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.17 php-src/sapi/cgi/fastcgi.c:1.18
--- php-src/sapi/cgi/fastcgi.c:1.17 Mon May 22 06:49:44 2006
+++ php-src/sapi/cgi/fastcgi.c Mon May 22 09:23:01 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.17 2006/05/22 06:49:44 tony2001 Exp $ */
+/* $Id: fastcgi.c,v 1.18 2006/05/22 09:23:01 dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -764,15 +764,17 @@
if (req-out_hdr req-out_hdr-type != type) {
close_packet(req);
}
- rest = len;
#if 0
- /* Unoptinmzed, but clear version */
+ /* Unoptimized, but clear version */
+ rest = len;
while (rest 0) {
limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
if (!req-out_hdr) {
if (limit sizeof(fcgi_header)) {
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
}
open_packet(req, type);
}
@@ -786,32 +788,38 @@
req-out_pos += limit;
rest -= limit;
str += limit;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
}
}
#else
- /* Optinmzed version */
+ /* Optimized version */
+ limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
if (!req-out_hdr) {
- rest += sizeof(fcgi_header);
+ limit -= sizeof(fcgi_header);
}
- limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
- if (rest limit) {
+ if (len limit) {
if (!req-out_hdr) {
open_packet(req, type);
}
memcpy(req-out_pos, str, len);
req-out_pos += len;
- } else if (rest - limit sizeof(req-out_buf) - sizeof(fcgi_header)) {
+ } else if (len - limit sizeof(req-out_buf) - sizeof(fcgi_header)) {
if (!req-out_hdr) {
open_packet(req, type);
}
memcpy(req-out_pos, str, limit);
req-out_pos += limit;
- fcgi_flush(req, 0);
- open_packet(req, type);
- memcpy(req-out_pos, str + limit, len - limit);
- req-out_pos += len - limit;
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
+ if (len limit) {
+ open_packet(req, type);
+ memcpy(req-out_pos, str + limit, len - limit);
+ req-out_pos += len - limit;
+ }
} else {
int pos = 0;
int pad;
@@ -821,7 +829,9 @@
open_packet(req, type);
fcgi_make_header(req-out_hdr, type, req-id, 0xfff8);
req-out_hdr = NULL;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
if (safe_write(req, str + pos, 0xfff8) != 0xfff8) {
req-keep = 0;
return -1;
@@ -835,7 +845,9 @@
open_packet(req, type);
fcgi_make_header(req-out_hdr, type, req-id, (len - pos) -
rest);
req-out_hdr = NULL;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
if (safe_write(req, str + pos, (len - pos) - rest) != (len -
pos) - rest) {
req-keep = 0;
return -1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi fastcgi.c
NEWS entry?
On 5/22/06, Dmitry Stogov [EMAIL PROTECTED] wrote:
dmitry Mon May 22 09:22:20 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi fastcgi.c
Log:
Fixed bug #37496 (FastCGI output buffer overrun)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.3r2=1.4.2.13.2.4diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.3
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.4
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.3 Mon May 22 06:49:48 2006
+++ php-src/sapi/cgi/fastcgi.c Mon May 22 09:22:20 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.13.2.3 2006/05/22 06:49:48 tony2001 Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.4 2006/05/22 09:22:20 dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -764,15 +764,17 @@
if (req-out_hdr req-out_hdr-type != type) {
close_packet(req);
}
- rest = len;
#if 0
- /* Unoptinmzed, but clear version */
+ /* Unoptimized, but clear version */
+ rest = len;
while (rest 0) {
limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
if (!req-out_hdr) {
if (limit sizeof(fcgi_header)) {
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
}
open_packet(req, type);
}
@@ -786,32 +788,38 @@
req-out_pos += limit;
rest -= limit;
str += limit;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
}
}
#else
- /* Optinmzed version */
+ /* Optimized version */
+ limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
if (!req-out_hdr) {
- rest += sizeof(fcgi_header);
+ limit -= sizeof(fcgi_header);
}
- limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
- if (rest limit) {
+ if (len limit) {
if (!req-out_hdr) {
open_packet(req, type);
}
memcpy(req-out_pos, str, len);
req-out_pos += len;
- } else if (rest - limit sizeof(req-out_buf) - sizeof(fcgi_header)) {
+ } else if (len - limit sizeof(req-out_buf) - sizeof(fcgi_header)) {
if (!req-out_hdr) {
open_packet(req, type);
}
memcpy(req-out_pos, str, limit);
req-out_pos += limit;
- fcgi_flush(req, 0);
- open_packet(req, type);
- memcpy(req-out_pos, str + limit, len - limit);
- req-out_pos += len - limit;
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
+ if (len limit) {
+ open_packet(req, type);
+ memcpy(req-out_pos, str + limit, len - limit);
+ req-out_pos += len - limit;
+ }
} else {
int pos = 0;
int pad;
@@ -821,7 +829,9 @@
open_packet(req, type);
fcgi_make_header(req-out_hdr, type, req-id, 0xfff8);
req-out_hdr = NULL;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
if (safe_write(req, str + pos, 0xfff8) != 0xfff8) {
req-keep = 0;
return -1;
@@ -835,7 +845,9 @@
open_packet(req, type);
fcgi_make_header(req-out_hdr, type, req-id, (len - pos) -
rest);
req-out_hdr = NULL;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
if (safe_write(req, str + pos, (len - pos) - rest) != (len -
pos) - rest) {
req-keep = 0;
return -1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /pear install-pear.php /pear/PEAR Downloader.php REST.php /pear/PEAR/PackageFile/v2 Validator.php
cellog Mon May 22 11:17:02 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/pear install-pear.php
/php-src/pear/PEAR Downloader.php REST.php
/php-src/pear/PEAR/PackageFile/v2 Validator.php
Log:
fix PEAR build
http://cvs.php.net/viewcvs.cgi/php-src/pear/install-pear.php?r1=1.6.2.14.4.8r2=1.6.2.14.4.9diff_format=u
Index: php-src/pear/install-pear.php
diff -u php-src/pear/install-pear.php:1.6.2.14.4.8
php-src/pear/install-pear.php:1.6.2.14.4.9
--- php-src/pear/install-pear.php:1.6.2.14.4.8 Mon May 22 10:19:33 2006
+++ php-src/pear/install-pear.php Mon May 22 11:17:01 2006
@@ -1,10 +1,10 @@
?php
-/* $Id: install-pear.php,v 1.6.2.14.4.8 2006/05/22 10:19:33 cellog Exp $ */
+/* $Id: install-pear.php,v 1.6.2.14.4.9 2006/05/22 11:17:01 cellog Exp $ */
error_reporting(E_ALL);
$pear_dir = dirname(__FILE__);
-ini_set('include_path', '');
+ini_set('include_path', $pear_dir);
if (function_exists('mb_internal_encoding')) {
mb_internal_encoding('ASCII');
}
@@ -126,6 +126,12 @@
foreach ($install_files as $package = $instfile) {
$info = $pkg-fromAnyFile($instfile, PEAR_VALIDATE_INSTALLING);
if (PEAR::isError($info)) {
+if (is_array($info-getUserInfo())) {
+ foreach ($info-getUserInfo() as $err) {
+ $ui-outputData(sprintf([PEAR] %s: %s, $err['level'],
+ $err['message']));
+ }
+ }
$ui-outputData(sprintf([PEAR] %s: %s, $package,
$info-getMessage()));
continue;
@@ -134,6 +140,12 @@
$downloaderpackage = new PEAR_Downloader_Package($installer);
$err = $downloaderpackage-initialize($instfile);
if (PEAR::isError($err)) {
+if (is_array($err-getUserInfo())) {
+ foreach ($err-getUserInfo() as $error) {
+ $ui-outputData(sprintf([PEAR] %s: %s, $error['level'],
+ $error['message']));
+ }
+ }
$ui-outputData(sprintf([PEAR] %s: %s, $package,
$err-getMessage()));
continue;
}
http://cvs.php.net/viewcvs.cgi/php-src/pear/PEAR/Downloader.php?r1=1.9.2.8.2.2r2=1.9.2.8.2.3diff_format=u
Index: php-src/pear/PEAR/Downloader.php
diff -u php-src/pear/PEAR/Downloader.php:1.9.2.8.2.2
php-src/pear/PEAR/Downloader.php:1.9.2.8.2.3
--- php-src/pear/PEAR/Downloader.php:1.9.2.8.2.2Mon May 22 10:19:33 2006
+++ php-src/pear/PEAR/Downloader.phpMon May 22 11:17:01 2006
@@ -18,7 +18,7 @@
* @author Martin Jansen [EMAIL PROTECTED]
* @copyright 1997-2005 The PHP Group
* @licensehttp://www.php.net/license/3_0.txt PHP License 3.0
- * @versionCVS: $Id: Downloader.php,v 1.9.2.8.2.2 2006/05/22 10:19:33
cellog Exp $
+ * @versionCVS: $Id: Downloader.php,v 1.9.2.8.2.3 2006/05/22 11:17:01
cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.3.0
*/
@@ -1395,7 +1395,7 @@
$ifmodifiedsince = ($lastmodified ? If-Modified-Since:
$lastmodified\r\n : '');
}
$request .= Host: $host:$port\r\n . $ifmodifiedsince .
-User-Agent: PEAR/@package_version@/PHP/ . PHP_VERSION . \r\n;
+User-Agent: PEAR/1.4.9/PHP/ . PHP_VERSION . \r\n;
if (isset($this)) { // only pass in authentication for non-static calls
$username = $config-get('username');
$password = $config-get('password');
@@ -1507,4 +1507,4 @@
}
// }}}
-?
\ No newline at end of file
+?
http://cvs.php.net/viewcvs.cgi/php-src/pear/PEAR/REST.php?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/pear/PEAR/REST.php
diff -u php-src/pear/PEAR/REST.php:1.1.2.2 php-src/pear/PEAR/REST.php:1.1.2.3
--- php-src/pear/PEAR/REST.php:1.1.2.2 Mon May 22 10:19:33 2006
+++ php-src/pear/PEAR/REST.php Mon May 22 11:17:01 2006
@@ -15,7 +15,7 @@
* @author Greg Beaver [EMAIL PROTECTED]
* @copyright 1997-2005 The PHP Group
* @licensehttp://www.php.net/license/3_0.txt PHP License 3.0
- * @versionCVS: $Id: REST.php,v 1.1.2.2 2006/05/22 10:19:33 cellog Exp $
+ * @versionCVS: $Id: REST.php,v 1.1.2.3 2006/05/22 11:17:01 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -323,7 +323,7 @@
$ifmodifiedsince = ($lastmodified ? If-Modified-Since:
$lastmodified\r\n : '');
}
$request .= Host: $host:$port\r\n . $ifmodifiedsince .
-User-Agent: PEAR/@package_version@/PHP/ . PHP_VERSION . \r\n;
+User-Agent: PEAR/1.4.9/PHP/ . PHP_VERSION . \r\n;
$username = $this-config-get('username');
$password = $this-config-get('password');
if ($username $password) {
@@ -394,4 +394,4 @@
return $data;
}
}
-?
\ No newline at end of file
+?
http://cvs.php.net/viewcvs.cgi/php-src/pear/PEAR/PackageFile/v2/Validator.php?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/pear/PEAR/PackageFile/v2/Validator.php
diff -u
RE: [PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi fastcgi.c
I am waiting while bug submitter will test patch.
Dmitry.
-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On Behalf Of Hannes Magnusson
Sent: Monday, May 22, 2006 2:26 PM
To: Dmitry Stogov
Cc: php-cvs@lists.php.net
Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi fastcgi.c
NEWS entry?
On 5/22/06, Dmitry Stogov [EMAIL PROTECTED] wrote:
dmitry Mon May 22 09:22:20 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi fastcgi.c
Log:
Fixed bug #37496 (FastCGI output buffer overrun)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.
2.3r2=1.4.2.13.2.4diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.3
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.4
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.3 Mon May 22
06:49:48 2006
+++ php-src/sapi/cgi/fastcgi.c Mon May 22 09:22:20 2006
@@ -16,7 +16,7 @@
+-
-+
*/
-/* $Id: fastcgi.c,v 1.4.2.13.2.3 2006/05/22 06:49:48
tony2001 Exp $
*/
+/* $Id: fastcgi.c,v 1.4.2.13.2.4 2006/05/22 09:22:20
dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -764,15 +764,17 @@
if (req-out_hdr req-out_hdr-type != type) {
close_packet(req);
}
- rest = len;
#if 0
- /* Unoptinmzed, but clear version */
+ /* Unoptimized, but clear version */
+ rest = len;
while (rest 0) {
limit = sizeof(req-out_buf) - (req-out_pos -
req-out_buf);
if (!req-out_hdr) {
if (limit sizeof(fcgi_header)) {
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
}
open_packet(req, type);
}
@@ -786,32 +788,38 @@
req-out_pos += limit;
rest -= limit;
str += limit;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
}
}
#else
- /* Optinmzed version */
+ /* Optimized version */
+ limit = sizeof(req-out_buf) - (req-out_pos -
req-out_buf);
if (!req-out_hdr) {
- rest += sizeof(fcgi_header);
+ limit -= sizeof(fcgi_header);
}
- limit = sizeof(req-out_buf) - (req-out_pos -
req-out_buf);
- if (rest limit) {
+ if (len limit) {
if (!req-out_hdr) {
open_packet(req, type);
}
memcpy(req-out_pos, str, len);
req-out_pos += len;
- } else if (rest - limit sizeof(req-out_buf) -
sizeof(fcgi_header)) {
+ } else if (len - limit sizeof(req-out_buf) -
+ sizeof(fcgi_header)) {
if (!req-out_hdr) {
open_packet(req, type);
}
memcpy(req-out_pos, str, limit);
req-out_pos += limit;
- fcgi_flush(req, 0);
- open_packet(req, type);
- memcpy(req-out_pos, str + limit, len - limit);
- req-out_pos += len - limit;
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
+ if (len limit) {
+ open_packet(req, type);
+ memcpy(req-out_pos, str + limit,
len - limit);
+ req-out_pos += len - limit;
+ }
} else {
int pos = 0;
int pad;
@@ -821,7 +829,9 @@
open_packet(req, type);
fcgi_make_header(req-out_hdr,
type, req-id, 0xfff8);
req-out_hdr = NULL;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
if (safe_write(req, str + pos,
0xfff8) != 0xfff8) {
req-keep = 0;
return -1;
@@ -835,7 +845,9 @@
open_packet(req, type);
fcgi_make_header(req-out_hdr, type,
req-id, (len - pos) - rest);
req-out_hdr = NULL;
- fcgi_flush(req, 0);
+ if (!fcgi_flush(req, 0)) {
+ return -1;
+ }
if (safe_write(req, str + pos, (len - pos)
- rest) != (len - pos) - rest) {
req-keep
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ming ming.c
iliaa Mon May 22 14:22:18 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ming ming.c
Log:
E_ERROR E_RECOVERABLE_ERROR
http://cvs.php.net/viewcvs.cgi/php-src/ext/ming/ming.c?r1=1.79.2.4r2=1.79.2.4.2.1diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.79.2.4 php-src/ext/ming/ming.c:1.79.2.4.2.1
--- php-src/ext/ming/ming.c:1.79.2.4Mon Mar 6 10:06:15 2006
+++ php-src/ext/ming/ming.c Mon May 22 14:22:18 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ming.c,v 1.79.2.4 2006/03/06 10:06:15 helly Exp $ */
+/* $Id: ming.c,v 1.79.2.4.2.1 2006/05/22 14:22:18 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -259,7 +259,7 @@
return (SWFCharacter)getPrebuiltClip(id TSRMLS_CC);
#endif
else
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFCharacter);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFCharacter);
return NULL;
}
/* }}} */
@@ -312,7 +312,7 @@
action = compileSWFActionCode(Z_STRVAL_PP(script));
if (!action) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Couldn't compile
actionscript);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Couldn't
compile actionscript);
}
ret = zend_list_insert(action, le_swfactionp);
@@ -331,7 +331,7 @@
void *action = SWFgetProperty(id, action, 6, le_swfactionp TSRMLS_CC);
if (!action) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFAction);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFAction);
}
return (SWFAction)action;
}
@@ -407,7 +407,7 @@
void *bitmap = SWFgetProperty(id, bitmap, 6, le_swfbitmapp TSRMLS_CC);
if (!bitmap) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFBitmap);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFBitmap);
}
return (SWFBitmap)bitmap;
}
@@ -465,7 +465,7 @@
void *button = SWFgetProperty(id, button, 6, le_swfbuttonp TSRMLS_CC);
if (!button) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFButton);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFButton);
}
return (SWFButton)button;
}
@@ -664,7 +664,7 @@
convert_to_string_ex(key);
if (Z_STRLEN_PP(key) 1) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Only one character
expected);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Only one
character expected);
}
c = Z_STRVAL_PP(key)[0];
@@ -701,7 +701,7 @@
void *item = SWFgetProperty(id, displayitem, 11, le_swfdisplayitemp
TSRMLS_CC);
if (!item) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFDisplayItem);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFDisplayItem);
}
return (SWFDisplayItem)item;
@@ -1208,7 +1208,7 @@
Creates a new SWFFill object */
PHP_METHOD(swffill, __construct)
{
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Instantiating SWFFill won't do
any good- use SWFShape::addFill() instead);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Instantiating SWFFill
won't do any good- use SWFShape::addFill() instead);
}
static void destroy_SWFFill_resource(zend_rsrc_list_entry *resource TSRMLS_DC)
@@ -1227,7 +1227,7 @@
void *fill = SWFgetProperty(id, fill, 4, le_swffillp TSRMLS_CC);
if (!fill) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFFill);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFFill);
}
return (SWFFill)fill;
}
@@ -1338,7 +1338,7 @@
void *font = SWFgetProperty(id, fontcharacter, 13, le_swffontcharp
TSRMLS_CC);
if(!font)
- php_error(E_ERROR, called object is not an SWFFontCharacter!);
+ php_error(E_RECOVERABLE_ERROR, called object is not an
SWFFontCharacter!);
return (SWFFontCharacter)font;
}
@@ -1398,7 +1398,7 @@
void *font = SWFgetProperty(id, font, 4, le_swffontp TSRMLS_CC);
if (!font) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFFont);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFFont);
}
return (SWFFont)font;
}
@@ -1619,7 +1619,7 @@
void *gradient = SWFgetProperty(id, gradient, 8, le_swfgradientp
TSRMLS_CC);
if (!gradient) {
-
[PHP-CVS] cvs: php-src /ext/ming ming.c
iliaa Mon May 22 14:22:59 2006 UTC
Modified files:
/php-src/ext/ming ming.c
Log:
MFB: E_ERROR E_RECOVERABLE_ERROR
http://cvs.php.net/viewcvs.cgi/php-src/ext/ming/ming.c?r1=1.85r2=1.86diff_format=u
Index: php-src/ext/ming/ming.c
diff -u php-src/ext/ming/ming.c:1.85 php-src/ext/ming/ming.c:1.86
--- php-src/ext/ming/ming.c:1.85Mon Mar 6 10:06:02 2006
+++ php-src/ext/ming/ming.c Mon May 22 14:22:59 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: ming.c,v 1.85 2006/03/06 10:06:02 helly Exp $ */
+/* $Id: ming.c,v 1.86 2006/05/22 14:22:59 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -259,7 +259,7 @@
return (SWFCharacter)getPrebuiltClip(id TSRMLS_CC);
#endif
else
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFCharacter);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFCharacter);
return NULL;
}
/* }}} */
@@ -312,7 +312,7 @@
action = compileSWFActionCode(Z_STRVAL_PP(script));
if (!action) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Couldn't compile
actionscript);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Couldn't
compile actionscript);
}
ret = zend_list_insert(action, le_swfactionp);
@@ -331,7 +331,7 @@
void *action = SWFgetProperty(id, action, 6, le_swfactionp TSRMLS_CC);
if (!action) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFAction);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFAction);
}
return (SWFAction)action;
}
@@ -407,7 +407,7 @@
void *bitmap = SWFgetProperty(id, bitmap, 6, le_swfbitmapp TSRMLS_CC);
if (!bitmap) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFBitmap);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFBitmap);
}
return (SWFBitmap)bitmap;
}
@@ -465,7 +465,7 @@
void *button = SWFgetProperty(id, button, 6, le_swfbuttonp TSRMLS_CC);
if (!button) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFButton);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFButton);
}
return (SWFButton)button;
}
@@ -664,7 +664,7 @@
convert_to_string_ex(key);
if (Z_STRLEN_PP(key) 1) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Only one character
expected);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Only one
character expected);
}
c = Z_STRVAL_PP(key)[0];
@@ -701,7 +701,7 @@
void *item = SWFgetProperty(id, displayitem, 11, le_swfdisplayitemp
TSRMLS_CC);
if (!item) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFDisplayItem);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFDisplayItem);
}
return (SWFDisplayItem)item;
@@ -1208,7 +1208,7 @@
Creates a new SWFFill object */
PHP_METHOD(swffill, __construct)
{
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Instantiating SWFFill won't do
any good- use SWFShape::addFill() instead);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Instantiating SWFFill
won't do any good- use SWFShape::addFill() instead);
}
static void destroy_SWFFill_resource(zend_rsrc_list_entry *resource TSRMLS_DC)
@@ -1227,7 +1227,7 @@
void *fill = SWFgetProperty(id, fill, 4, le_swffillp TSRMLS_CC);
if (!fill) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFFill);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFFill);
}
return (SWFFill)fill;
}
@@ -1338,7 +1338,7 @@
void *font = SWFgetProperty(id, fontcharacter, 13, le_swffontcharp
TSRMLS_CC);
if(!font)
- php_error(E_ERROR, called object is not an SWFFontCharacter!);
+ php_error(E_RECOVERABLE_ERROR, called object is not an
SWFFontCharacter!);
return (SWFFontCharacter)font;
}
@@ -1398,7 +1398,7 @@
void *font = SWFgetProperty(id, font, 4, le_swffontp TSRMLS_CC);
if (!font) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called object is not
an SWFFont);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, Called
object is not an SWFFont);
}
return (SWFFont)font;
}
@@ -1619,7 +1619,7 @@
void *gradient = SWFgetProperty(id, gradient, 8, le_swfgradientp
TSRMLS_CC);
if (!gradient) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Called
[PHP-CVS] cvs: php-src /ext/dom/tests regsiter_node_class.phpt
rrichards Mon May 22 17:05:38 2006 UTC
Added files:
/php-src/ext/dom/tests regsiter_node_class.phpt
Log:
add test
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/tests/regsiter_node_class.phpt?view=markuprev=1.1
Index: php-src/ext/dom/tests/regsiter_node_class.phpt
+++ php-src/ext/dom/tests/regsiter_node_class.phpt
--TEST--
Test: registerNodeClass()
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
class myAttribute extends DOMAttr {
function testit() { return HELLO Attribute; }
}
class myElement extends DOMElement {
function testit() { return HELLO Element; }
}
$doc = new DOMDocument();
$doc-registerNodeClass('DOMAttr', 'myAttribute');
$doc-registerNodeClass('DOMElement', 'myElement');
$doc-appendChild(new DOMElement('root'));
$root = $doc-documentElement;
$root-setAttribute('a', 'a1');
var_dump($root);
print $root-testit().\n;
$attr = $root-getAttributeNode('a');
var_dump($attr);
print $attr-testit().\n;
unset($attr);
$doc-registerNodeClass('DOMAttr', NULL);
$attr = $root-getAttributeNode('a');
var_dump($attr);
print $attr-testit().\n;
?
--EXPECTF--
object(myElement)#%d (0) {
}
HELLO Element
object(myAttribute)#%d (0) {
}
HELLO Attribute
object(DOMAttr)#%d (0) {
}
Fatal error: Call to undefined method DOMAttr::testit() in %s on line 25
--
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/libxml libxml.c php_libxml.h
rrichards Mon May 22 17:09:05 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/libxml libxml.c php_libxml.h
Log:
MFH: move document property struct from xml_common.h
http://cvs.php.net/viewcvs.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7r2=1.32.2.7.2.1diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7
php-src/ext/libxml/libxml.c:1.32.2.7.2.1
--- php-src/ext/libxml/libxml.c:1.32.2.7Sun Jan 1 12:50:08 2006
+++ php-src/ext/libxml/libxml.c Mon May 22 17:09:05 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.32.2.7 2006/01/01 12:50:08 sniper Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.1 2006/05/22 17:09:05 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -942,6 +942,10 @@
xmlFreeDoc((xmlDoc *) object-document-ptr);
}
if (object-document-doc_props != NULL) {
+ if (object-document-doc_props-classmap) {
+
zend_hash_destroy(object-document-doc_props-classmap);
+
FREE_HASHTABLE(object-document-doc_props-classmap);
+ }
efree(object-document-doc_props);
}
efree(object-document);
http://cvs.php.net/viewcvs.cgi/php-src/ext/libxml/php_libxml.h?r1=1.15.2.2r2=1.15.2.2.2.1diff_format=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.15.2.2
php-src/ext/libxml/php_libxml.h:1.15.2.2.2.1
--- php-src/ext/libxml/php_libxml.h:1.15.2.2Sun Jan 1 12:50:08 2006
+++ php-src/ext/libxml/php_libxml.h Mon May 22 17:09:05 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_libxml.h,v 1.15.2.2 2006/01/01 12:50:08 sniper Exp $ */
+/* $Id: php_libxml.h,v 1.15.2.2.2.1 2006/05/22 17:09:05 rrichards Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -43,10 +43,21 @@
zend_llist *error_list;
} php_libxml_globals;
+typedef struct _libxml_doc_props {
+ int formatoutput;
+ int validateonparse;
+ int resolveexternals;
+ int preservewhitespace;
+ int substituteentities;
+ int stricterror;
+ int recover;
+ HashTable *classmap;
+} libxml_doc_props;
+
typedef struct _php_libxml_ref_obj {
void *ptr;
int refcount;
- void *doc_props;
+ libxml_doc_props *doc_props;
} php_libxml_ref_obj;
typedef struct _php_libxml_node_ptr {
--
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/dom attr.c document.c dom_fe.h php_dom.c php_dom.h xml_common.h /ext/dom/tests regsiter_node_class.phpt
rrichards Mon May 22 17:12:26 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/dom/tests regsiter_node_class.phpt
Modified files:
/php-src/ext/domattr.c document.c dom_fe.h php_dom.c php_dom.h
xml_common.h
Log:
MFH: add registerNodeClass() method
- update attribute isID functionality
- add test
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/attr.c?r1=1.18.2.2r2=1.18.2.2.2.1diff_format=u
Index: php-src/ext/dom/attr.c
diff -u php-src/ext/dom/attr.c:1.18.2.2 php-src/ext/dom/attr.c:1.18.2.2.2.1
--- php-src/ext/dom/attr.c:1.18.2.2 Wed May 3 08:43:04 2006
+++ php-src/ext/dom/attr.c Mon May 22 17:12:25 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: attr.c,v 1.18.2.2 2006/05/03 08:43:04 rrichards Exp $ */
+/* $Id: attr.c,v 1.18.2.2.2.1 2006/05/22 17:12:25 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -262,7 +262,6 @@
zval *id;
dom_object *intern;
xmlAttrPtr attrp;
- xmlNodePtr nodep;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
O, id, dom_attr_class_entry) == FAILURE) {
return;
@@ -270,9 +269,7 @@
DOM_GET_OBJ(attrp, id, xmlAttrPtr, intern);
- nodep = attrp-parent;
-
- if (xmlIsID(attrp-doc, nodep, attrp)) {
+ if (attrp-atype == XML_ATTRIBUTE_ID) {
RETURN_TRUE;
} else {
RETURN_FALSE;
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/document.c?r1=1.68.2.3r2=1.68.2.3.2.1diff_format=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.68.2.3
php-src/ext/dom/document.c:1.68.2.3.2.1
--- php-src/ext/dom/document.c:1.68.2.3 Sun Jan 1 12:50:06 2006
+++ php-src/ext/dom/document.c Mon May 22 17:12:25 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.68.2.3 2006/01/01 12:50:06 sniper Exp $ */
+/* $Id: document.c,v 1.68.2.3.2.1 2006/05/22 17:12:25 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -85,6 +85,7 @@
PHP_FALIAS(relaxNGValidate, dom_document_relaxNG_validate_file, NULL)
PHP_FALIAS(relaxNGValidateSource, dom_document_relaxNG_validate_xml,
NULL)
#endif
+ PHP_ME(domdocument, registerNodeClass, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
@@ -384,7 +385,7 @@
*/
int dom_document_strict_error_checking_read(dom_object *obj, zval **retval
TSRMLS_DC)
{
- dom_doc_props *doc_prop;
+ dom_doc_propsptr doc_prop;
ALLOC_ZVAL(*retval);
if (obj-document) {
@@ -399,7 +400,7 @@
int dom_document_strict_error_checking_write(dom_object *obj, zval *newval
TSRMLS_DC)
{
zval value_copy;
- dom_doc_props *doc_prop;
+ dom_doc_propsptr doc_prop;
if(newval-refcount 1) {
value_copy = *newval;
@@ -427,7 +428,7 @@
*/
int dom_document_format_output_read(dom_object *obj, zval **retval TSRMLS_DC)
{
- dom_doc_props *doc_prop;
+ dom_doc_propsptr doc_prop;
ALLOC_ZVAL(*retval);
if (obj-document) {
@@ -442,7 +443,7 @@
int dom_document_format_output_write(dom_object *obj, zval *newval TSRMLS_DC)
{
zval value_copy;
- dom_doc_props *doc_prop;
+ dom_doc_propsptr doc_prop;
if(newval-refcount 1) {
value_copy = *newval;
@@ -469,7 +470,7 @@
*/
intdom_document_validate_on_parse_read(dom_object *obj, zval **retval
TSRMLS_DC)
{
- dom_doc_props *doc_prop;
+ dom_doc_propsptr doc_prop;
ALLOC_ZVAL(*retval);
if (obj-document) {
@@ -484,7 +485,7 @@
int dom_document_validate_on_parse_write(dom_object *obj, zval *newval
TSRMLS_DC)
{
zval value_copy;
- dom_doc_props *doc_prop;
+ dom_doc_propsptr doc_prop;
if(newval-refcount 1) {
value_copy = *newval;
@@ -512,7 +513,7 @@
*/
int dom_document_resolve_externals_read(dom_object *obj, zval **retval
TSRMLS_DC)
{
- dom_doc_props *doc_prop;
+ dom_doc_propsptr doc_prop;
ALLOC_ZVAL(*retval);
if (obj-document) {
@@ -527,7 +528,7 @@
int dom_document_resolve_externals_write(dom_object *obj, zval *newval
TSRMLS_DC)
{
zval value_copy;
- dom_doc_props *doc_prop;
+ dom_doc_propsptr doc_prop;
if(newval-refcount 1) {
value_copy = *newval;
@@ -555,7 +556,7 @@
*/
int dom_document_preserve_whitespace_read(dom_object *obj, zval **retval
TSRMLS_DC)
{
- dom_doc_props *doc_prop;
+ dom_doc_propsptr doc_prop;
ALLOC_ZVAL(*retval);
if (obj-document) {
@@ -570,7 +571,7 @@
int dom_document_preserve_whitespace_write(dom_object *obj, zval *newval
TSRMLS_DC)
{
zval value_copy;
- dom_doc_props *doc_prop;
+ dom_doc_propsptr doc_prop;
if(newval-refcount 1) {
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
helly Mon May 22 19:04:19 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - Update http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.38r2=1.2027.2.547.2.39diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.38 php-src/NEWS:1.2027.2.547.2.39 --- php-src/NEWS:1.2027.2.547.2.38 Sun May 21 16:31:56 2006 +++ php-src/NEWSMon May 22 19:04:19 2006 @@ -31,6 +31,7 @@ . Added new attribute ATTR_DEFAULT_FETCH_MODE. (Pierre) . Added FETCH_PROPS_LATE. (Marcus) - Improved SPL: (Marcus) + . Made most iterator code exception safe. . Added RegExIterator and RecursiveRegExIterator. . Added full caching support and ArrayAccess to CachingIterator. . Added array functions to ArrayObject/ArrayIterator and made them faster. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / .gdbinit
helly Mon May 22 19:43:15 2006 UTC
Modified files:
/php-src.gdbinit
Log:
- Provide user func printztype to retrieve the name of a zval type
http://cvs.php.net/viewcvs.cgi/php-src/.gdbinit?r1=1.18r2=1.19diff_format=u
Index: php-src/.gdbinit
diff -u php-src/.gdbinit:1.18 php-src/.gdbinit:1.19
--- php-src/.gdbinit:1.18 Sat May 20 12:44:46 2006
+++ php-src/.gdbinitMon May 22 19:43:15 2006
@@ -33,13 +33,62 @@
dumps the current execution stack. usage: dump_bt
executor_globals.current_execute_data
end
+define printztype
+ printz_type $arg0
+ printf \n
+end
+
+document printztype
+ prints the type name of a zval type
+end
+
+define printz_type
+ set $type = $arg0
+ if $type == 0
+ printf NULL
+ end
+ if $type == 1
+ printf long
+ end
+ if $type == 2
+ printf double
+ end
+ if $type == 3
+ printf bool
+ end
+ if $type == 4
+ printf array
+ end
+ if $type == 5
+ printf object
+ end
+ if $type == 6
+ printf string
+ end
+ if $type == 7
+ printf resource
+ end
+ if $type == 8
+ printf constant
+ end
+ if $type == 9
+ printf const_array
+ end
+ if $type == 10
+ printf unicode string
+ end
+ if $type 10
+ printf unknown type %d, $type
+ end
+end
+
define printzv
set $ind = 1
printzv $arg0 0
end
document printzv
- prints content of zval
+ prints zval contents
end
define printzv_contents
@@ -50,22 +99,22 @@
if $type == 0
printf NULL
end
+ printz_type $type
if $type == 1
- printf long: %ld, $zvalue-value.lval
+ printf : %ld, $zvalue-value.lval
end
if $type == 2
- printf double: %lf, $zvalue-value.dval
+ printf : %lf, $zvalue-value.dval
end
if $type == 3
- printf bool:
if $zvalue-value.lval
- printf true
+ printf : true
else
- printf false
+ printf : false
end
end
if $type == 4
- printf array(%d): , $zvalue-value.ht-nNumOfElements
+ printf (%d): , $zvalue-value.ht-nNumOfElements
if ! $arg1
printf {\n
set $ind = $ind + 1
@@ -81,7 +130,6 @@
set $type = 0
end
if $type == 5
- printf object
executor_globals
set $handle = $zvalue-value.obj.handle
set $handlers = $zvalue-value.obj.handlers
@@ -119,22 +167,19 @@
set $type = 0
end
if $type == 6
- printf string(%d): \%s\, $zvalue-value.str.len,
$zvalue-value.str.val
+ printf (%d): \%s\, $zvalue-value.str.len,
$zvalue-value.str.val
end
if $type == 7
- printf resource: #%d, $zvalue-value.lval
+ printf : #%d, $zvalue-value.lval
end
if $type == 8
- printf constant
end
if $type == 9
- printf const_array
end
if $type == 10
- printf unicode string(%d): [%p], $zvalue-value.str.len,
$zvalue-value.str.val
+ printf (%d): [%p], $zvalue-value.str.len,
$zvalue-value.str.val
end
if $type 10
- printfunknown type %d, $type
end
printf \n
end
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
