[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_http.c
dmitry Mon Feb 6 10:16:03 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS /php-src/ext/soap php_http.c Log: Fixed bug #36283 (SOAPClient Compression Broken). http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.401&r2=1.2027.2.402&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.401 php-src/NEWS:1.2027.2.402 --- php-src/NEWS:1.2027.2.401 Sun Feb 5 19:23:29 2006 +++ php-src/NEWSMon Feb 6 10:16:03 2006 @@ -22,6 +22,7 @@ on error. (Pierre) - Fixed bug #36295 (typo in SplFileObject::flock() parameter name). (Tony) - Fixed bug #36287 (Segfault with SplFileInfo conversion). (Marcus) +- Fixed bug #36283 (SOAPClient Compression Broken). (Dmitry) - Fixed bug #36268 (Object destructors called even after fatal errors). (Dmitry) - Fixed bug #36258 (SplFileObject::getPath() may lead to segfault). (Tony) - Fixed bug #36242 (Possible memory corruption in stream_select()). (Tony) http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.6&r2=1.77.2.7&diff_format=u Index: php-src/ext/soap/php_http.c diff -u php-src/ext/soap/php_http.c:1.77.2.6 php-src/ext/soap/php_http.c:1.77.2.7 --- php-src/ext/soap/php_http.c:1.77.2.6Sun Jan 1 12:50:13 2006 +++ php-src/ext/soap/php_http.c Mon Feb 6 10:16:03 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php_http.c,v 1.77.2.6 2006/01/01 12:50:13 sniper Exp $ */ +/* $Id: php_http.c,v 1.77.2.7 2006/02/06 10:16:03 dmitry Exp $ */ #include "php_soap.h" #include "ext/standard/base64.h" @@ -223,6 +223,7 @@ { char *request; smart_str soap_headers = {0}; + smart_str soap_headers_z = {0}; int request_size, err; php_url *phpurl = NULL; php_stream *stream; @@ -250,7 +251,7 @@ int kind = Z_LVAL_PP(tmp) & SOAP_COMPRESSION_DEFLATE; if ((Z_LVAL_PP(tmp) & SOAP_COMPRESSION_ACCEPT) != 0) { - smart_str_append_const(&soap_headers,"Accept-Encoding: gzip, deflate\r\n"); + smart_str_append_const(&soap_headers_z,"Accept-Encoding: gzip, deflate\r\n"); } if (level > 0) { zval func; @@ -270,11 +271,11 @@ if (kind == SOAP_COMPRESSION_DEFLATE) { n = 2; ZVAL_STRING(&func, "gzcompress", 0); - smart_str_append_const(&soap_headers,"Content-Encoding: deflate\r\n"); + smart_str_append_const(&soap_headers_z,"Content-Encoding: deflate\r\n"); } else { n = 3; ZVAL_STRING(&func, "gzencode", 0); - smart_str_append_const(&soap_headers,"Content-Encoding: gzip\r\n"); + smart_str_append_const(&soap_headers_z,"Content-Encoding: gzip\r\n"); ZVAL_LONG(params[2], 1); } if (call_user_function(CG(function_table), (zval**)NULL, &func, &retval, n, params TSRMLS_CC) == SUCCESS && @@ -413,13 +414,17 @@ smart_str_appendc(&soap_headers, ':'); smart_str_append_unsigned(&soap_headers, phpurl->port); } - smart_str_append_const(&soap_headers, "\r\n" + smart_str_append_const(&soap_headers, "\r\n" "Connection: Keep-Alive\r\n" /* "Connection: close\r\n" "Accept: text/html; text/xml; text/plain\r\n" */ "User-Agent: PHP SOAP 0.1\r\n"); + + smart_str_append(&soap_headers, &soap_headers_z); + smart_str_free(&soap_headers_z); + if (soap_version == SOAP_1_2) { smart_str_append_const(&soap_headers,"Content-Type: application/soap+xml; charset=utf-8"); if (soapaction) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_http.c
dmitry Mon Feb 6 10:16:16 2006 UTC Modified files: /php-src/ext/soap php_http.c Log: Fixed bug #36283 (SOAPClient Compression Broken). http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_http.c?r1=1.83&r2=1.84&diff_format=u Index: php-src/ext/soap/php_http.c diff -u php-src/ext/soap/php_http.c:1.83 php-src/ext/soap/php_http.c:1.84 --- php-src/ext/soap/php_http.c:1.83Sun Jan 1 13:09:53 2006 +++ php-src/ext/soap/php_http.c Mon Feb 6 10:16:15 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php_http.c,v 1.83 2006/01/01 13:09:53 sniper Exp $ */ +/* $Id: php_http.c,v 1.84 2006/02/06 10:16:15 dmitry Exp $ */ #include "php_soap.h" #include "ext/standard/base64.h" @@ -223,6 +223,7 @@ { char *request; smart_str soap_headers = {0}; + smart_str soap_headers_z = {0}; int request_size, err; php_url *phpurl = NULL; php_stream *stream; @@ -250,7 +251,7 @@ int kind = Z_LVAL_PP(tmp) & SOAP_COMPRESSION_DEFLATE; if ((Z_LVAL_PP(tmp) & SOAP_COMPRESSION_ACCEPT) != 0) { - smart_str_append_const(&soap_headers,"Accept-Encoding: gzip, deflate\r\n"); + smart_str_append_const(&soap_headers_z,"Accept-Encoding: gzip, deflate\r\n"); } if (level > 0) { zval func; @@ -270,11 +271,11 @@ if (kind == SOAP_COMPRESSION_DEFLATE) { n = 2; ZVAL_STRING(&func, "gzcompress", 0); - smart_str_append_const(&soap_headers,"Content-Encoding: deflate\r\n"); + smart_str_append_const(&soap_headers_z,"Content-Encoding: deflate\r\n"); } else { n = 3; ZVAL_STRING(&func, "gzencode", 0); - smart_str_append_const(&soap_headers,"Content-Encoding: gzip\r\n"); + smart_str_append_const(&soap_headers_z,"Content-Encoding: gzip\r\n"); ZVAL_LONG(params[2], 1); } if (call_user_function(CG(function_table), (zval**)NULL, &func, &retval, n, params TSRMLS_CC) == SUCCESS && @@ -420,6 +421,10 @@ "Accept: text/html; text/xml; text/plain\r\n" */ "User-Agent: PHP SOAP 0.1\r\n"); + + smart_str_append(&soap_headers, &soap_headers_z); + smart_str_free(&soap_headers_z); + if (soap_version == SOAP_1_2) { smart_str_append_const(&soap_headers,"Content-Type: application/soap+xml; charset=utf-8"); if (soapaction) { -- 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/mbstring mbstring.c
tony2001Mon Feb 6 10:41:28 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/mbstring mbstring.c Log: initialize to_r remove needless semicolon http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.12&r2=1.224.2.13&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.224.2.12 php-src/ext/mbstring/mbstring.c:1.224.2.13 --- php-src/ext/mbstring/mbstring.c:1.224.2.12 Sun Jan 1 12:50:08 2006 +++ php-src/ext/mbstring/mbstring.c Mon Feb 6 10:41:28 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.224.2.12 2006/01/01 12:50:08 sniper Exp $ */ +/* $Id: mbstring.c,v 1.224.2.13 2006/02/06 10:41:28 tony2001 Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -164,7 +164,7 @@ ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) - ZEND_END_ARG_INFO(); + ZEND_END_ARG_INFO() /* {{{ mb_overload_def mb_ovld[] */ static const struct mb_overload_def mb_ovld[] = { @@ -3048,7 +3048,7 @@ char *extra_cmd=NULL; int extra_cmd_len; int i; - char *to_r; + char *to_r = NULL; char *force_extra_parameters = INI_STR("mail.force_extra_parameters"); struct { int cnt_type:1; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
tony2001Mon Feb 6 10:41:42 2006 UTC Modified files: /php-src/ext/mbstring mbstring.c Log: MF51: initialize to_r remove needless semicolon http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.235&r2=1.236&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.235 php-src/ext/mbstring/mbstring.c:1.236 --- php-src/ext/mbstring/mbstring.c:1.235 Sun Jan 1 13:09:51 2006 +++ php-src/ext/mbstring/mbstring.c Mon Feb 6 10:41:42 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.235 2006/01/01 13:09:51 sniper Exp $ */ +/* $Id: mbstring.c,v 1.236 2006/02/06 10:41:42 tony2001 Exp $ */ /* * PHP 4 Multibyte String module "mbstring" @@ -163,7 +163,7 @@ ZEND_BEGIN_ARG_INFO(third_and_rest_force_ref, 1) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) - ZEND_END_ARG_INFO(); + ZEND_END_ARG_INFO() /* {{{ mb_overload_def mb_ovld[] */ static const struct mb_overload_def mb_ovld[] = { @@ -3047,7 +3047,7 @@ char *extra_cmd=NULL; int extra_cmd_len; int i; - char *to_r; + char *to_r = NULL; char *force_extra_parameters = INI_STR("mail.force_extra_parameters"); struct { int cnt_type:1; -- 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/mbstring mbstring.c
tony2001Mon Feb 6 10:42:58 2006 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/mbstring mbstring.c Log: MF51: initialize to_r http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.8&r2=1.142.2.47.2.9&diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.8 php-src/ext/mbstring/mbstring.c:1.142.2.47.2.9 --- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.8 Sun Jan 1 13:46:54 2006 +++ php-src/ext/mbstring/mbstring.c Mon Feb 6 10:42:58 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.142.2.47.2.8 2006/01/01 13:46:54 sniper Exp $ */ +/* $Id: mbstring.c,v 1.142.2.47.2.9 2006/02/06 10:42:58 tony2001 Exp $ */ /* * PHP4 Multibyte String module "mbstring" @@ -3510,7 +3510,7 @@ mbfl_memory_device device; /* automatic allocateable buffer for additional header */ const mbfl_language *lang; int err = 0; - char *to_r; + char *to_r = NULL; int to_len, i; /* initialize */ -- 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/simplexml simplexml.c
tony2001Mon Feb 6 10:52:35 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/simplexml simplexml.c Log: initialize variables http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.10&r2=1.151.2.11&diff_format=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.151.2.10 php-src/ext/simplexml/simplexml.c:1.151.2.11 --- php-src/ext/simplexml/simplexml.c:1.151.2.10Sun Jan 1 12:50:13 2006 +++ php-src/ext/simplexml/simplexml.c Mon Feb 6 10:52:34 2006 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: simplexml.c,v 1.151.2.10 2006/01/01 12:50:13 sniper Exp $ */ +/* $Id: simplexml.c,v 1.151.2.11 2006/02/06 10:52:34 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -229,10 +229,10 @@ php_sxe_object *sxe; char *name; xmlNodePtr node; - xmlAttrPtr attr; + xmlAttrPtr attr = NULL; zvaltmp_zv; int nodendx = 0; - int test; + int test = 0; sxe = php_sxe_fetch_object(object TSRMLS_CC); @@ -394,7 +394,7 @@ int counter = 0; int is_attr = 0; int nodendx = 0; - int test; + int test = 0; zvaltmp_zv, trim_zv; if (!member) { @@ -558,7 +558,7 @@ xmlNodePtr node; xmlAttrPtr attr = NULL; int exists = 0; - int test; + int test = 0; sxe = php_sxe_fetch_object(object TSRMLS_CC); @@ -2018,7 +2018,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.10 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.11 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled"); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
tony2001Mon Feb 6 10:54:49 2006 UTC Modified files: /php-src/ext/simplexml simplexml.c Log: MF51: initialize variables http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.184&r2=1.185&diff_format=u Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.184 php-src/ext/simplexml/simplexml.c:1.185 --- php-src/ext/simplexml/simplexml.c:1.184 Sun Feb 5 23:31:47 2006 +++ php-src/ext/simplexml/simplexml.c Mon Feb 6 10:54:49 2006 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: simplexml.c,v 1.184 2006/02/05 23:31:47 helly Exp $ */ +/* $Id: simplexml.c,v 1.185 2006/02/06 10:54:49 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -229,10 +229,10 @@ php_sxe_object *sxe; char *name; xmlNodePtr node; - xmlAttrPtr attr; + xmlAttrPtr attr = NULL; zvaltmp_zv; int nodendx = 0; - int test; + int test = 0; sxe = php_sxe_fetch_object(object TSRMLS_CC); @@ -395,7 +395,7 @@ int counter = 0; int is_attr = 0; int nodendx = 0; - int test; + int test = 0; zvaltmp_zv, trim_zv; if (!member) { @@ -560,7 +560,7 @@ xmlNodePtr node; xmlAttrPtr attr = NULL; int exists = 0; - int test; + int test = 0; sxe = php_sxe_fetch_object(object TSRMLS_CC); @@ -2032,7 +2032,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.184 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.185 $"); php_info_print_table_row(2, "Schema support", #ifdef LIBXML_SCHEMAS_ENABLED "enabled"); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap soap.c
tony2001Mon Feb 6 11:00:51 2006 UTC Modified files: /php-src/ext/soap soap.c Log: initialize variable and make gcc happy http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.170&r2=1.171&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.170 php-src/ext/soap/soap.c:1.171 --- php-src/ext/soap/soap.c:1.170 Thu Feb 2 11:42:12 2006 +++ php-src/ext/soap/soap.c Mon Feb 6 11:00:51 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: soap.c,v 1.170 2006/02/02 11:42:12 dmitry Exp $ */ +/* $Id: soap.c,v 1.171 2006/02/06 11:00:51 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -758,7 +758,7 @@ PHP_METHOD(SoapFault, SoapFault) { char *fault_string = NULL, *fault_code = NULL, *fault_actor = NULL, *name = NULL, *fault_code_ns = NULL; - int fault_string_len, fault_code_len, fault_actor_len, name_len; + int fault_string_len, fault_actor_len, name_len, fault_code_len = 0; zval *code = NULL, *details = NULL, *headerfault = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs|s!z!s!z", -- 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/soap soap.c
tony2001Mon Feb 6 11:01:06 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/soap soap.c Log: MFH: initialize variable and make gcc happy http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.156.2.12&r2=1.156.2.13&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.156.2.12 php-src/ext/soap/soap.c:1.156.2.13 --- php-src/ext/soap/soap.c:1.156.2.12 Thu Feb 2 11:41:45 2006 +++ php-src/ext/soap/soap.c Mon Feb 6 11:01:06 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: soap.c,v 1.156.2.12 2006/02/02 11:41:45 dmitry Exp $ */ +/* $Id: soap.c,v 1.156.2.13 2006/02/06 11:01:06 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -758,7 +758,7 @@ PHP_METHOD(SoapFault, SoapFault) { char *fault_string = NULL, *fault_code = NULL, *fault_actor = NULL, *name = NULL, *fault_code_ns = NULL; - int fault_string_len, fault_code_len, fault_actor_len, name_len; + int fault_string_len, fault_actor_len, name_len, fault_code_len = 0; zval *code = NULL, *details = NULL, *headerfault = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs|s!z!s!z", -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c soap.c /ext/spl spl_iterators.c /ext/standard math.c /ext/xmlreader php_xmlreader.c /ext/xmlwriter php_xmlwriter.c
tony2001Mon Feb 6 11:28:20 2006 UTC Modified files: /php-src/ext/xmlwriter php_xmlwriter.c /php-src/ext/xmlreader php_xmlreader.c /php-src/ext/standard math.c /php-src/ext/splspl_iterators.c /php-src/ext/soap soap.c php_sdl.c Log: initialize variables and reduce the number of warnings http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.29&r2=1.30&diff_format=u Index: php-src/ext/xmlwriter/php_xmlwriter.c diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.29 php-src/ext/xmlwriter/php_xmlwriter.c:1.30 --- php-src/ext/xmlwriter/php_xmlwriter.c:1.29 Sun Jan 1 13:09:56 2006 +++ php-src/ext/xmlwriter/php_xmlwriter.c Mon Feb 6 11:28:20 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_xmlwriter.c,v 1.29 2006/01/01 13:09:56 sniper Exp $ */ +/* $Id: php_xmlwriter.c,v 1.30 2006/02/06 11:28:20 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1341,7 +1341,7 @@ #ifdef ZEND_ENGINE_2 zval *this = getThis(); - ze_xmlwriter_object *ze_obj; + ze_xmlwriter_object *ze_obj = NULL; #endif #ifndef ZEND_ENGINE_2 @@ -1420,7 +1420,7 @@ #ifdef ZEND_ENGINE_2 zval *this = getThis(); - ze_xmlwriter_object *ze_obj; + ze_xmlwriter_object *ze_obj = NULL; #endif #ifdef ZEND_ENGINE_2 http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.26&r2=1.27&diff_format=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.26 php-src/ext/xmlreader/php_xmlreader.c:1.27 --- php-src/ext/xmlreader/php_xmlreader.c:1.26 Sun Jan 1 13:09:56 2006 +++ php-src/ext/xmlreader/php_xmlreader.c Mon Feb 6 11:28:20 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_xmlreader.c,v 1.26 2006/01/01 13:09:56 sniper Exp $ */ +/* $Id: php_xmlreader.c,v 1.27 2006/02/06 11:28:20 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -832,7 +832,7 @@ zval *id; int source_len = 0, encoding_len = 0; long options = 0; - xmlreader_object *intern; + xmlreader_object *intern = NULL; char *source, *valid_file = NULL; char *encoding = NULL; char resolved_path[MAXPATHLEN + 1]; @@ -977,7 +977,7 @@ zval *id; int source_len = 0, encoding_len = 0; long options = 0; - xmlreader_object *intern; + xmlreader_object *intern = NULL; char *source, *uri = NULL, *encoding = NULL; int resolved_path_len; char *directory=NULL, resolved_path[MAXPATHLEN]; http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/math.c?r1=1.133&r2=1.134&diff_format=u Index: php-src/ext/standard/math.c diff -u php-src/ext/standard/math.c:1.133 php-src/ext/standard/math.c:1.134 --- php-src/ext/standard/math.c:1.133 Tue Jan 17 12:18:52 2006 +++ php-src/ext/standard/math.c Mon Feb 6 11:28:20 2006 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: math.c,v 1.133 2006/01/17 12:18:52 dmitry Exp $ */ +/* $Id: math.c,v 1.134 2006/02/06 11:28:20 tony2001 Exp $ */ #include "php.h" #include "php_math.h" @@ -448,7 +448,7 @@ /* calculate pow(long,long) in O(log exp) operations, bail if overflow */ while (i >= 1) { int overflow; - double dval; + double dval = 0.0; if (i % 2) { --i; http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.112&r2=1.113&diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.112 php-src/ext/spl/spl_iterators.c:1.113 --- php-src/ext/spl/spl_iterators.c:1.112 Sun Feb 5 23:31:47 2006 +++ php-src/ext/spl/spl_iterators.c Mon Feb 6 11:28:20 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_iterators.c,v 1.112 2006/02/05 23:31:47 helly Exp $ */ +/* $Id: spl_iterators.c,v 1.113 2006/02/06 11:28:20 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -838,7 +838,7 @@ { zval *zobject, *retval; spl_dual_it_object *intern; - zend_class_entry *ce; + zend_class_entry *ce = NULL; int inc_refcount = 1; http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.171&r2=1.172&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.171 php-src/ext/soap/soap.c:1.172 --- php-src/ext/soap/soap.c:1.171 Mon Feb 6 11:00:51 2006 +++ php-src/ext/soap/soap.c Mon Feb 6 11:28:20 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +---
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/soap php_sdl.c soap.c /ext/spl spl_iterators.c /ext/standard math.c /ext/xmlreader php_xmlreader.c /ext/xmlwriter php_xmlwriter.c
tony2001Mon Feb 6 11:28:42 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/xmlwriter php_xmlwriter.c /php-src/ext/xmlreader php_xmlreader.c /php-src/ext/standard math.c /php-src/ext/splspl_iterators.c /php-src/ext/soap soap.c php_sdl.c Log: MFH: initialize variables and reduce the number of warnings http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.20.2.9&r2=1.20.2.10&diff_format=u Index: php-src/ext/xmlwriter/php_xmlwriter.c diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.9 php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.10 --- php-src/ext/xmlwriter/php_xmlwriter.c:1.20.2.9 Sun Jan 1 12:50:16 2006 +++ php-src/ext/xmlwriter/php_xmlwriter.c Mon Feb 6 11:28:41 2006 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php_xmlwriter.c,v 1.20.2.9 2006/01/01 12:50:16 sniper Exp $ */ +/* $Id: php_xmlwriter.c,v 1.20.2.10 2006/02/06 11:28:41 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1615,7 +1615,7 @@ #ifdef ZEND_ENGINE_2 zval *this = getThis(); - ze_xmlwriter_object *ze_obj; + ze_xmlwriter_object *ze_obj = NULL; #endif #ifndef ZEND_ENGINE_2 @@ -1694,7 +1694,7 @@ #ifdef ZEND_ENGINE_2 zval *this = getThis(); - ze_xmlwriter_object *ze_obj; + ze_xmlwriter_object *ze_obj = NULL; #endif #ifdef ZEND_ENGINE_2 http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.9&r2=1.13.2.10&diff_format=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.9 php-src/ext/xmlreader/php_xmlreader.c:1.13.2.10 --- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.9 Wed Jan 11 15:09:59 2006 +++ php-src/ext/xmlreader/php_xmlreader.c Mon Feb 6 11:28:41 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_xmlreader.c,v 1.13.2.9 2006/01/11 15:09:59 tony2001 Exp $ */ +/* $Id: php_xmlreader.c,v 1.13.2.10 2006/02/06 11:28:41 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -831,7 +831,7 @@ { zval *id; int source_len = 0; - xmlreader_object *intern; + xmlreader_object *intern = NULL; char *source, *valid_file = NULL; char resolved_path[MAXPATHLEN + 1]; xmlTextReaderPtr reader = NULL; @@ -953,7 +953,7 @@ { zval *id; int source_len = 0; - xmlreader_object *intern; + xmlreader_object *intern = NULL; char *source, *uri = NULL; int resolved_path_len; char *directory=NULL, resolved_path[MAXPATHLEN]; http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/math.c?r1=1.131.2.1&r2=1.131.2.2&diff_format=u Index: php-src/ext/standard/math.c diff -u php-src/ext/standard/math.c:1.131.2.1 php-src/ext/standard/math.c:1.131.2.2 --- php-src/ext/standard/math.c:1.131.2.1 Sun Jan 1 12:50:15 2006 +++ php-src/ext/standard/math.c Mon Feb 6 11:28:41 2006 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: math.c,v 1.131.2.1 2006/01/01 12:50:15 sniper Exp $ */ +/* $Id: math.c,v 1.131.2.2 2006/02/06 11:28:41 tony2001 Exp $ */ #include "php.h" #include "php_math.h" @@ -448,7 +448,7 @@ /* calculate pow(long,long) in O(log exp) operations, bail if overflow */ while (i >= 1) { int overflow; - double dval; + double dval = 0.0; if (i % 2) { --i; http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.21&r2=1.73.2.22&diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.73.2.21 php-src/ext/spl/spl_iterators.c:1.73.2.22 --- php-src/ext/spl/spl_iterators.c:1.73.2.21 Mon Jan 23 02:26:32 2006 +++ php-src/ext/spl/spl_iterators.c Mon Feb 6 11:28:41 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_iterators.c,v 1.73.2.21 2006/01/23 02:26:32 helly Exp $ */ +/* $Id: spl_iterators.c,v 1.73.2.22 2006/02/06 11:28:41 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -821,7 +821,7 @@ { zval *zobject, *retval; spl_dual_it_object *intern; - zend_class_entry *ce; + zend_class_entry *ce = NULL; int inc_refcount = 1; php_set_error_handling(EH_THROW, spl_ce_InvalidArgumentException TSRMLS_CC); http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.156.2.13&r2=1.156.2.14&diff_format=u Index: php-src/ext/soap/soap.c diff -u php-src/ext/soap/soap.c:1.156.2.13 php-src/ext/soap/soap.c:1.156.2.14 --- php-src/ext/soap/soap.c:1.156.2.13 Mon Feb 6 11:01:06 2006 +++ php-src/ext/soap/soap.c Mon Feb 6 11:28:41
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/soap php_encoding.c
dmitry Mon Feb 6 13:17:06 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/soap php_encoding.c Log: typo http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.15&r2=1.103.2.16&diff_format=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.103.2.15 php-src/ext/soap/php_encoding.c:1.103.2.16 --- php-src/ext/soap/php_encoding.c:1.103.2.15 Thu Feb 2 11:41:45 2006 +++ php-src/ext/soap/php_encoding.c Mon Feb 6 13:17:06 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php_encoding.c,v 1.103.2.15 2006/02/02 11:41:45 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.103.2.16 2006/02/06 13:17:06 dmitry Exp $ */ #include @@ -327,7 +327,7 @@ /* TODO: namespace isn't stored */ encodePtr enc = get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name); if (enc) { - encode = &enc->details; + encode = enc; } break; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c
dmitry Mon Feb 6 13:17:20 2006 UTC Modified files: /php-src/ext/soap php_encoding.c Log: typo http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.119&r2=1.120&diff_format=u Index: php-src/ext/soap/php_encoding.c diff -u php-src/ext/soap/php_encoding.c:1.119 php-src/ext/soap/php_encoding.c:1.120 --- php-src/ext/soap/php_encoding.c:1.119 Thu Feb 2 11:42:12 2006 +++ php-src/ext/soap/php_encoding.c Mon Feb 6 13:17:20 2006 @@ -17,7 +17,7 @@ | Dmitry Stogov <[EMAIL PROTECTED]> | +--+ */ -/* $Id: php_encoding.c,v 1.119 2006/02/02 11:42:12 dmitry Exp $ */ +/* $Id: php_encoding.c,v 1.120 2006/02/06 13:17:20 dmitry Exp $ */ #include @@ -327,7 +327,7 @@ /* TODO: namespace isn't stored */ encodePtr enc = get_encoder(SOAP_GLOBAL(sdl), SOAP_GLOBAL(sdl)->target_ns, type_name); if (enc) { - encode = &enc->details; + encode = enc; } break; } -- 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/mysql/tests 001.phpt
iliaa Mon Feb 6 14:25:08 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/mysql/tests001.phpt Log: Fixed test to work when TCP/IP access to MySQL is disabled or test server is on a remote machine. http://cvs.php.net/viewcvs.cgi/php-src/ext/mysql/tests/001.phpt?r1=1.3&r2=1.3.2.1&diff_format=u Index: php-src/ext/mysql/tests/001.phpt diff -u php-src/ext/mysql/tests/001.phpt:1.3 php-src/ext/mysql/tests/001.phpt:1.3.2.1 --- php-src/ext/mysql/tests/001.phpt:1.3Mon Jun 20 00:16:31 2005 +++ php-src/ext/mysql/tests/001.phptMon Feb 6 14:25:07 2006 @@ -8,11 +8,6 @@ include 'connect.inc'; $test = ''; -/*** test mysql_connect 127.0.0.1 ***/ -$db = mysql_connect('127.0.0.1', $user, $passwd); -$test .= ($db) ? '1' : '0'; -mysql_close($db); - /*** test mysql_connect localhost ***/ $db = mysql_connect($host, $user, $passwd); $test .= ($db) ? '1' : '0'; @@ -27,4 +22,4 @@ ?> --EXPECT-- -string(3) "111" +string(2) "11" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql/tests 001.phpt
iliaa Mon Feb 6 14:25:28 2006 UTC Modified files: /php-src/ext/mysql/tests001.phpt Log: MFB51: Fixed test to work when TCP/IP access to MySQL is disabled or test server is on a remote machine. http://cvs.php.net/viewcvs.cgi/php-src/ext/mysql/tests/001.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysql/tests/001.phpt diff -u php-src/ext/mysql/tests/001.phpt:1.3 php-src/ext/mysql/tests/001.phpt:1.4 --- php-src/ext/mysql/tests/001.phpt:1.3Mon Jun 20 00:16:31 2005 +++ php-src/ext/mysql/tests/001.phptMon Feb 6 14:25:28 2006 @@ -8,11 +8,6 @@ include 'connect.inc'; $test = ''; -/*** test mysql_connect 127.0.0.1 ***/ -$db = mysql_connect('127.0.0.1', $user, $passwd); -$test .= ($db) ? '1' : '0'; -mysql_close($db); - /*** test mysql_connect localhost ***/ $db = mysql_connect($host, $user, $passwd); $test .= ($db) ? '1' : '0'; @@ -27,4 +22,4 @@ ?> --EXPECT-- -string(3) "111" +string(2) "11" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/unicode unicode_iterators.c
andrei Mon Feb 6 17:42:28 2006 UTC Modified files: /php-src/ext/unicodeunicode_iterators.c Log: Make TextIterator fast again, now that we don't have to worry about references. http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/unicode_iterators.c?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/unicode/unicode_iterators.c diff -u php-src/ext/unicode/unicode_iterators.c:1.11 php-src/ext/unicode/unicode_iterators.c:1.12 --- php-src/ext/unicode/unicode_iterators.c:1.11Sun Feb 5 23:31:47 2006 +++ php-src/ext/unicode/unicode_iterators.c Mon Feb 6 17:42:28 2006 @@ -14,7 +14,7 @@ +--+ */ -/* $Id: unicode_iterators.c,v 1.11 2006/02/05 23:31:47 helly Exp $ */ +/* $Id: unicode_iterators.c,v 1.12 2006/02/06 17:42:28 andrei Exp $ */ /* * TODO @@ -126,16 +126,11 @@ UChar32 cp; int32_t tmp, buf_len; - if (!object->current) { - MAKE_STD_ZVAL(object->current); - Z_USTRVAL_P(object->current) = eumalloc(3); - Z_TYPE_P(object->current) = IS_UNICODE; - tmp = object->u.cp.offset; - U16_NEXT(object->text, tmp, object->text_len, cp); - buf_len = zend_codepoint_to_uchar(cp, Z_USTRVAL_P(object->current)); - Z_USTRVAL_P(object->current)[buf_len] = 0; - Z_USTRLEN_P(object->current) = buf_len; - } + tmp = object->u.cp.offset; + U16_NEXT(object->text, tmp, object->text_len, cp); + buf_len = zend_codepoint_to_uchar(cp, Z_USTRVAL_P(object->current)); + Z_USTRVAL_P(object->current)[buf_len] = 0; + Z_USTRLEN_P(object->current) = buf_len; } static int text_iter_cp_key(text_iter_obj* object TSRMLS_DC) @@ -147,20 +142,12 @@ { U16_FWD_1(object->text, object->u.cp.offset, object->text_len); object->u.cp.index++; - if (object->current) { - zval_ptr_dtor(&object->current); - object->current = NULL; - } } static void text_iter_cp_rewind(text_iter_obj *object TSRMLS_DC) { object->u.cp.offset = 0; object->u.cp.index = 0; - if (object->current) { - zval_ptr_dtor(&object->current); - object->current = NULL; - } } static text_iter_ops text_iter_cp_ops = { @@ -268,9 +255,8 @@ if (intern->text) { efree(intern->text); } - if (intern->current) { - zval_ptr_dtor(&intern->current); - } + ZVAL_DELREF(intern->current); + zval_ptr_dtor(&intern->current); efree(object); } @@ -289,6 +275,10 @@ zend_hash_copy(intern->std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); intern->type = ITER_CODE_POINT; + MAKE_STD_ZVAL(intern->current); /* pre-allocate buffer for codepoint */ + Z_USTRVAL_P(intern->current) = eumalloc(3); + Z_TYPE_P(intern->current) = IS_UNICODE; + ZVAL_ADDREF(intern->current); retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) text_iterator_free_storage, NULL TSRMLS_CC); retval.handlers = zend_get_std_object_handlers(); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/unicode unicode_iterators.c
andrei Mon Feb 6 18:18:41 2006 UTC Modified files: /php-src/ext/unicodeunicode_iterators.c Log: Some TODO items. http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/unicode_iterators.c?r1=1.12&r2=1.13&diff_format=u Index: php-src/ext/unicode/unicode_iterators.c diff -u php-src/ext/unicode/unicode_iterators.c:1.12 php-src/ext/unicode/unicode_iterators.c:1.13 --- php-src/ext/unicode/unicode_iterators.c:1.12Mon Feb 6 17:42:28 2006 +++ php-src/ext/unicode/unicode_iterators.c Mon Feb 6 18:18:41 2006 @@ -14,7 +14,7 @@ +--+ */ -/* $Id: unicode_iterators.c,v 1.12 2006/02/06 17:42:28 andrei Exp $ */ +/* $Id: unicode_iterators.c,v 1.13 2006/02/06 18:18:41 andrei Exp $ */ /* * TODO @@ -22,6 +22,7 @@ * - optimize current() to pass return_value to the handler so that it fills it * in directly instead of creating a new zval * - return code units as binary strings? integers? or leave as unicode strings? + * - implement Countable (or count_elements handler) and Seekable interfaces */ #include "php.h" @@ -43,8 +44,8 @@ zval* current; union { struct { - int32_t offset; int32_t index; + int32_t offset; } cp; struct { int32_t index; -- 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/pcre php_pcre.c
andrei Mon Feb 6 19:02:53 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/pcre php_pcre.c Log: TODO http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.5&r2=1.168.2.6&diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.168.2.5 php-src/ext/pcre/php_pcre.c:1.168.2.6 --- php-src/ext/pcre/php_pcre.c:1.168.2.5 Sun Jan 1 12:50:11 2006 +++ php-src/ext/pcre/php_pcre.c Mon Feb 6 19:02:53 2006 @@ -16,7 +16,14 @@ +--+ */ -/* $Id: php_pcre.c,v 1.168.2.5 2006/01/01 12:50:11 sniper Exp $ */ +/* $Id: php_pcre.c,v 1.168.2.6 2006/02/06 19:02:53 andrei Exp $ */ + +/* + * TODO + * + * - Allow NULL for $matches argument (helps when using preg_match only for + * match condition) + */ #ifdef HAVE_CONFIG_H #include "config.h" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
mikeMon Feb 6 20:11:56 2006 UTC Modified files: /php-src/ext/reflection php_reflection.c Log: - fix ReflectionClass::getInterfaces() http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.201&r2=1.202&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.201 php-src/ext/reflection/php_reflection.c:1.202 --- php-src/ext/reflection/php_reflection.c:1.201 Tue Jan 24 20:19:49 2006 +++ php-src/ext/reflection/php_reflection.c Mon Feb 6 20:11:56 2006 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.201 2006/01/24 20:19:49 helly Exp $ */ +/* $Id: php_reflection.c,v 1.202 2006/02/06 20:11:56 mike Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -3334,7 +3334,7 @@ zval *interface; ALLOC_ZVAL(interface); zend_reflection_class_factory(ce->interfaces[i], interface TSRMLS_CC); - add_assoc_zval_ex(return_value, ce->interfaces[i]->name, ce->interfaces[i]->name_length, interface); + add_assoc_zval_ex(return_value, ce->interfaces[i]->name, ce->interfaces[i]->name_length + 1, interface); } } } @@ -4346,7 +4346,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.201 2006/01/24 20:19:49 helly Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.202 2006/02/06 20:11:56 mike Exp $"); php_info_print_table_end(); } /* }}} */ -- 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/reflection php_reflection.c
mikeMon Feb 6 20:12:48 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/reflection php_reflection.c Log: MFH: fix ReflectionClass::getInterfaces() http://cvs.php.net/viewcvs.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.19&r2=1.164.2.20&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.19 php-src/ext/reflection/php_reflection.c:1.164.2.20 --- php-src/ext/reflection/php_reflection.c:1.164.2.19 Mon Jan 30 21:14:54 2006 +++ php-src/ext/reflection/php_reflection.c Mon Feb 6 20:12:48 2006 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.164.2.19 2006/01/30 21:14:54 tony2001 Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.20 2006/02/06 20:12:48 mike Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -3320,7 +3320,7 @@ zval *interface; ALLOC_ZVAL(interface); zend_reflection_class_factory(ce->interfaces[i], interface TSRMLS_CC); - add_assoc_zval_ex(return_value, ce->interfaces[i]->name, ce->interfaces[i]->name_length, interface); + add_assoc_zval_ex(return_value, ce->interfaces[i]->name, ce->interfaces[i]->name_length + 1, interface); } } } @@ -4328,7 +4328,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.19 2006/01/30 21:14:54 tony2001 Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.20 2006/02/06 20:12:48 mike Exp $"); php_info_print_table_end(); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/unicode unicode_iterators.c
andrei Mon Feb 6 22:58:10 2006 UTC Modified files: /php-src/ext/unicodeunicode_iterators.c Log: - Fix up a bunch of stuff. - Register TextIterator type constants. # Not sure if I like them as class constants. Cleaner, but also longer # to type. http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/unicode_iterators.c?r1=1.13&r2=1.14&diff_format=u Index: php-src/ext/unicode/unicode_iterators.c diff -u php-src/ext/unicode/unicode_iterators.c:1.13 php-src/ext/unicode/unicode_iterators.c:1.14 --- php-src/ext/unicode/unicode_iterators.c:1.13Mon Feb 6 18:18:41 2006 +++ php-src/ext/unicode/unicode_iterators.c Mon Feb 6 22:58:10 2006 @@ -14,7 +14,7 @@ +--+ */ -/* $Id: unicode_iterators.c,v 1.13 2006/02/06 18:18:41 andrei Exp $ */ +/* $Id: unicode_iterators.c,v 1.14 2006/02/06 22:58:10 andrei Exp $ */ /* * TODO @@ -28,14 +28,17 @@ #include "php.h" #include "zend_interfaces.h" #include "zend_exceptions.h" -#include "ext/spl/spl_exceptions.h" typedef enum { ITER_CODE_UNIT, ITER_CODE_POINT, ITER_COMB_SEQUENCE, + ITER_TYPE_LAST, } text_iter_type; +const uint32_t ITER_REVERSE = 0x100; +const uint32_t ITER_TYPE_MASK = 0xFF; + typedef struct { zend_object std; UChar* text; @@ -78,10 +81,9 @@ static void text_iter_cu_current(text_iter_obj* object TSRMLS_DC) { - if (!object->current) { - MAKE_STD_ZVAL(object->current); - ZVAL_UNICODEL(object->current, object->text + object->u.cu.index, 1, 1); - } + u_memcpy(Z_USTRVAL_P(object->current), object->text + object->u.cu.index, 1); + Z_USTRVAL_P(object->current)[1] = 0; + Z_USTRLEN_P(object->current) = 1; } static int text_iter_cu_key(text_iter_obj* object TSRMLS_DC) @@ -92,19 +94,11 @@ static void text_iter_cu_next(text_iter_obj* object TSRMLS_DC) { object->u.cu.index++; - if (object->current) { - zval_ptr_dtor(&object->current); - object->current = NULL; - } } static void text_iter_cu_rewind(text_iter_obj *object TSRMLS_DC) { object->u.cu.index = 0; - if (object->current) { - zval_ptr_dtor(&object->current); - object->current = NULL; - } } static text_iter_ops text_iter_cu_ops = { @@ -218,7 +212,7 @@ iter_ops[object->type]->rewind(object TSRMLS_CC); } -zend_object_iterator_funcs text_iter_cp_funcs = { +zend_object_iterator_funcs text_iter_funcs = { text_iter_dtor, text_iter_valid, text_iter_get_current_data, @@ -240,7 +234,7 @@ ZVAL_ADDREF(object); iterator->intern.data = (void *) object; - iterator->intern.funcs = &text_iter_cp_funcs; + iterator->intern.funcs = &text_iter_funcs; iterator->object = iter_object; return (zend_object_iterator *) iterator; @@ -256,7 +250,6 @@ if (intern->text) { efree(intern->text); } - ZVAL_DELREF(intern->current); zval_ptr_dtor(&intern->current); efree(object); } @@ -278,8 +271,8 @@ intern->type = ITER_CODE_POINT; MAKE_STD_ZVAL(intern->current); /* pre-allocate buffer for codepoint */ Z_USTRVAL_P(intern->current) = eumalloc(3); + Z_USTRVAL_P(intern->current)[0] = 0; Z_TYPE_P(intern->current) = IS_UNICODE; - ZVAL_ADDREF(intern->current); retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) text_iterator_free_storage, NULL TSRMLS_CC); retval.handlers = zend_get_std_object_handlers(); @@ -293,8 +286,10 @@ int32_t text_len; zval *object = getThis(); text_iter_obj *intern; + text_iter_type ti_type; + long flags = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "u", &text, &text_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "u|l", &text, &text_len, &flags) == FAILURE) { return; } @@ -302,8 +297,16 @@ intern->text = eustrndup(text, text_len); intern->text_len = text_len; + if (ZEND_NUM_ARGS() > 1) { + ti_type = flags & ITER_TYPE_MASK; + if (flags < ITER_TYPE_LAST) { + intern->type = ti_type; + } else { + php_error(E_WARNING, "Invalid iterator type in TextIterator constructor"); + } + } - text_iter_cp_rewind(intern TSRMLS_CC); + iter_ops[intern->type]->rewind(intern TSRMLS_CC); } PHP_METHOD(TextIterator, current) @@ -344,7 +347,7 @@ zval *object = getThis(); text_iter_obj *intern = (text_iter_obj*) zend_object_store_get_object(object TSRMLS_CC); - iter_ops[object->type]-
[PHP-CVS] cvs: php-src /ext/unicode unicode_iterators.c
andrei Tue Feb 7 00:13:54 2006 UTC Modified files: /php-src/ext/unicodeunicode_iterators.c Log: Implement combining sequences support in TextIterator. http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/unicode_iterators.c?r1=1.14&r2=1.15&diff_format=u Index: php-src/ext/unicode/unicode_iterators.c diff -u php-src/ext/unicode/unicode_iterators.c:1.14 php-src/ext/unicode/unicode_iterators.c:1.15 --- php-src/ext/unicode/unicode_iterators.c:1.14Mon Feb 6 22:58:10 2006 +++ php-src/ext/unicode/unicode_iterators.c Tue Feb 7 00:13:54 2006 @@ -14,7 +14,7 @@ +--+ */ -/* $Id: unicode_iterators.c,v 1.14 2006/02/06 22:58:10 andrei Exp $ */ +/* $Id: unicode_iterators.c,v 1.15 2006/02/07 00:13:54 andrei Exp $ */ /* * TODO @@ -45,14 +45,20 @@ uint32_ttext_len; text_iter_type type; zval* current; + size_t current_alloc; union { struct { - int32_t index; - int32_t offset; + uint32_t index; + uint32_t offset; } cp; struct { - int32_t index; + uint32_t index; } cu; + struct { + uint32_t index; + uint32_t start; + uint32_t end; + } cs; } u; } text_iter_obj; @@ -153,9 +159,74 @@ text_iter_cp_rewind, }; -static text_iter_ops* iter_ops[2] = { +/* Combining sequence ops */ + +static int text_iter_cs_valid(text_iter_obj* object TSRMLS_DC) +{ + return (object->u.cs.end <= object->text_len); +} + +static void text_iter_cs_current(text_iter_obj* object TSRMLS_DC) +{ + uint32_t length = object->u.cs.end - object->u.cs.start; + if (length > object->current_alloc) { + object->current_alloc = length+1; + Z_USTRVAL_P(object->current) = eurealloc(Z_USTRVAL_P(object->current), object->current_alloc); + } + u_memcpy(Z_USTRVAL_P(object->current), object->text + object->u.cs.start, length); + Z_USTRVAL_P(object->current)[length] = 0; + Z_USTRLEN_P(object->current) = length; +} + +static int text_iter_cs_key(text_iter_obj* object TSRMLS_DC) +{ + return object->u.cs.index; +} + +static void text_iter_cs_next(text_iter_obj* object TSRMLS_DC) +{ + UChar32 cp; + uint32_t end; + + object->u.cs.start = object->u.cs.end; + U16_NEXT(object->text, object->u.cs.end, object->text_len, cp); + if (u_getCombiningClass(cp) == 0) { + end = object->u.cs.end; + while (end < object->text_len) { + U16_NEXT(object->text, end, object->text_len, cp); + if (u_getCombiningClass(cp) == 0) { + break; + } else { + object->u.cs.end = end; + } + } + } + object->u.cs.index++; +} + +static void text_iter_cs_rewind(text_iter_obj *object TSRMLS_DC) +{ + object->u.cs.start = 0; + object->u.cs.end = 0; + text_iter_cs_next(object TSRMLS_CC); /* find first sequence */ + object->u.cs.index = 0; /* because _next increments index */ +} + +static text_iter_ops text_iter_cs_ops = { + text_iter_cs_valid, + text_iter_cs_current, + text_iter_cs_key, + text_iter_cs_next, + text_iter_cs_rewind, +}; + + +/* Ops array */ + +static text_iter_ops* iter_ops[] = { &text_iter_cu_ops, &text_iter_cp_ops, + &text_iter_cs_ops, }; /* Iterator Funcs */ @@ -270,6 +341,7 @@ intern->type = ITER_CODE_POINT; MAKE_STD_ZVAL(intern->current); /* pre-allocate buffer for codepoint */ + intern->current_alloc = 3; Z_USTRVAL_P(intern->current) = eumalloc(3); Z_USTRVAL_P(intern->current)[0] = 0; Z_TYPE_P(intern->current) = IS_UNICODE; -- 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 crc32.c /ext/standard/tests/strings bug36306.phpt
pajoye Tue Feb 7 00:23:55 2006 UTC Added files: (Branch: PHP_5_1) /php-src/ext/standard/tests/strings bug36306.phpt Modified files: /php-src/ext/standard crc32.c Log: - #36306, crc32() function result differs on 32-bit and 64-bit platforms http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/crc32.c?r1=1.16.2.1&r2=1.16.2.2&diff_format=u Index: php-src/ext/standard/crc32.c diff -u php-src/ext/standard/crc32.c:1.16.2.1 php-src/ext/standard/crc32.c:1.16.2.2 --- php-src/ext/standard/crc32.c:1.16.2.1 Sun Jan 1 12:50:14 2006 +++ php-src/ext/standard/crc32.cTue Feb 7 00:23:55 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: crc32.c,v 1.16.2.1 2006/01/01 12:50:14 sniper Exp $ */ +/* $Id: crc32.c,v 1.16.2.2 2006/02/07 00:23:55 pajoye Exp $ */ #include "php.h" #include "basic_functions.h" @@ -38,7 +38,7 @@ for (len += nr; nr--; ++p) { CRC32(crc, *p); } - RETVAL_LONG(~crc); + RETVAL_LONG(~ (long) crc); } /* }}} */ http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/strings/bug36306.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/bug36306.phpt +++ php-src/ext/standard/tests/strings/bug36306.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard crc32.c /ext/standard/tests/strings bug36306.phpt
pajoye Tue Feb 7 00:24:56 2006 UTC Modified files: /php-src/ext/standard crc32.c /php-src/ext/standard/tests/strings bug36306.phpt Log: - MFB: #36306, crc32() result differs on 32-bit and 64-bit platforms http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/crc32.c?r1=1.17&r2=1.18&diff_format=u Index: php-src/ext/standard/crc32.c diff -u php-src/ext/standard/crc32.c:1.17 php-src/ext/standard/crc32.c:1.18 --- php-src/ext/standard/crc32.c:1.17 Sun Jan 1 13:09:54 2006 +++ php-src/ext/standard/crc32.cTue Feb 7 00:24:56 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: crc32.c,v 1.17 2006/01/01 13:09:54 sniper Exp $ */ +/* $Id: crc32.c,v 1.18 2006/02/07 00:24:56 pajoye Exp $ */ #include "php.h" #include "basic_functions.h" @@ -38,7 +38,7 @@ for (len += nr; nr--; ++p) { CRC32(crc, *p); } - RETVAL_LONG(~crc); + RETVAL_LONG(~ (long) crc); } /* }}} */ http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/strings/bug36306.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/strings/bug36306.phpt diff -u /dev/null php-src/ext/standard/tests/strings/bug36306.phpt:1.2 --- /dev/null Tue Feb 7 00:24:56 2006 +++ php-src/ext/standard/tests/strings/bug36306.phptTue Feb 7 00:24:56 2006 @@ -0,0 +1,8 @@ +--TEST-- +Bug #36306 crc32() 64bit +--FILE-- + +--EXPECT-- +-858128794 -- 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
pajoye Tue Feb 7 00:27:04 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - entry for #36306 http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.403&r2=1.2027.2.404&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.403 php-src/NEWS:1.2027.2.404 --- php-src/NEWS:1.2027.2.403 Mon Feb 6 11:45:55 2006 +++ php-src/NEWSTue Feb 7 00:27:04 2006 @@ -20,6 +20,7 @@ - Added imap_savebody() that allows message body to be written to a file. (Mike) - Fixed imagecolorallocate() and imagecolorallocatelapha() to return FALSE on error. (Pierre) +- Fixed bug #36306 (crc32() differ on 32-bit and 64-bit platforms) (Pierre) - Fixed bug #36303 (foreach on error_zval produces segfault). (Dmitry) - Fixed bug #36295 (typo in SplFileObject::flock() parameter name). (Tony) - Fixed bug #36287 (Segfault with SplFileInfo conversion). (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) / NEWS
pajoye Tue Feb 7 00:38:15 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - forgot the original credits http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.404&r2=1.2027.2.405&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.404 php-src/NEWS:1.2027.2.405 --- php-src/NEWS:1.2027.2.404 Tue Feb 7 00:27:04 2006 +++ php-src/NEWSTue Feb 7 00:38:15 2006 @@ -20,7 +20,8 @@ - Added imap_savebody() that allows message body to be written to a file. (Mike) - Fixed imagecolorallocate() and imagecolorallocatelapha() to return FALSE on error. (Pierre) -- Fixed bug #36306 (crc32() differ on 32-bit and 64-bit platforms) (Pierre) +- Fixed bug #36306 (crc32() differ on 32-bit and 64-bit platforms) + ([EMAIL PROTECTED] dot com, Pierre) - Fixed bug #36303 (foreach on error_zval produces segfault). (Dmitry) - Fixed bug #36295 (typo in SplFileObject::flock() parameter name). (Tony) - Fixed bug #36287 (Segfault with SplFileInfo conversion). (Marcus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Tue Feb 7 07:39:19 2006 UTC Modified files: /CVSROOTavail Log: karma http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1084&r2=1.1085&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1084 CVSROOT/avail:1.1085 --- CVSROOT/avail:1.1084Tue Jan 31 08:15:43 2006 +++ CVSROOT/avail Tue Feb 7 07:39:19 2006 @@ -59,7 +59,7 @@ # The PEAR Team has access to the full PEAR tree, the PEAR portion of # the PHP tree, the PEAR website, and the PEAR documentation. -avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,! darknoise,tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore,troehr,sfrausch,bdunlap,drewish,firman,epte,timj,taak,ssuceveanu,bate,anant|pear,peardoc +avail|andrew,moh,sterling,jon,jlp,sebastian,troels,urs,jpm,adaniel,tuupola,mj,metallic,richard,aj,andre,zimt,uw,bjoern,chregu,tfromm,subjective,cox,jmcastagnetto,kaltoft,jccann,amiller,mansion,zyprexia,alexmerz,yavo,clambert,vblavet,bernd,nohn,mog,mfischer,kvn,jan,eru,murahachibu,hayk,cain,nhoizey,aditus,ludoo,imajes,graeme,eriksson,jasonlotito,dallen,lsmith,timmyg,artka,tal,kk,cmv,rashid,alexios,baba,reywob,ekilfoil,antonio,sagi,jrust,mehl,dickmann,alan_k,fab,thku,busterb,miked,pgc,ctrlsoft,tychay,dexter,sachat,svenasse,mw21st,arahn,matthias,dias,jfbus,derick,chief,sigi,tony,olivier,nepto,voyteck,cnb,dams,peterk,ernani,edink,quipo,egnited,arnaud,mcmontero,mbretter,nicos,philip,xnoguer,sjr,meebey,jellybob,darkelder,max,dcowgill,daggilli,kuboa,ncowham,sklar,krausbn,ordnas,avb,polone,datenpunk,inorm,llucax,davey,moosh,et,mscifo,yunosh,thesaur,hburbach,ohill,cellog,hlellelid,rmcclain,vincent,heino,neufeind,didou,schst,alain,mrcool,mroch,mike,vgoebbels,mixtli,farell,pmjones,jw,! darknoise,tarjei,toby,danielc,ieure,metz,gurugeek,rich_y,asnagy,muesli,hcebay,khassani,zamana,aidan,dufuz,sergiosgc,kouber,enemerson,iridium,ortega,guillaume,koyama,scottmattocks,eric,wenz,goetsch,tacker,aph,bolk,cweiske,amt,jinxidoru,cbleek,nosey,abaker,jayeshsh,fredericpoeydome,sean,toggg,navin,pfischer,davidc,markus,cross,crafics,roychri,kore,troehr,sfrausch,bdunlap,drewish,firman,epte,timj,taak,ssuceveanu,bate,anant,hirose31,amistry|pear,peardoc # PEAR bits in the main php-src module avail|cox,mj,vblavet,dickmann,tal,jmcastagnetto,alexmerz,cellog,pajoye,timj|php-src/pear,pear-core @@ -77,8 +77,9 @@ # Some people get only access to specific languages for phpdoc avail|elf,shimooka,takagi|phpdoc-ja avail|machado,scar|phpdoc-pt_BR +avail|stanprog|phpdoc-bg avail|radical,shoty|phpdoc-ro -avail|penguin|phpdoc-da +avail|penguin,tkxs|phpdoc-da avail|ianasa,gustavo,soywiz,ladderalice|phpdoc-es avail|erkje,oebe|phpdoc-nl avail|magidev,colder|phpdoc-fr -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php