[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Dec 7 01:41:45 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2186r2=1.2187ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2186 php-src/ChangeLog:1.2187 --- php-src/ChangeLog:1.2186Tue Dec 6 01:44:52 2005 +++ php-src/ChangeLog Wed Dec 7 01:41:41 2005 @@ -1,3 +1,204 @@ +2005-12-06 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + main/main.c: + MFH: Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if + display_startup_error is off). + +* main/main.c: + MFB51: Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if + display_startup_error is off). + +* (PHP_5_1) + NEWS + main/main.c: + Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if + display_startup_error is off). + +2005-12-06 Marcus Boerger [EMAIL PROTECTED] + +* run-tests.php: + - Do not show leak summary if not tested + +2005-12-06 Sara Golemon [EMAIL PROTECTED] + +* ext/standard/http_fopen_wrapper.c: + Block potential segfault. + Context option type not checked for user_agent,header, and content + +2005-12-06 Antony Dovgal [EMAIL PROTECTED] + +* ext/oci8/oci8_statement.c: + MF51: use strlen() to get correct element length + +* (PHP_5_1) + ext/oci8/oci8_statement.c: + use strlen() to get correct element length + +2005-12-06 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_1) + ext/mssql/php_mssql.c: + Fixed build of mssql extension. + +2005-12-06 Marcus Boerger [EMAIL PROTECTED] + +* run-tests.php: + - Fix summaries again + +2005-12-06 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + NEWS + main/SAPI.c + main/SAPI.c: + MFH: Prevent header injection by limiting each header to a single line. + +* main/SAPI.c: + Prevent header injection by limiting each header to a single line. + +* (PHP_4_4) + NEWS + main/main.c: + MFH: Fixed possible XSS inside error reporting functionality. + +* main/main.c: + MFB51: Fixed possible XSS inside error reporting functionality. + +* (PHP_5_1) + NEWS + main/main.c: + Fixed possible XSS inside error reporting functionality. + +2005-12-06 Jani Taskinen [EMAIL PROTECTED] + +* README.input_filter: + - Fix docs + +* ext/bcmath/bcmath.c + ext/bz2/bz2.c + ext/calendar/cal_unix.c + ext/calendar/calendar.c + ext/com_dotnet/com_extension.c + ext/ctype/ctype.c + ext/curl/interface.c + ext/dba/dba.c + ext/dbase/dbase.c + ext/dom/dom_iterators.c + ext/dom/nodelist.c + ext/exif/exif.c + ext/fbsql/php_fbsql.c + ext/fdf/fdf.c + ext/filepro/filepro.c + ext/ftp/php_ftp.c + ext/gd/gd.c + ext/gettext/gettext.c + ext/gmp/gmp.c + ext/hwapi/hwapi.cpp + ext/iconv/iconv.c + ext/imap/php_imap.c + ext/informix/ifx.ec + ext/interbase/interbase.c + ext/ldap/ldap.c + ext/mcrypt/mcrypt.c + ext/mhash/mhash.c + ext/mime_magic/mime_magic.c + ext/msession/msession.c + ext/msql/php_msql.c + ext/mysql/php_mysql.c + ext/ncurses/ncurses_fe.c + ext/ncurses/php_ncurses.h + ext/odbc/birdstep.c + ext/openssl/openssl.c + ext/pcntl/pcntl.c + ext/pcre/php_pcre.c + ext/pgsql/pgsql.c + ext/posix/posix.c + ext/pspell/pspell.c + ext/readline/readline.c + ext/session/session.c + ext/shmop/shmop.c + ext/simplexml/simplexml.c + ext/snmp/snmp.c + ext/snmp/winsnmp.c + ext/sockets/sockets.c + ext/sqlite/pdo_sqlite2.c + ext/sqlite/sqlite.c + ext/sybase/php_sybase_db.c + ext/sybase_ct/php_sybase_ct.c + ext/sysvmsg/sysvmsg.c + ext/sysvsem/sysvsem.c + ext/sysvshm/sysvshm.c + ext/tokenizer/tokenizer.c + ext/wddx/wddx.c + ext/xml/xml.c + ext/xmlrpc/xmlrpc-epi-php.c + ext/xsl/php_xsl.c + ext/zlib/zlib.c + sapi/aolserver/aolserver.c + sapi/apache/php_apache.c + sapi/apache2filter/php_functions.c + sapi/apache2handler/php_functions.c + sapi/apache_hooks/php_apache.c + sapi/milter/php_milter.c + sapi/nsapi/nsapi.c: + - Nuke php3 legacy + +* (PHP_5_1) + ext/mbstring/mbstring.c: + sync with HEAD + +* ext/mbstring/mbstring.c + ext/sybase/php_sybase_db.c: + fix build + +2005-12-06 Marcus Boerger [EMAIL PROTECTED] + +* run-tests.php: + - Support for '--' style switches + - Modularize output + - Better valgrind integration (valgrind 3.0.0+ required now) (-m) + - Ability to generate an additional html style output log (--html) + - Ability to test unicode + native tests in one go (-U) + +2005-12-06 Jani Taskinen [EMAIL PROTECTED] + +* ext/gd/gd.c +
[PHP-CVS] cvs: CVSROOT / avail
pajoye Tue Dec 6 04:22:51 2005 EDT Modified files: /CVSROOTavail Log: - pear/text_wiki for ritzmo http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1061r2=1.1062ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1061 CVSROOT/avail:1.1062 --- CVSROOT/avail:1.1061Tue Dec 6 00:26:30 2005 +++ CVSROOT/avail Tue Dec 6 04:22:49 2005 @@ -308,6 +308,7 @@ avail|silvano,msaraujo|peardoc,pear/Validate avail|msaraujo|pear/Validate avail|cellog|pecl/phar +avail|ritzmo|pear/Text_Wiki # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src / run-tests.php
Hi Marcus, Now make test doesn't desplay failed tests. Probably attached patch should fix the problem. Thanks. Dmitry. -Original Message- From: Marcus Boerger [mailto:[EMAIL PROTECTED] Sent: Tuesday, December 06, 2005 4:51 AM To: php-cvs@lists.php.net Subject: [PHP-CVS] cvs: php-src / run-tests.php helly Mon Dec 5 20:51:19 2005 EDT Modified files: /php-src run-tests.php Log: - Support for '--' style switches - Modularize output - Better valgrind integration (valgrind 3.0.0+ required now) (-m) - Ability to generate an additional html style output log (--html) - Ability to test unicode + native tests in one go (-U) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
helly Tue Dec 6 04:34:47 2005 EDT Modified files: /php-srcrun-tests.php Log: - Fix summaries again http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.245r2=1.246ty=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.245 php-src/run-tests.php:1.246 --- php-src/run-tests.php:1.245 Mon Dec 5 20:51:17 2005 +++ php-src/run-tests.php Tue Dec 6 04:34:44 2005 @@ -23,7 +23,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.245 2005/12/06 01:51:17 helly Exp $ */ +/* $Id: run-tests.php,v 1.246 2005/12/06 09:34:44 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 @@ -332,7 +332,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo $id: $\n; + echo $Id: run-tests.php,v 1.246 2005/12/06 09:34:44 helly Exp $\n; exit(1); default: echo Illegal switch specified!\n; @@ -1275,7 +1275,7 @@ } show_result($restype, $tested, $file, $info); - $PHP_FAILED_TESTS[$restype][] = array ( + $PHP_FAILED_TESTS[$restype.'ED'][] = array ( 'name' = $file, 'test_name' = (is_array($IN_REDIRECT) ? $IN_REDIRECT['via'] : '') . $tested, 'output' = $output_filename, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / run-tests.php
Hello Dmitry, applied, thanks. marcus Tuesday, December 6, 2005, 10:25:53 AM, you wrote: Hi Marcus, Now make test doesn't desplay failed tests. Probably attached patch should fix the problem. Thanks. Dmitry. -Original Message- From: Marcus Boerger [mailto:[EMAIL PROTECTED] Sent: Tuesday, December 06, 2005 4:51 AM To: php-cvs@lists.php.net Subject: [PHP-CVS] cvs: php-src / run-tests.php helly Mon Dec 5 20:51:19 2005 EDT Modified files: /php-src run-tests.php Log: - Support for '--' style switches - Modularize output - Better valgrind integration (valgrind 3.0.0+ required now) (-m) - Ability to generate an additional html style output log (--html) - Ability to test unicode + native tests in one go (-U) Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/hash package.xml php_hash.h
pollita Tue Dec 6 12:54:29 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/hash package.xml php_hash.h Log: Prep for release http://cvs.php.net/diff.php/php-src/ext/hash/package.xml?r1=1.10.2.6r2=1.10.2.7ty=u Index: php-src/ext/hash/package.xml diff -u php-src/ext/hash/package.xml:1.10.2.6 php-src/ext/hash/package.xml:1.10.2.7 --- php-src/ext/hash/package.xml:1.10.2.6 Sat Dec 3 05:30:59 2005 +++ php-src/ext/hash/package.xmlTue Dec 6 12:54:24 2005 @@ -21,9 +21,9 @@ /maintainers release - version0.1/version - statebeta/state - date2005-11-00/date + version1.0/version + statestable/state + date2005-12-06/date notes Initial Release * md4, md5 http://cvs.php.net/diff.php/php-src/ext/hash/php_hash.h?r1=1.13.2.4r2=1.13.2.5ty=u Index: php-src/ext/hash/php_hash.h diff -u php-src/ext/hash/php_hash.h:1.13.2.4 php-src/ext/hash/php_hash.h:1.13.2.5 --- php-src/ext/hash/php_hash.h:1.13.2.4Sat Dec 3 18:50:33 2005 +++ php-src/ext/hash/php_hash.h Tue Dec 6 12:54:24 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_hash.h,v 1.13.2.4 2005/12/03 23:50:33 tony2001 Exp $ */ +/* $Id: php_hash.h,v 1.13.2.5 2005/12/06 17:54:24 pollita Exp $ */ #ifndef PHP_HASH_H #define PHP_HASH_H @@ -25,7 +25,7 @@ #include php_hash_types.h #define PHP_HASH_EXTNAME hash -#define PHP_HASH_EXTVER0.1 +#define PHP_HASH_EXTVER1.0 #define PHP_HASH_RESNAME Hash Context #define PHP_HASH_HMAC 0x0001 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/hash package.xml php_hash.h
pollita Tue Dec 6 12:56:57 2005 EDT Modified files: /php-src/ext/hash package.xml php_hash.h Log: MFB: Prep for PECL release http://cvs.php.net/diff.php/php-src/ext/hash/package.xml?r1=1.14r2=1.15ty=u Index: php-src/ext/hash/package.xml diff -u php-src/ext/hash/package.xml:1.14 php-src/ext/hash/package.xml:1.15 --- php-src/ext/hash/package.xml:1.14 Sat Dec 3 05:32:42 2005 +++ php-src/ext/hash/package.xmlTue Dec 6 12:56:56 2005 @@ -21,9 +21,9 @@ /maintainers release - version0.1/version - statebeta/state - date2005-11-00/date + version1.0/version + statestable/state + date2005-12-06/date notes Initial Release * md4, md5 http://cvs.php.net/diff.php/php-src/ext/hash/php_hash.h?r1=1.15r2=1.16ty=u Index: php-src/ext/hash/php_hash.h diff -u php-src/ext/hash/php_hash.h:1.15 php-src/ext/hash/php_hash.h:1.16 --- php-src/ext/hash/php_hash.h:1.15Sat Dec 3 18:49:52 2005 +++ php-src/ext/hash/php_hash.h Tue Dec 6 12:56:56 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_hash.h,v 1.15 2005/12/03 23:49:52 tony2001 Exp $ */ +/* $Id: php_hash.h,v 1.16 2005/12/06 17:56:56 pollita Exp $ */ #ifndef PHP_HASH_H #define PHP_HASH_H @@ -25,7 +25,7 @@ #include php_hash_types.h #define PHP_HASH_EXTNAME hash -#define PHP_HASH_EXTVER0.1 +#define PHP_HASH_EXTVER1.0 #define PHP_HASH_RESNAME Hash Context #define PHP_HASH_HMAC 0x0001 -- 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) /ext/mssql php_mssql.c
iliaa Tue Dec 6 13:47:17 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/mssql php_mssql.c
Log:
Fixed build of mssql extension.
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.9r2=1.152.2.10ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.9
php-src/ext/mssql/php_mssql.c:1.152.2.10
--- php-src/ext/mssql/php_mssql.c:1.152.2.9 Mon Dec 5 20:25:16 2005
+++ php-src/ext/mssql/php_mssql.c Tue Dec 6 13:47:14 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.9 2005/12/06 01:25:16 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.10 2005/12/06 18:47:14 iliaa Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -47,7 +47,7 @@
static void _mssql_bind_hash_dtor(void *data);
-zval_function_entry mssql_functions[] = {
+zend_function_entry mssql_functions[] = {
PHP_FE(mssql_connect, NULL)
PHP_FE(mssql_pconnect, NULL)
PHP_FE(mssql_close, NULL)
--
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) /ext/oci8 oci8_statement.c
tony2001Tue Dec 6 13:53:37 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/oci8 oci8_statement.c
Log:
use strlen() to get correct element length
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8_statement.c?r1=1.7.2.4r2=1.7.2.5ty=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.7.2.4
php-src/ext/oci8/oci8_statement.c:1.7.2.5
--- php-src/ext/oci8/oci8_statement.c:1.7.2.4 Thu Dec 1 14:25:48 2005
+++ php-src/ext/oci8/oci8_statement.c Tue Dec 6 13:53:35 2005
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_statement.c,v 1.7.2.4 2005/12/01 19:25:48 tony2001 Exp $ */
+/* $Id: oci8_statement.c,v 1.7.2.5 2005/12/06 18:53:35 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
@@ -722,14 +722,14 @@
case SQLT_STR:
case SQLT_LVC:
for (i = 0; i bind-array.current_length;
i++) {
+ int curr_element_length = strlen(((text
*)bind-array.elements)+i*bind-array.max_length);
if ((i bind-array.old_length)
(zend_hash_get_current_data(hash, (void **) entry) != FAILURE)) {
zval_dtor(*entry);
- ZVAL_STRINGL(*entry, ((text
*)bind-array.elements)+i*bind-array.max_length, bind-array.max_length, 1);
- Z_STRVAL_PP(entry)[
bind-array.max_length ] = '\0';
+ ZVAL_STRINGL(*entry, ((text
*)bind-array.elements)+i*bind-array.max_length, curr_element_length, 1);
zend_hash_move_forward(hash);
}
else {
-
add_next_index_stringl(bind-zval, ((text
*)bind-array.elements)+i*bind-array.max_length, bind-array.max_length, 1);
+
add_next_index_stringl(bind-zval, ((text
*)bind-array.elements)+i*bind-array.max_length, curr_element_length, 1);
}
}
break;
@@ -1200,7 +1200,7 @@
}
bind = emalloc(sizeof(php_oci_bind));
- bind-array.elements= (text *)emalloc(max_table_length *
sizeof(text) * (maxlength + 1));
+ bind-array.elements= (text *)ecalloc(1, max_table_length *
sizeof(text) * (maxlength + 1));
bind-array.current_length =
zend_hash_num_elements(Z_ARRVAL_P(var));
bind-array.old_length = bind-array.current_length;
bind-array.max_length = maxlength;
--
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_statement.c
tony2001Tue Dec 6 13:54:34 2005 EDT
Modified files:
/php-src/ext/oci8 oci8_statement.c
Log:
MF51: use strlen() to get correct element length
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8_statement.c?r1=1.9r2=1.10ty=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.9
php-src/ext/oci8/oci8_statement.c:1.10
--- php-src/ext/oci8/oci8_statement.c:1.9 Thu Dec 1 14:26:31 2005
+++ php-src/ext/oci8/oci8_statement.c Tue Dec 6 13:54:33 2005
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_statement.c,v 1.9 2005/12/01 19:26:31 tony2001 Exp $ */
+/* $Id: oci8_statement.c,v 1.10 2005/12/06 18:54:33 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
@@ -722,14 +722,14 @@
case SQLT_STR:
case SQLT_LVC:
for (i = 0; i bind-array.current_length;
i++) {
+ int curr_element_length = strlen(((text
*)bind-array.elements)+i*bind-array.max_length);
if ((i bind-array.old_length)
(zend_hash_get_current_data(hash, (void **) entry) != FAILURE)) {
zval_dtor(*entry);
- ZVAL_STRINGL(*entry, ((text
*)bind-array.elements)+i*bind-array.max_length, bind-array.max_length, 1);
- Z_STRVAL_PP(entry)[
bind-array.max_length ] = '\0';
+ ZVAL_STRINGL(*entry, ((text
*)bind-array.elements)+i*bind-array.max_length, curr_element_length, 1);
zend_hash_move_forward(hash);
}
else {
-
add_next_index_stringl(bind-zval, ((text
*)bind-array.elements)+i*bind-array.max_length, bind-array.max_length, 1);
+
add_next_index_stringl(bind-zval, ((text
*)bind-array.elements)+i*bind-array.max_length, curr_element_length, 1);
}
}
break;
@@ -1200,7 +1200,7 @@
}
bind = emalloc(sizeof(php_oci_bind));
- bind-array.elements= (text *)emalloc(max_table_length *
sizeof(text) * (maxlength + 1));
+ bind-array.elements= (text *)ecalloc(1, max_table_length *
sizeof(text) * (maxlength + 1));
bind-array.current_length =
zend_hash_num_elements(Z_ARRVAL_P(var));
bind-array.old_length = bind-array.current_length;
bind-array.max_length = maxlength;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard http_fopen_wrapper.c
pollita Tue Dec 6 14:13:30 2005 EDT
Modified files:
/php-src/ext/standard http_fopen_wrapper.c
Log:
Block potential segfault.
Context option type not checked for user_agent,header, and content
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.103r2=1.104ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.103
php-src/ext/standard/http_fopen_wrapper.c:1.104
--- php-src/ext/standard/http_fopen_wrapper.c:1.103 Mon Nov 14 23:24:17 2005
+++ php-src/ext/standard/http_fopen_wrapper.c Tue Dec 6 14:13:27 2005
@@ -19,7 +19,7 @@
| Sara Golemon [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.103 2005/11/15 04:24:17 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.104 2005/12/06 19:13:27 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -305,7 +305,7 @@
if (context
php_stream_context_get_option(context, http, header,
tmpzval) == SUCCESS
- Z_STRLEN_PP(tmpzval)) {
+ Z_TYPE_PP(tmpzval) == IS_STRING Z_STRLEN_PP(tmpzval)) {
/* Remove newlines and spaces from start and end,
php_trim will estrndup() */
tmp = php_trim(Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval),
NULL, 0, IS_STRING, NULL, 3 TSRMLS_CC);
@@ -409,7 +409,8 @@
}
if (context
- php_stream_context_get_option(context, http, user_agent,
ua_zval) == SUCCESS) {
+ php_stream_context_get_option(context, http, user_agent,
ua_zval) == SUCCESS
+ Z_TYPE_PP(ua_zval) == IS_STRING) {
ua_str = Z_STRVAL_PP(ua_zval);
} else if (FG(user_agent)) {
ua_str = FG(user_agent);
@@ -441,7 +442,7 @@
/* Request content, such as for POST requests */
if (header_init context
php_stream_context_get_option(context, http, content,
tmpzval) == SUCCESS
- Z_STRLEN_PP(tmpzval) 0) {
+ Z_TYPE_PP(tmpzval) == IS_STRING Z_STRLEN_PP(tmpzval) 0) {
if (!(have_header HTTP_HEADER_CONTENT_LENGTH)) {
scratch_len = snprintf(scratch, scratch_len,
Content-Length: %d\r\n, Z_STRLEN_PP(tmpzval));
php_stream_write(stream, scratch, scratch_len);
--
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) /ext/standard http_fopen_wrapper.c
pollita Tue Dec 6 14:15:41 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard http_fopen_wrapper.c
Log:
MFH: (r-1.104)
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.3r2=1.99.2.4ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.3
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.4
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.3 Tue Nov 15 09:46:34 2005
+++ php-src/ext/standard/http_fopen_wrapper.c Tue Dec 6 14:15:41 2005
@@ -19,7 +19,7 @@
| Sara Golemon [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.99.2.3 2005/11/15 14:46:34 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.99.2.4 2005/12/06 19:15:41 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -305,7 +305,7 @@
if (context
php_stream_context_get_option(context, http, header,
tmpzval) == SUCCESS
- Z_STRLEN_PP(tmpzval)) {
+ Z_TYPE_PP(tmpzval) == IS_STRING Z_STRLEN_PP(tmpzval)) {
/* Remove newlines and spaces from start and end,
php_trim will estrndup() */
tmp = php_trim(Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval),
NULL, 0, NULL, 3 TSRMLS_CC);
@@ -409,7 +409,8 @@
}
if (context
- php_stream_context_get_option(context, http, user_agent,
ua_zval) == SUCCESS) {
+ php_stream_context_get_option(context, http, user_agent,
ua_zval) == SUCCESS
+ Z_TYPE_PP(ua_zval) == IS_STRING) {
ua_str = Z_STRVAL_PP(ua_zval);
} else if (FG(user_agent)) {
ua_str = FG(user_agent);
@@ -441,7 +442,7 @@
/* Request content, such as for POST requests */
if (header_init context
php_stream_context_get_option(context, http, content,
tmpzval) == SUCCESS
- Z_STRLEN_PP(tmpzval) 0) {
+ Z_TYPE_PP(tmpzval) == IS_STRING Z_STRLEN_PP(tmpzval) 0) {
if (!(have_header HTTP_HEADER_CONTENT_LENGTH)) {
scratch_len = snprintf(scratch, scratch_len,
Content-Length: %d\r\n, Z_STRLEN_PP(tmpzval));
php_stream_write(stream, scratch, scratch_len);
--
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) /ext/standard http_fopen_wrapper.c
pollita Tue Dec 6 14:25:16 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard http_fopen_wrapper.c
Log:
MFH: (r-1.104)
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.53.2.20.2.2r2=1.53.2.20.2.3ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20.2.2
php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20.2.3
--- php-src/ext/standard/http_fopen_wrapper.c:1.53.2.20.2.2 Tue Jul 26
05:32:58 2005
+++ php-src/ext/standard/http_fopen_wrapper.c Tue Dec 6 14:25:12 2005
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.53.2.20.2.2 2005/07/26 09:32:58 hyanantha Exp
$ */
+/* $Id: http_fopen_wrapper.c,v 1.53.2.20.2.3 2005/12/06 19:25:12 pollita Exp $
*/
#include php.h
#include php_globals.h
@@ -199,7 +199,8 @@
/* send it */
php_stream_write(stream, scratch, strlen(scratch));
- if (context php_stream_context_get_option(context, http, header,
tmpzval) == SUCCESS Z_STRLEN_PP(tmpzval)) {
+ if (context php_stream_context_get_option(context, http, header,
tmpzval) == SUCCESS
+ Z_TYPE_PP(tmpzval) == IS_STRING Z_STRLEN_PP(tmpzval)) {
/* Remove newlines and spaces from start and end, php_trim will
estrndup() */
tmp = php_trim(Z_STRVAL_PP(tmpzval), Z_STRLEN_PP(tmpzval),
NULL, 0, NULL, 3 TSRMLS_CC);
if (strlen(tmp) 0) {
@@ -268,7 +269,8 @@
}
if (context
- php_stream_context_get_option(context, http, user_agent,
ua_zval) == SUCCESS) {
+ php_stream_context_get_option(context, http, user_agent,
ua_zval) == SUCCESS
+ Z_TYPE_PP(ua_zval) == IS_STRING) {
ua_str = Z_STRVAL_PP(ua_zval);
} else if (FG(user_agent)) {
ua_str = FG(user_agent);
@@ -300,7 +302,8 @@
php_stream_write(stream, \r\n, sizeof(\r\n)-1);
/* Request content, such as for POST requests */
- if (context php_stream_context_get_option(context, http,
content, tmpzval) == SUCCESS Z_STRLEN_PP(tmpzval) 0) {
+ if (context php_stream_context_get_option(context, http,
content, tmpzval) == SUCCESS
+ Z_TYPE_PP(tmpzval) == IS_STRING Z_STRLEN_PP(tmpzval) 0) {
php_stream_write(stream, Z_STRVAL_PP(tmpzval),
Z_STRLEN_PP(tmpzval));
php_stream_write(stream, \r\n\r\n, sizeof(\r\n\r\n)-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) /ext/pdo_pgsql pgsql_driver.c
helly Tue Dec 6 16:44:18 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_pgsql pgsql_driver.c Log: - Fix TSRM http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.53.2.7r2=1.53.2.8ty=u Index: php-src/ext/pdo_pgsql/pgsql_driver.c diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.7 php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.8 --- php-src/ext/pdo_pgsql/pgsql_driver.c:1.53.2.7 Mon Dec 5 21:25:28 2005 +++ php-src/ext/pdo_pgsql/pgsql_driver.cTue Dec 6 16:44:15 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pgsql_driver.c,v 1.53.2.7 2005/12/06 02:25:28 sniper Exp $ */ +/* $Id: pgsql_driver.c,v 1.53.2.8 2005/12/06 21:44:15 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -132,7 +132,7 @@ lo_close(self-conn, self-lfd); } efree(self); - php_pdo_dbh_delref(dbh TSRMLS_DC); + php_pdo_dbh_delref(dbh TSRMLS_CC); return 0; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
helly Tue Dec 6 18:24:38 2005 EDT
Modified files:
/php-srcrun-tests.php
Log:
- Do not show leak summary if not tested
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.246r2=1.247ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.246 php-src/run-tests.php:1.247
--- php-src/run-tests.php:1.246 Tue Dec 6 04:34:44 2005
+++ php-src/run-tests.php Tue Dec 6 18:24:38 2005
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.246 2005/12/06 09:34:44 helly Exp $ */
+/* $Id: run-tests.php,v 1.247 2005/12/06 23:24:38 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
@@ -332,7 +332,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo $Id: run-tests.php,v 1.246
2005/12/06 09:34:44 helly Exp $\n;
+ echo $Id: run-tests.php,v 1.247
2005/12/06 23:24:38 helly Exp $\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -1486,7 +1486,7 @@
function get_summary($show_ext_summary, $show_html)
{
- global $exts_skipped, $exts_tested, $n_total, $sum_results,
$percent_results, $end_time, $start_time, $failed_test_summary,
$PHP_FAILED_TESTS;
+ global $exts_skipped, $exts_tested, $n_total, $sum_results,
$percent_results, $end_time, $start_time, $failed_test_summary,
$PHP_FAILED_TESTS, $leak_check;
$x_total = $n_total - $sum_results['SKIPPED'] - $sum_results['BORKED'];
if ($x_total) {
@@ -1519,8 +1519,12 @@
$summary .=
Tests skipped : . sprintf(%4d
(%5.1f%%),$sum_results['SKIPPED'],$percent_results['SKIPPED']) .
Tests warned: . sprintf(%4d (%5.1f%%),$sum_results['WARNED'],
$percent_results['WARNED']) . . sprintf((%5.1f%%),$x_warned) .
-Tests failed: . sprintf(%4d (%5.1f%%),$sum_results['FAILED'],
$percent_results['FAILED']) . . sprintf((%5.1f%%),$x_failed) .
-Tests leaked: . sprintf(%4d (%5.1f%%),$sum_results['LEAKED'],
$percent_results['LEAKED']) . . sprintf((%5.1f%%),$x_leaked) .
+Tests failed: . sprintf(%4d (%5.1f%%),$sum_results['FAILED'],
$percent_results['FAILED']) . . sprintf((%5.1f%%),$x_failed);
+ if ($leak_check) {
+ $summary .=
+Tests leaked: . sprintf(%4d (%5.1f%%),$sum_results['LEAKED'],
$percent_results['LEAKED']) . . sprintf((%5.1f%%),$x_leaked);
+ }
+ $summary .=
Tests passed: . sprintf(%4d (%5.1f%%),$sum_results['PASSED'],
$percent_results['PASSED']) . . sprintf((%5.1f%%),$x_passed) .
-
Time taken : . sprintf(%4d seconds, $end_time - $start_time) .
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main main.c
iliaa Tue Dec 6 18:32:07 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/main main.c
Log:
Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if
display_startup_error is off).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.277r2=1.2027.2.278ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.277 php-src/NEWS:1.2027.2.278
--- php-src/NEWS:1.2027.2.277 Mon Dec 5 22:39:45 2005
+++ php-src/NEWSTue Dec 6 18:32:04 2005
@@ -37,7 +37,6 @@
proper init). (Ilia)
- Fixed bug #35490 (socket_sendto() unable to handle IPv6 addresses). (Tony)
- Fixed bug #35437 (Segfault or Invalid Opcode 137/1/4). (Dmitry)
-- Fixed bug #34729 (Crash in ZTS mode under Apache). (Dmitry, Zeev)
- Fixed bug #35470 (Assigning global using variable name from array doesn't
function). (Dmitry)
- Fixed bug #35456 (+ 1 [time unit] format did not work). (Ilia)
@@ -61,6 +60,9 @@
- Fixed bug #35062 (socket_read() produces warnings on non blocking sockets).
(Nuno, Ilia)
- Fixed bug #35028 (SimpleXML object fails FALSE test). (Marcus)
+- Fixed bug #34729 (Crash in ZTS mode under Apache). (Dmitry, Zeev)
+- Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if
+ display_startup_error is off). (Ilia)
28 Nov 2005, PHP 5.1.1
- Disabled native date class to prevent pear::date conflict. (Ilia)
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.640.2.10r2=1.640.2.11ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.10 php-src/main/main.c:1.640.2.11
--- php-src/main/main.c:1.640.2.10 Mon Dec 5 22:09:24 2005
+++ php-src/main/main.c Tue Dec 6 18:32:06 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.10 2005/12/06 03:09:24 iliaa Exp $ */
+/* $Id: main.c,v 1.640.2.11 2005/12/06 23:32:06 iliaa Exp $ */
/* {{{ includes
*/
@@ -746,9 +746,8 @@
if (!module_initialized || PG(log_errors)) {
char *log_buffer;
-
#ifdef PHP_WIN32
- if (type==E_CORE_ERROR || type==E_CORE_WARNING) {
+ if ((type == E_CORE_ERROR || type == E_CORE_WARNING)
PG(display_startup_errors)) {
MessageBox(NULL, buffer, error_type_str,
MB_OK|ZEND_SERVICE_MB_STYLE);
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
iliaa Tue Dec 6 18:32:27 2005 EDT
Modified files:
/php-src/main main.c
Log:
MFB51: Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if
display_startup_error is off).
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.655r2=1.656ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.655 php-src/main/main.c:1.656
--- php-src/main/main.c:1.655 Mon Dec 5 22:13:53 2005
+++ php-src/main/main.c Tue Dec 6 18:32:27 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.655 2005/12/06 03:13:53 iliaa Exp $ */
+/* $Id: main.c,v 1.656 2005/12/06 23:32:27 iliaa Exp $ */
/* {{{ includes
*/
@@ -862,9 +862,8 @@
if (!module_initialized || PG(log_errors)) {
char *log_buffer;
-
#ifdef PHP_WIN32
- if (type==E_CORE_ERROR || type==E_CORE_WARNING) {
+ if ((type == E_CORE_ERROR || type == E_CORE_WARNING)
PG(display_startup_errors)) {
MessageBox(NULL, buffer, error_type_str,
MB_OK|ZEND_SERVICE_MB_STYLE);
}
#endif
--
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) / NEWS /main main.c
iliaa Tue Dec 6 18:33:05 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/main main.c
Log:
MFH: Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if
display_startup_error is off).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.94r2=1.1247.2.920.2.95ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.94 php-src/NEWS:1.1247.2.920.2.95
--- php-src/NEWS:1.1247.2.920.2.94 Mon Dec 5 22:40:08 2005
+++ php-src/NEWSTue Dec 6 18:33:03 2005
@@ -14,6 +14,8 @@
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
- Fixed bug #33201 (Crash when fetching some data types). (Frank)
+- Fixed bug #30760 (Remove MessageBox on win32 for E_CORE errors if
+ display_startup_error is off). (Ilia)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.512.2.63.2.5r2=1.512.2.63.2.6ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.63.2.5 php-src/main/main.c:1.512.2.63.2.6
--- php-src/main/main.c:1.512.2.63.2.5 Mon Dec 5 22:30:43 2005
+++ php-src/main/main.c Tue Dec 6 18:33:04 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.63.2.5 2005/12/06 03:30:43 iliaa Exp $ */
+/* $Id: main.c,v 1.512.2.63.2.6 2005/12/06 23:33:04 iliaa Exp $ */
/* {{{ includes
*/
@@ -640,9 +640,8 @@
if (!module_initialized || PG(log_errors)) {
char *log_buffer;
-
#ifdef PHP_WIN32
- if (type==E_CORE_ERROR || type==E_CORE_WARNING) {
+ if ((type == E_CORE_ERROR || type == E_CORE_WARNING)
PG(display_startup_errors)) {
MessageBox(NULL, buffer, error_type_str,
MB_OK|ZEND_SERVICE_MB_STYLE);
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
helly Tue Dec 6 19:01:53 2005 EDT
Modified files:
/php-srcrun-tests.php
Log:
- Show list of leaked files in summary if any
- Use basename correct
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.247r2=1.248ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.247 php-src/run-tests.php:1.248
--- php-src/run-tests.php:1.247 Tue Dec 6 18:24:38 2005
+++ php-src/run-tests.php Tue Dec 6 19:01:51 2005
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.247 2005/12/06 23:24:38 helly Exp $ */
+/* $Id: run-tests.php,v 1.248 2005/12/07 00:01:51 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
@@ -332,7 +332,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo $Id: run-tests.php,v 1.247
2005/12/06 23:24:38 helly Exp $\n;
+ echo $Id: run-tests.php,v 1.248
2005/12/07 00:01:51 helly Exp $\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -937,15 +937,15 @@
$tmp = realpath(dirname($file));
}
- $pu = $unicode_semantics ? '.u' : '';
+ $pu = $unicode_semantics ? 'u.' : '';
- $diff_filename = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.diff', basename($file));
- $log_filename = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.log', basename($file));
- $exp_filename = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.exp', basename($file));
- $output_filename = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.out', basename($file));
- $memcheck_filename = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.mem', basename($file));
- $tmp_file = $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.php', basename($file));
- $tmp_skipif= $tmp . DIRECTORY_SEPARATOR .
preg_replace('/\.phpt$/', $pu.'.skip', basename($file));
+ $diff_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'diff';
+ $log_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'log';
+ $exp_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'exp';
+ $output_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'out';
+ $memcheck_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'mem';
+ $tmp_file = $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'php';
+ $tmp_skipif= $tmp . DIRECTORY_SEPARATOR .
basename($file).$pu.'skip';
$tmp_post = $tmp . DIRECTORY_SEPARATOR . uniqid('/phpt.');
$tmp_relative_file = str_replace(dirname(__FILE__).DIRECTORY_SEPARATOR,
'', $tmp_file) . 't';
@@ -1555,6 +1555,18 @@
$failed_test_summary .=
=\n;
}
+ if (count($PHP_FAILED_TESTS['LEAKED'])) {
+ $failed_test_summary .=
+=
+LEAKED TEST SUMMARY
+-
+;
+ foreach ($PHP_FAILED_TESTS['LEAKED'] as $failed_test_data) {
+ $failed_test_summary .= $failed_test_data['test_name']
. $failed_test_data['info'] . \n;
+ }
+ $failed_test_summary .=
=\n;
+ }
+
if ($failed_test_summary !getenv('NO_PHPTEST_SUMMARY')) {
$summary .= $failed_test_summary;
}
--
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) / run-tests.php
helly Tue Dec 6 19:03:46 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcrun-tests.php
Log:
- MFH
. Support for '--' style switches
. Modularize output
. Better valgrind integration (valgrind 3.0.0+ required now) (-m)
. Ability to generate an additional html style output log (--html)
. Ability to test unicode + native tests in one go (-U)
. Show list of leaked files in summary if any
. Use basename correct
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.226.2.3r2=1.226.2.4ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.3 php-src/run-tests.php:1.226.2.4
--- php-src/run-tests.php:1.226.2.3 Thu Oct 6 05:42:17 2005
+++ php-src/run-tests.php Tue Dec 6 19:03:46 2005
@@ -23,12 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.3 2005/10/06 09:42:17 helly Exp $ */
-
-/*
- * TODO:
- * - do not test PEAR components if base class and/or component class cannot
be instanciated
- */
+/* $Id: run-tests.php,v 1.226.2.4 2005/12/07 00:03:46 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
@@ -164,7 +159,7 @@
'magic_quotes_runtime=0',
);
-function write_information()
+function write_information($show_html)
{
global $cwd, $php, $php_info, $user_tests, $ini_overwrites,
$pass_options;
@@ -221,16 +216,41 @@
$test_files = array();
$redir_tests = array();
$test_results = array();
-$PHP_FAILED_TESTS = array('BORKED' = array(), 'FAILED' = array());
+$PHP_FAILED_TESTS = array('BORKED' = array(), 'FAILED' = array(), 'WARNED'
= array(), 'LEAKED' = array());
// If parameters given assume they represent selected tests to run.
$failed_tests_file= false;
$pass_option_n = false;
$pass_options = '';
+
+$compression = 0;
+$output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . (
$compression ? '.txt.gz' : '.txt' );
+$just_save_results = false;
+$leak_check = false;
+$html_output = false;
+$html_file = null;
+
+if (getenv('TEST_PHP_ARGS'))
+{
+ if (!isset($argc) || !$argc || !isset($argv))
+ {
+ $argv = array(__FILE__);
+ }
+ $argv = array_merge($argv, split(' ', getenv('TEST_PHP_ARGS')));
+ $argc = count($argv);
+}
+
if (isset($argc) $argc 1) {
for ($i=1; $i$argc; $i++) {
- if (substr($argv[$i],0,1) == '-') {
- $switch = strtolower(substr($argv[$i],1,1));
+ $is_switch = false;
+ $switch = substr($argv[$i],1,1);
+ $repeat = substr($argv[$i],0,1) == '-';
+ while ($repeat) {
+ $repeat = false;
+ if (!$is_switch) {
+ $switch = substr($argv[$i],1,1);
+ }
+ $is_switch = true;
switch($switch) {
case 'r':
case 'l':
@@ -256,8 +276,13 @@
case 'a':
$failed_tests_file = fopen($argv[++$i],
'a+t');
break;
- case 'v':
- $DETAILED = true;
+ case 'd':
+ $ini_overwrites[] = $argv[++$i];
+ break;
+ //case 'h'
+ //case 'l'
+ case 'm':
+ $leak_check = true;
break;
case 'n':
if (!$pass_option_n) {
@@ -265,14 +290,39 @@
}
$pass_option_n = true;
break;
- case 'd':
- $ini_overwrites[] = $argv[++$i];
+ case 'q':
+ putenv('NO_INTERACTION=1');
break;
+ //case 'r'
+ case 's':
+ $output_file = $argv[++$i];
+ $just_save_results = true;
+ break;
+ case 'v':
+ case '--verbose':
+ $DETAILED = true;
+ break;
+ //case 'w'
+ case '-':
+
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo pdo_dbh.c
iliaa Tue Dec 6 20:29:16 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdopdo_dbh.c
Log:
Fixed memory leak
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.23r2=1.82.2.24ty=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.23 php-src/ext/pdo/pdo_dbh.c:1.82.2.24
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.23 Mon Dec 5 21:25:27 2005
+++ php-src/ext/pdo/pdo_dbh.c Tue Dec 6 20:29:14 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.23 2005/12/06 02:25:27 sniper Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.24 2005/12/07 01:29:14 iliaa Exp $ */
/* The PDO Database Handle Class */
@@ -1365,6 +1365,7 @@
for (i = 0; i PDO_DBH_DRIVER_METHOD_KIND__MAX; i++) {
if (dbh-cls_methods[i]) {
zend_hash_destroy(dbh-cls_methods[i]);
+ pefree(dbh-cls_methods[i], dbh-is_persistent);
}
}
--
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) / run-tests.php
iliaa Tue Dec 6 21:01:59 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcrun-tests.php
Log:
Fixed filename picker.
Various modernizations of the script.
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.226.2.4r2=1.226.2.5ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.4 php-src/run-tests.php:1.226.2.5
--- php-src/run-tests.php:1.226.2.4 Tue Dec 6 19:03:46 2005
+++ php-src/run-tests.php Tue Dec 6 21:01:58 2005
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.4 2005/12/07 00:03:46 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.5 2005/12/07 02:01:58 iliaa 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
@@ -223,8 +223,11 @@
$pass_option_n = false;
$pass_options = '';
-$compression = 0;
-$output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . (
$compression ? '.txt.gz' : '.txt' );
+$compression = 0;
+$output_file = $CUR_DIR . '/php_test_results_' . date('Ymd_Hi') . '.txt';
+if ($compression) {
+ $output_file = 'compress.zlib://' . $output_file . '.gz';
+}
$just_save_results = false;
$leak_check = false;
$html_output = false;
@@ -315,7 +318,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo $Id: run-tests.php,v 1.226.2.4
2005/12/07 00:03:46 helly Exp $\n;
+ echo $Id: run-tests.php,v 1.226.2.5
2005/12/07 02:01:58 iliaa Exp $\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -831,7 +834,6 @@
$line = fgets($fp);
// Match the beginning of a section.
- // UTODO changed to use preg, because ereg was crapping out
if (preg_match('/^--([A-Z]+)--/',$line,$r)) {
$section = $r[1];
$section_text[$section] = '';
@@ -857,7 +859,7 @@
$borked = true;
}
if (@count($section_text['FILEEOF']) == 1) {
- $section_text['FILE'] = preg_replace('/[\r\n]+$/', '',
$section_text['FILEEOF']);
+ $section_text['FILE'] = preg_replace(/[\r\n]+$/, '',
$section_text['FILEEOF']);
unset($section_text['FILEEOF']);
}
if ((@count($section_text['EXPECT']) +
@count($section_text['EXPECTF']) + @count($section_text['EXPECTREGEX'])) != 1) {
@@ -898,13 +900,13 @@
$tmp = realpath(dirname($file));
}
- $diff_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file).'diff';
- $log_filename = $tmp . DIRECTORY_SEPARATOR . basename($file).'log';
- $exp_filename = $tmp . DIRECTORY_SEPARATOR . basename($file).'exp';
- $output_filename = $tmp . DIRECTORY_SEPARATOR . basename($file).'out';
- $memcheck_filename = $tmp . DIRECTORY_SEPARATOR . basename($file).'mem';
- $tmp_file = $tmp . DIRECTORY_SEPARATOR . basename($file).'php';
- $tmp_skipif= $tmp . DIRECTORY_SEPARATOR .
basename($file).'skip';
+ $diff_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'diff';
+ $log_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'log';
+ $exp_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'exp';
+ $output_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'out';
+ $memcheck_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'mem';
+ $tmp_file = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'php';
+ $tmp_skipif= $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'skip';
$tmp_post = $tmp . DIRECTORY_SEPARATOR . uniqid('/phpt.');
$tmp_relative_file = str_replace(dirname(__FILE__).DIRECTORY_SEPARATOR,
'', $tmp_file) . 't';
@@ -946,7 +948,7 @@
unset REQUEST_METHOD; unset QUERY_STRING;
unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;: ;
$output = system_with_timeout($extra $php -q
$skipif_params $tmp_skipif);
@unlink($tmp_skipif);
- if (eregi(^skip, trim($output))) {
+ if (!strncasecmp('skip', trim($output), 4)) {
$reason = (eregi(^skip[[:space:]]*(.+)\$,
trim($output))) ? eregi_replace(^skip[[:space:]]*(.+)\$, \\1,
trim($output)) : FALSE;
if ($reason) {
[PHP-CVS] cvs: php-src(PHP_5_1) /main main.c
iliaa Tue Dec 6 21:37:09 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main main.c
Log:
Better critical error handling (fix for previous html encoding patch).
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.640.2.11r2=1.640.2.12ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.11 php-src/main/main.c:1.640.2.12
--- php-src/main/main.c:1.640.2.11 Tue Dec 6 18:32:06 2005
+++ php-src/main/main.c Tue Dec 6 21:37:05 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.11 2005/12/06 23:32:06 iliaa Exp $ */
+/* $Id: main.c,v 1.640.2.12 2005/12/07 02:37:05 iliaa Exp $ */
/* {{{ includes
*/
@@ -770,12 +770,14 @@
char *append_string =
INI_STR(error_append_string);
if (PG(html_errors)) {
- char *buf, *buf2;
- int len2, len = spprintf(buf, 0,
%sbr /\nb%s/b: %s in b%s/b on line b%d/bbr /\n%s,
STR_PRINT(prepend_string), error_type_str, buffer, error_filename,
error_lineno, STR_PRINT(append_string));
- buf2 = php_escape_html_entities(buf,
len, len2, 0, ENT_COMPAT, NULL TSRMLS_CC);
- php_printf(%s, buf2);
- efree(buf);
- efree(buf2);
+ if (type == E_ERROR) {
+ int len;
+ char *buf =
php_escape_html_entities(buffer, buffer_len, len, 0, ENT_COMPAT, NULL
TSRMLS_CC);
+ php_printf(%sbr
/\nb%s/b: %s in b%s/b on line b%d/bbr /\n%s,
STR_PRINT(prepend_string), error_type_str, buf, error_filename, error_lineno,
STR_PRINT(append_string));
+ efree(buf);
+ } else {
+ php_printf(%sbr
/\nb%s/b: %s in b%s/b on line b%d/bbr /\n%s,
STR_PRINT(prepend_string), error_type_str, buffer, error_filename,
error_lineno, STR_PRINT(append_string));
+ }
} else {
php_printf(%s\n%s: %s in %s on line
%d\n%s, STR_PRINT(prepend_string), error_type_str, buffer, error_filename,
error_lineno, STR_PRINT(append_string));
}
--
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 /ext/xmlwriter/tests OO_006.phpt
rrichards Tue Dec 6 23:59:42 2005 EDT
Added files:
/php-src/ext/xmlwriter/testsOO_006.phpt
Modified files:
/php-src/ext/xmlwriter php_xmlwriter.c
Log:
- fix remaining parameter typo
- add test
http://cvs.php.net/diff.php/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.22r2=1.23ty=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.22
php-src/ext/xmlwriter/php_xmlwriter.c:1.23
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.22 Tue Dec 6 22:20:13 2005
+++ php-src/ext/xmlwriter/php_xmlwriter.c Tue Dec 6 23:59:41 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_xmlwriter.c,v 1.22 2005/12/07 03:20:13 pajoye Exp $ */
+/* $Id: php_xmlwriter.c,v 1.23 2005/12/07 04:59:41 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -823,7 +823,7 @@
zval *this = getThis();
if (this) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ,
prefix, prefix_len, name, name_len, uri, uri_len,
content, content_len) == FAILURE) {
return;
}
http://cvs.php.net/co.php/php-src/ext/xmlwriter/tests/OO_006.phpt?r=1.1p=1
Index: php-src/ext/xmlwriter/tests/OO_006.phpt
+++ php-src/ext/xmlwriter/tests/OO_006.phpt
--TEST--
XMLWriter: libxml2 XML Writer, startDTD/writeElementNS
--SKIPIF--
?php
if (!extension_loaded(xmlwriter)) die(skip);
if (!function_exists(xmlwriter_start_comment)) die(skip: libxml2 2.6.7+
required);
?
--FILE--
?php
/* $Id: OO_006.phpt,v 1.1 2005/12/07 04:59:41 rrichards Exp $ */
$doc_dest = '001.xml';
$xw = new XMLWriter();
$xw-openUri($doc_dest);
$xw-startDtd('foo', NULL, 'urn:bar');
$xw-endDtd();
$xw-startElement('foo');
$xw-writeElementNS('foo', 'bar', 'urn:foo', 'dummy content');
$xw-endElement();
// Force to write and empty the buffer
$output_bytes = $xw-flush(true);
echo file_get_contents($doc_dest);
unset($xw);
unlink('001.xml');
?
--EXPECT--
!DOCTYPE foo SYSTEM urn:barfoofoo:bar xmlns:foo=urn:foodummy
content/foo:bar/foo
--
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) /ext/xmlwriter php_xmlwriter.c /ext/xmlwriter/tests OO_006.phpt
rrichards Wed Dec 7 00:09:33 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/xmlwriter/testsOO_006.phpt
Modified files:
/php-src/ext/xmlwriter php_xmlwriter.c
Log:
MFH: fix res parameter typos
- add test
http://cvs.php.net/diff.php/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.3r2=1.20.2.4ty=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.3
php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.4
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.3 Sat Dec 3 18:20:07 2005
+++ php-src/ext/xmlwriter/php_xmlwriter.c Wed Dec 7 00:09:31 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_xmlwriter.c,v 1.20.2.3 2005/12/03 23:20:07 tony2001 Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.4 2005/12/07 05:09:31 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -823,7 +823,7 @@
zval *this = getThis();
if (this) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ,
prefix, prefix_len, name, name_len, uri, uri_len,
content, content_len) == FAILURE) {
return;
}
@@ -1223,7 +1223,7 @@
zval *this = getThis();
if (this) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rs|s!s!,
name, name_len, pubid, pubid_len, sysid, sysid_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s!s!,
name, name_len, pubid, pubid_len, sysid, sysid_len) == FAILURE) {
return;
}
http://cvs.php.net/co.php/php-src/ext/xmlwriter/tests/OO_006.phpt?r=1.1p=1
Index: php-src/ext/xmlwriter/tests/OO_006.phpt
+++ php-src/ext/xmlwriter/tests/OO_006.phpt
--TEST--
XMLWriter: libxml2 XML Writer, startDTD/writeElementNS
--SKIPIF--
?php
if (!extension_loaded(xmlwriter)) die(skip);
if (!function_exists(xmlwriter_start_comment)) die(skip: libxml2 2.6.7+
required);
?
--FILE--
?php
/* $Id: OO_006.phpt,v 1.1 2005/12/07 04:59:41 rrichards Exp $ */
$doc_dest = '001.xml';
$xw = new XMLWriter();
$xw-openUri($doc_dest);
$xw-startDtd('foo', NULL, 'urn:bar');
$xw-endDtd();
$xw-startElement('foo');
$xw-writeElementNS('foo', 'bar', 'urn:foo', 'dummy content');
$xw-endElement();
// Force to write and empty the buffer
$output_bytes = $xw-flush(true);
echo file_get_contents($doc_dest);
unset($xw);
unlink('001.xml');
?
--EXPECT--
!DOCTYPE foo SYSTEM urn:barfoofoo:bar xmlns:foo=urn:foodummy
content/foo:bar/foo
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Wed Dec 7 02:15:36 2005 EDT Modified files: /CVSROOTavail Log: - freq karma for pear/services_pingback - cleanup for validate_ptbr http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1062r2=1.1063ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1062 CVSROOT/avail:1.1063 --- CVSROOT/avail:1.1062Tue Dec 6 04:22:49 2005 +++ CVSROOT/avail Wed Dec 7 02:15:33 2005 @@ -306,7 +306,7 @@ avail|ttsuruoka|pear/Services_Amazon avail|fa|peardoc,pear/Net_DNS,pear/Net_IPv4 avail|silvano,msaraujo|peardoc,pear/Validate -avail|msaraujo|pear/Validate +avail|freq|peardoc,Services_Pingback avail|cellog|pecl/phar avail|ritzmo|pear/Text_Wiki -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
