[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Mar 11 06:31:43 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2280r2=1.2281diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2280 php-src/ChangeLog:1.2281 --- php-src/ChangeLog:1.2280Fri Mar 10 06:31:49 2006 +++ php-src/ChangeLog Sat Mar 11 06:31:42 2006 @@ -1,3 +1,85 @@ +2006-03-10 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + - Fix + +2006-03-10 Brian France [EMAIL PROTECTED] + +* (PHP_5_1) + main/main.c: + + MFH: + for the primary file only lookup the real file path and + add it to the included_files list if already opened + otherwise it will get opened and added to the included_files list + in zend_execute_scripts + +* main/main.c: + + for the primary file only lookup the real file path and + add it to the included_files list if already opened + otherwise it will get opened and added to the included_files list in + zend_execute_scripts + +2006-03-10 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/gd/gd.c: + - MFB: #36686, do not be quiet with the extern GD + +* (PHP_5_1) + ext/gd/gd.c: + - #36686, do not be quiet with the extern GD + +2006-03-10 Seiji Masugata [EMAIL PROTECTED] + +* ext/mbstring/mbstring.c + ext/mbstring/mbstring.c + ext/mbstring/mbstring.c: + fixed different value was returned in mb_get_info. + +2006-03-10 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h: + Fixed compilation error (Rob) + +* ZendEngine2/zend_API.h: + Added RETVAL_EMPTRY_TEXT() and RETURN_EMPTY_TEXT() macroses + +* (PHP_5_1) + NEWS: + Fixed bug #36629 (SoapServer::handle() exits on SOAP faults) + +* (PHP_5_1) + NEWS + ext/standard/var.c + ext/standard/var.c: + Fixed debug_zval_dump() to support private and protected members + +* NEWS + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.h + ZendEngine2/zend_execute_API.c + ZendEngine2/zend_globals.h + ZendEngine2/zend_language_parser.y + ZendEngine2/zend_language_scanner.l + ZendEngine2/zend_opcode.c + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_opcodes.h + ZendEngine2/tests/jump01.phpt + ZendEngine2/tests/jump02.phpt + ZendEngine2/tests/jump03.phpt + ZendEngine2/tests/jump04.phpt + ZendEngine2/tests/jump05.phpt + ZendEngine2/tests/jump06.phpt + ZendEngine2/tests/jump07.phpt + ZendEngine2/tests/jump08.phpt + ZendEngine2/tests/jump09.phpt + ZendEngine2/tests/jump10.phpt: + Implemented jump label operator (limited goto) + 2006-03-09 Sara Golemon [EMAIL PROTECTED] * (PHP_5_1)
[PHP-CVS] cvs: php-src /ext/tokenizer/tests 002.phpt bug26463.phpt
dmitry Fri Mar 10 08:29:43 2006 UTC
Modified files:
/php-src/ext/tokenizer/tests002.phpt bug26463.phpt
Log:
Implemented jump label operator (limited goto)
http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/002.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/tokenizer/tests/002.phpt
diff -u php-src/ext/tokenizer/tests/002.phpt:1.5
php-src/ext/tokenizer/tests/002.phpt:1.6
--- php-src/ext/tokenizer/tests/002.phpt:1.5Tue Jan 17 12:18:53 2006
+++ php-src/ext/tokenizer/tests/002.phptFri Mar 10 08:29:43 2006
@@ -19,19 +19,19 @@
echo Done\n;
?
---EXPECT--
+--EXPECT--
array(49) {
[0]=
array(2) {
[0]=
-int(368)
+int(369)
[1]=
string(2) ?
}
[1]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -45,7 +45,7 @@
[3]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -61,7 +61,7 @@
[6]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -75,7 +75,7 @@
[8]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -84,7 +84,7 @@
[10]=
array(2) {
[0]=
-int(350)
+int(351)
[1]=
string(5) isset
}
@@ -104,7 +104,7 @@
[15]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -118,7 +118,7 @@
[17]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -143,7 +143,7 @@
[22]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -166,7 +166,7 @@
[26]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -189,7 +189,7 @@
[30]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -203,7 +203,7 @@
[32]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -217,7 +217,7 @@
[34]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -233,7 +233,7 @@
[37]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -247,7 +247,7 @@
[39]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -261,7 +261,7 @@
[41]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -277,7 +277,7 @@
[44]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -293,14 +293,14 @@
[47]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
[48]=
array(2) {
[0]=
-int(370)
+int(371)
[1]=
string(2) ?
}
@@ -309,7 +309,7 @@
[0]=
array(2) {
[0]=
-int(368)
+int(369)
[1]=
string(6) ?php
}
@@ -334,7 +334,7 @@
[5]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -343,7 +343,7 @@
[7]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -357,7 +357,7 @@
[9]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -373,7 +373,7 @@
[12]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -389,7 +389,7 @@
[15]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -405,7 +405,7 @@
[18]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -421,7 +421,7 @@
[21]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -430,7 +430,7 @@
[23]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -455,7 +455,7 @@
[28]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -464,7 +464,7 @@
[30]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -480,7 +480,7 @@
[33]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -489,14 +489,14 @@
[35]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
[36]=
array(2) {
[0]=
-int(370)
+int(371)
[1]=
string(2) ?
}
@@ -505,28 +505,28 @@
[0]=
array(2) {
[0]=
-int(368)
+int(369)
[1]=
string(2) ?
}
[1]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
[2]=
array(2) {
[0]=
-int(366)
+int(367)
[1]=
string(13) /* comment */
}
[3]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -540,7 +540,7 @@
[5]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -556,7 +556,7 @@
[8]=
array(2) {
[0]=
-int(371)
+int(372)
[1]=
string(1)
}
@@ -570,7 +570,7 @@
[10]=
array(2) {
[0]=
-int(371)
+
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard var.c
dmitry Fri Mar 10 08:42:56 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/standard var.c
Log:
Fixed debug_zval_dump() to support private and protected members
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.451r2=1.2027.2.452diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.451 php-src/NEWS:1.2027.2.452
--- php-src/NEWS:1.2027.2.451 Thu Mar 9 14:22:59 2006
+++ php-src/NEWSFri Mar 10 08:42:56 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? Mar 2006, PHP 5.1.3RC2
+- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
09 Mar 2006, PHP 5.1.3RC1
- Updated PCRE to version 6.6. (Andrei)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/var.c?r1=1.203.2.5r2=1.203.2.6diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.5
php-src/ext/standard/var.c:1.203.2.6
--- php-src/ext/standard/var.c:1.203.2.5Sun Jan 1 12:50:16 2006
+++ php-src/ext/standard/var.c Fri Mar 10 08:42:56 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var.c,v 1.203.2.5 2006/01/01 12:50:16 sniper Exp $ */
+/* $Id: var.c,v 1.203.2.6 2006/03/10 08:42:56 dmitry Exp $ */
@@ -221,12 +221,44 @@
return 0;
}
+static int zval_object_property_dump(zval **zv, int num_args, va_list args,
zend_hash_key *hash_key)
+{
+ int level;
+ char *prop_name, *class_name;
+ TSRMLS_FETCH();
+
+ level = va_arg(args, int);
+
+ if (hash_key-nKeyLength ==0 ) { /* numeric key */
+ php_printf(%*c[%ld]=\n, level + 1, ' ', hash_key-h);
+ } else { /* string key */
+ zend_unmangle_property_name_ex(hash_key-arKey,
hash_key-nKeyLength, class_name, prop_name);
+ if (class_name) {
+ php_printf(%*c[\%s, level + 1, ' ', prop_name);
+ if (class_name[0]=='*') {
+ ZEND_PUTS(:protected);
+ } else {
+ ZEND_PUTS(:private);
+ }
+ } else {
+ php_printf(%*c[\%s, level + 1, ' ', hash_key-arKey);
+#ifdef ANDREY_0
+ ZEND_PUTS(:public);
+#endif
+ }
+ ZEND_PUTS(\]=\n);
+ }
+ php_debug_zval_dump(zv, level + 2 TSRMLS_CC);
+ return 0;
+}
+
PHPAPI void php_debug_zval_dump(zval **struc, int level TSRMLS_DC)
{
HashTable *myht = NULL;
char *class_name;
zend_uint class_name_len;
zend_class_entry *ce;
+ int (*zval_element_dump_func)(zval**, int, va_list, zend_hash_key*);
if (level 1) {
php_printf(%*c, level - 1, ' ');
@@ -257,6 +289,7 @@
return;
}
php_printf(%sarray(%d) refcount(%u){\n, COMMON,
zend_hash_num_elements(myht), Z_REFCOUNT_PP(struc));
+ zval_element_dump_func = zval_array_element_dump;
goto head_done;
case IS_OBJECT:
myht = Z_OBJPROP_PP(struc);
@@ -268,9 +301,10 @@
Z_OBJ_HANDLER(**struc, get_class_name)(*struc, class_name,
class_name_len, 0 TSRMLS_CC);
php_printf(%sobject(%s)#%d (%d) refcount(%u){\n, COMMON,
class_name, Z_OBJ_HANDLE_PP(struc), myht ? zend_hash_num_elements(myht) : 0,
Z_REFCOUNT_PP(struc));
efree(class_name);
+ zval_element_dump_func = zval_object_property_dump;
head_done:
if (myht) {
- zend_hash_apply_with_arguments(myht,
(apply_func_args_t) zval_array_element_dump, 1, level, (Z_TYPE_PP(struc) ==
IS_ARRAY ? 0 : 1));
+ zend_hash_apply_with_arguments(myht,
(apply_func_args_t) zval_element_dump_func, 1, level, (Z_TYPE_PP(struc) ==
IS_ARRAY ? 0 : 1));
}
if (level 1) {
php_printf(%*c, level-1, ' ');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard var.c
dmitry Fri Mar 10 08:43:14 2006 UTC
Modified files:
/php-src/ext/standard var.c
Log:
Fixed debug_zval_dump() to support private and protected members
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/var.c?r1=1.223r2=1.224diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.223 php-src/ext/standard/var.c:1.224
--- php-src/ext/standard/var.c:1.223Thu Mar 2 13:12:45 2006
+++ php-src/ext/standard/var.c Fri Mar 10 08:43:14 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var.c,v 1.223 2006/03/02 13:12:45 dmitry Exp $ */
+/* $Id: var.c,v 1.224 2006/03/10 08:43:14 dmitry Exp $ */
@@ -338,12 +338,46 @@
return 0;
}
+static int zval_object_property_dump(zval **zv, int num_args, va_list args,
zend_hash_key *hash_key)
+{
+ int level;
+ zstr prop_name, class_name;
+ int verbose;
+ TSRMLS_FETCH();
+
+ level = va_arg(args, int);
+ verbose = va_arg(args, int);
+
+ if (hash_key-nKeyLength ==0 ) { /* numeric key */
+ php_printf(%*c[%ld]=\n, level + 1, ' ', hash_key-h);
+ } else { /* string key */
+ int is_unicode = hash_key-type == IS_UNICODE;
+
+ zend_u_unmangle_property_name(hash_key-type, hash_key-arKey,
class_name, prop_name);
+ php_printf(%*c[, level + 1, ' ');
+
+ if (class_name.s) {
+ if (class_name.s[0]=='*') {
+ php_printf(%s\%R\:protected, is_unicode ?
u : , hash_key-type, prop_name);
+ } else {
+ php_printf(%s\%R\:%s\%R\:private,
is_unicode ? u : , hash_key-type, prop_name, is_unicode ? u : ,
hash_key-type, class_name);
+ }
+ } else {
+ php_printf(%s\%R\, is_unicode ? u : ,
hash_key-type, prop_name);
+ }
+ ZEND_PUTS(]=\n);
+ }
+ php_debug_zval_dump(zv, level + 2, 1 TSRMLS_CC);
+ return 0;
+}
+
PHPAPI void php_debug_zval_dump(zval **struc, int level, int verbose TSRMLS_DC)
{
HashTable *myht = NULL;
zstr class_name;
zend_uint class_name_len;
zend_class_entry *ce;
+ int (*zval_element_dump_func)(zval**, int, va_list, zend_hash_key*);
if (level 1) {
php_printf(%*c, level - 1, ' ');
@@ -379,6 +413,7 @@
return;
}
php_printf(%sarray(%d) refcount(%u){\n, COMMON,
zend_hash_num_elements(myht), Z_REFCOUNT_PP(struc));
+ zval_element_dump_func = zval_array_element_dump;
goto head_done;
case IS_OBJECT:
myht = Z_OBJPROP_PP(struc);
@@ -390,9 +425,10 @@
Z_OBJ_HANDLER(**struc, get_class_name)(*struc, class_name,
class_name_len, 0 TSRMLS_CC);
php_printf(%sobject(%v)#%d (%d) refcount(%u){\n, COMMON,
class_name, Z_OBJ_HANDLE_PP(struc), myht ? zend_hash_num_elements(myht) : 0,
Z_REFCOUNT_PP(struc));
efree(class_name.v);
+ zval_element_dump_func = zval_object_property_dump;
head_done:
if (myht) {
- zend_hash_apply_with_arguments(myht,
(apply_func_args_t) zval_array_element_dump, 1, level, (Z_TYPE_PP(struc) ==
IS_ARRAY ? 0 : 1));
+ zend_hash_apply_with_arguments(myht,
(apply_func_args_t) zval_element_dump_func, 1, level, (Z_TYPE_PP(struc) ==
IS_ARRAY ? 0 : 1));
}
if (level 1) {
php_printf(%*c, level-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
masugataFri Mar 10 16:15:35 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstring mbstring.c
Log:
fixed different value was returned in mb_get_info.
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.10r2=1.142.2.47.2.11diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.10
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.11
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.10 Thu Mar 2 00:39:57 2006
+++ php-src/ext/mbstring/mbstring.c Fri Mar 10 16:15:35 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.47.2.10 2006/03/02 00:39:57 yohgaki Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.11 2006/03/10 16:15:35 masugata Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -3699,13 +3699,15 @@
/* }}} */
-/* {{{ proto string mb_get_info([string type])
+/* {{{ proto mixed mb_get_info([string type])
Returns the current settings of mbstring */
PHP_FUNCTION(mb_get_info)
{
zval **type;
char *name;
int argc = ZEND_NUM_ARGS();
+ const struct mb_overload_def *over_func;
+ zval *row;
if (argc 0 || argc 1 || zend_get_parameters_ex(1, type) ==
FAILURE) {
WRONG_PARAM_COUNT;
@@ -3726,9 +3728,20 @@
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_http_output_encoding))) != NULL) {
add_assoc_string(return_value, http_output, name, 1);
}
- if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(func_overload))) != NULL) {
- add_assoc_string(return_value, func_overload, name,
1);
- }
+ if (MBSTRG(func_overload)){
+ over_func = (mb_ovld[0]);
+ MAKE_STD_ZVAL(row);
+ array_init(row);
+ while (over_func-type 0) {
+ if ((MBSTRG(func_overload) over_func-type)
== over_func-type ) {
+ add_assoc_string(row,
over_func-orig_func, over_func-ovld_func, 1);
+ }
+ over_func++;
+ }
+ add_assoc_zval(return_value, func_overload, row);
+ } else {
+ add_assoc_string(return_value, func_overload, no
overload, 1);
+ }
} else if (!strcasecmp(internal_encoding, Z_STRVAL_PP(type))) {
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_internal_encoding))) != NULL) {
RETVAL_STRING(name, 1);
@@ -3742,9 +3755,18 @@
RETVAL_STRING(name, 1);
}
} else if (!strcasecmp(func_overload, Z_STRVAL_PP(type))) {
- if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(func_overload))) != NULL) {
- RETVAL_STRING(name, 1);
- }
+ if (MBSTRG(func_overload)){
+ over_func = (mb_ovld[0]);
+ array_init(return_value);
+ while (over_func-type 0) {
+ if ((MBSTRG(func_overload)
over_func-type) == over_func-type ) {
+ add_assoc_string(return_value,
over_func-orig_func, over_func-ovld_func, 1);
+ }
+ over_func++;
+ }
+ } else {
+ RETVAL_STRING(no overload, 1);
+ }
} else {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mbstring mbstring.c
masugataFri Mar 10 16:22:15 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/mbstring mbstring.c
Log:
fixed different value was returned in mb_get_info.
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.15r2=1.224.2.16diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.15
php-src/ext/mbstring/mbstring.c:1.224.2.16
--- php-src/ext/mbstring/mbstring.c:1.224.2.15 Thu Mar 2 00:37:22 2006
+++ php-src/ext/mbstring/mbstring.c Fri Mar 10 16:22:15 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.15 2006/03/02 00:37:22 yohgaki Exp $ */
+/* $Id: mbstring.c,v 1.224.2.16 2006/03/10 16:22:15 masugata Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -3326,20 +3326,22 @@
/* }}} */
-/* {{{ proto string mb_get_info([string type])
+/* {{{ proto mixed mb_get_info([string type])
Returns the current settings of mbstring */
PHP_FUNCTION(mb_get_info)
{
char *typ = NULL;
int typ_len;
char *name;
+ const struct mb_overload_def *over_func;
+ zval *row;
+ const mbfl_language *lang = mbfl_no2language(MBSTRG(current_language));
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s, typ,
typ_len) == FAILURE) {
RETURN_FALSE;
}
if (!typ || !strcasecmp(all, typ)) {
- const mbfl_language *lang =
mbfl_no2language(MBSTRG(current_language));
array_init(return_value);
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_internal_encoding))) != NULL) {
add_assoc_string(return_value, internal_encoding,
name, 1);
@@ -3350,16 +3352,30 @@
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_http_output_encoding))) != NULL) {
add_assoc_string(return_value, http_output, name, 1);
}
- if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(func_overload))) != NULL) {
- add_assoc_string(return_value, func_overload, name,
1);
- }
+ if (MBSTRG(func_overload)){
+ over_func = (mb_ovld[0]);
+ MAKE_STD_ZVAL(row);
+ array_init(row);
+ while (over_func-type 0) {
+ if ((MBSTRG(func_overload) over_func-type)
== over_func-type ) {
+ add_assoc_string(row,
over_func-orig_func, over_func-ovld_func, 1);
+ }
+ over_func++;
+ }
+ add_assoc_zval(return_value, func_overload, row);
+ } else {
+ add_assoc_string(return_value, func_overload, no
overload, 1);
+ }
if (lang != NULL) {
- add_assoc_string(return_value, mail_charset,
-
mbfl_no_encoding2name(lang-mail_charset), 1);
- add_assoc_string(return_value, mail_header_encoding,
-
mbfl_no_encoding2name(lang-mail_header_encoding), 1);
- add_assoc_string(return_value, mail_body_encoding,
-
mbfl_no_encoding2name(lang-mail_body_encoding), 1);
+ if ((name = (char
*)mbfl_no_encoding2name(lang-mail_charset)) != NULL) {
+ add_assoc_string(return_value, mail_charset,
name, 1);
+ }
+ if ((name = (char
*)mbfl_no_encoding2name(lang-mail_header_encoding)) != NULL) {
+ add_assoc_string(return_value,
mail_header_encoding, name, 1);
+ }
+ if ((name = (char
*)mbfl_no_encoding2name(lang-mail_body_encoding)) != NULL) {
+ add_assoc_string(return_value,
mail_body_encoding, name, 1);
+ }
}
} else if (!strcasecmp(internal_encoding, typ)) {
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_internal_encoding))) != NULL) {
@@ -3374,7 +3390,28 @@
RETVAL_STRING(name, 1);
}
} else if (!strcasecmp(func_overload, typ)) {
- if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(func_overload))) != NULL) {
+ if (MBSTRG(func_overload)){
+ over_func = (mb_ovld[0]);
+ array_init(return_value);
+ while (over_func-type 0) {
+ if ((MBSTRG(func_overload)
over_func-type) == over_func-type ) {
+
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
masugataFri Mar 10 16:36:52 2006 UTC
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
fixed different value was returned in mb_get_info.
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.241r2=1.242diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.241
php-src/ext/mbstring/mbstring.c:1.242
--- php-src/ext/mbstring/mbstring.c:1.241 Tue Mar 7 00:20:53 2006
+++ php-src/ext/mbstring/mbstring.c Fri Mar 10 16:36:52 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.241 2006/03/07 00:20:53 pajoye Exp $ */
+/* $Id: mbstring.c,v 1.242 2006/03/10 16:36:52 masugata Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -3321,20 +3321,22 @@
/* }}} */
-/* {{{ proto string mb_get_info([string type])
+/* {{{ proto mixed mb_get_info([string type])
Returns the current settings of mbstring */
PHP_FUNCTION(mb_get_info)
{
char *typ = NULL;
int typ_len;
char *name;
+ const struct mb_overload_def *over_func;
+ zval *row;
+ const mbfl_language *lang = mbfl_no2language(MBSTRG(current_language));
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s, typ,
typ_len) == FAILURE) {
RETURN_FALSE;
}
if (!typ || !strcasecmp(all, typ)) {
- const mbfl_language *lang =
mbfl_no2language(MBSTRG(current_language));
array_init(return_value);
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_internal_encoding))) != NULL) {
add_assoc_string(return_value, internal_encoding,
name, 1);
@@ -3345,16 +3347,30 @@
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_http_output_encoding))) != NULL) {
add_assoc_string(return_value, http_output, name, 1);
}
- if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(func_overload))) != NULL) {
- add_assoc_string(return_value, func_overload, name,
1);
- }
+ if (MBSTRG(func_overload)){
+ over_func = (mb_ovld[0]);
+ MAKE_STD_ZVAL(row);
+ array_init(row);
+ while (over_func-type 0) {
+ if ((MBSTRG(func_overload) over_func-type)
== over_func-type ) {
+ add_assoc_string(row,
over_func-orig_func, over_func-ovld_func, 1);
+ }
+ over_func++;
+ }
+ add_assoc_zval(return_value, func_overload, row);
+ } else {
+ add_assoc_string(return_value, func_overload, no
overload, 1);
+ }
if (lang != NULL) {
- add_assoc_string(return_value, mail_charset,
-
mbfl_no_encoding2name(lang-mail_charset), 1);
- add_assoc_string(return_value, mail_header_encoding,
-
mbfl_no_encoding2name(lang-mail_header_encoding), 1);
- add_assoc_string(return_value, mail_body_encoding,
-
mbfl_no_encoding2name(lang-mail_body_encoding), 1);
+ if ((name = (char
*)mbfl_no_encoding2name(lang-mail_charset)) != NULL) {
+ add_assoc_string(return_value, mail_charset,
name, 1);
+ }
+ if ((name = (char
*)mbfl_no_encoding2name(lang-mail_header_encoding)) != NULL) {
+ add_assoc_string(return_value,
mail_header_encoding, name, 1);
+ }
+ if ((name = (char
*)mbfl_no_encoding2name(lang-mail_body_encoding)) != NULL) {
+ add_assoc_string(return_value,
mail_body_encoding, name, 1);
+ }
}
} else if (!strcasecmp(internal_encoding, typ)) {
if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(current_internal_encoding))) != NULL) {
@@ -3369,7 +3385,28 @@
RETVAL_STRING(name, 1);
}
} else if (!strcasecmp(func_overload, typ)) {
- if ((name = (char
*)mbfl_no_encoding2name(MBSTRG(func_overload))) != NULL) {
+ if (MBSTRG(func_overload)){
+ over_func = (mb_ovld[0]);
+ array_init(return_value);
+ while (over_func-type 0) {
+ if ((MBSTRG(func_overload)
over_func-type) == over_func-type ) {
+
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/gd gd.c
pajoye Fri Mar 10 18:07:27 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/gd gd.c
Log:
- #36686, do not be quiet with the extern GD
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.312.2.19r2=1.312.2.20diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.19 php-src/ext/gd/gd.c:1.312.2.20
--- php-src/ext/gd/gd.c:1.312.2.19 Sun Feb 5 15:53:58 2006
+++ php-src/ext/gd/gd.c Fri Mar 10 18:07:27 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.312.2.19 2006/02/05 15:53:58 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.20 2006/03/10 18:07:27 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1094,6 +1094,7 @@
RETURN_TRUE;
}
+/* }}} */
#endif
#if HAVE_GD_BUNDLED
@@ -1635,7 +1636,11 @@
#ifdef HAVE_GD_JPG
case PHP_GDIMG_TYPE_JPG:
ignore_warning =
INI_INT(gd.jpeg_ignore_warning);
+#ifdef HAVE_GD_BUNDLED
im = gdImageCreateFromJpeg(fp, ignore_warning);
+#else
+ im = gdImageCreateFromJpeg(fp);
+#endif
break;
#endif
@@ -3918,7 +3923,11 @@
#ifdef HAVE_GD_JPG
case PHP_GDIMG_TYPE_JPG:
ignore_warning = INI_INT(gd.jpeg_ignore_warning);
+#ifdef HAVE_GD_BUNDLED
im_org = gdImageCreateFromJpeg(org, ignore_warning);
+#else
+ im_org = gdImageCreateFromJpeg(org);
+#endif
if (im_org == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Unable to open '%s' Not a valid JPEG file, fn_dest);
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd gd.c
pajoye Fri Mar 10 18:15:21 2006 UTC
Modified files:
/php-src/ext/gd gd.c
Log:
- MFB: #36686, do not be quiet with the extern GD
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.348r2=1.349diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.348 php-src/ext/gd/gd.c:1.349
--- php-src/ext/gd/gd.c:1.348 Sun Mar 5 19:20:11 2006
+++ php-src/ext/gd/gd.c Fri Mar 10 18:15:21 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.348 2006/03/05 19:20:11 pajoye Exp $ */
+/* $Id: gd.c,v 1.349 2006/03/10 18:15:21 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1456,7 +1456,11 @@
#ifdef HAVE_GD_JPG
case PHP_GDIMG_TYPE_JPG:
ignore_warning =
INI_INT(gd.jpeg_ignore_warning);
+#ifdef HAVE_GD_BUNDLED
im = gdImageCreateFromJpeg(fp, ignore_warning);
+#else
+ im = gdImageCreateFromJpeg(fp);
+#endif
break;
#endif
@@ -3649,7 +3653,11 @@
#ifdef HAVE_GD_JPG
case PHP_GDIMG_TYPE_JPG:
ignore_warning = INI_INT(gd.jpeg_ignore_warning);
+#ifdef HAVE_GD_BUNDLED
im_org = gdImageCreateFromJpeg(org, ignore_warning);
+#else
+ im_org = gdImageCreateFromJpeg(org);
+#endif
if (im_org == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Unable to open '%s' Not a valid JPEG file, fn_dest);
RETURN_FALSE;
--
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
bfrance Fri Mar 10 18:16:24 2006 UTC
Modified files:
/php-src/main main.c
Log:
for the primary file only lookup the real file path and
add it to the included_files list if already opened
otherwise it will get opened and added to the included_files list in
zend_execute_scripts
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.671r2=1.672diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.671 php-src/main/main.c:1.672
--- php-src/main/main.c:1.671 Thu Mar 9 20:31:58 2006
+++ php-src/main/main.c Fri Mar 10 18:16:24 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.671 2006/03/09 20:31:58 pollita Exp $ */
+/* $Id: main.c,v 1.672 2006/03/10 18:16:24 bfrance Exp $ */
/* {{{ includes
*/
@@ -1786,7 +1786,10 @@
VCWD_CHDIR_FILE(primary_file-filename);
}
- if (primary_file-filename) {
+ /* Only lookup the real file path and add it to the
included_files list if already opened
+* otherwise it will get opened and added to the
included_files list in zend_execute_scripts
+*/
+ if (primary_file-filename primary_file-type !=
ZEND_HANDLE_FILENAME) {
int realfile_len;
int dummy = 1;
if (VCWD_REALPATH(primary_file-filename, realfile)) {
--
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) /main main.c
bfrance Fri Mar 10 18:19:29 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/main main.c
Log:
MFH:
for the primary file only lookup the real file path and
add it to the included_files list if already opened
otherwise it will get opened and added to the included_files list in
zend_execute_scripts
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.17r2=1.640.2.18diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.17 php-src/main/main.c:1.640.2.18
--- php-src/main/main.c:1.640.2.17 Thu Mar 9 20:32:22 2006
+++ php-src/main/main.c Fri Mar 10 18:19:29 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.17 2006/03/09 20:32:22 pollita Exp $ */
+/* $Id: main.c,v 1.640.2.18 2006/03/10 18:19:29 bfrance Exp $ */
/* {{{ includes
*/
@@ -1681,7 +1681,10 @@
VCWD_CHDIR_FILE(primary_file-filename);
}
- if (primary_file-filename) {
+ /* Only lookup the real file path and add it to the
included_files list if already opened
+* otherwise it will get opened and added to the
included_files list in zend_execute_scripts
+*/
+ if (primary_file-filename primary_file-type !=
ZEND_HANDLE_FILENAME) {
int realfile_len;
int dummy = 1;
if (VCWD_REALPATH(primary_file-filename, realfile)) {
--
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
helly Fri Mar 10 22:18:25 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - Fix http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.453r2=1.2027.2.454diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.453 php-src/NEWS:1.2027.2.454 --- php-src/NEWS:1.2027.2.453 Fri Mar 10 11:46:51 2006 +++ php-src/NEWSFri Mar 10 22:18:25 2006 @@ -13,7 +13,7 @@ - Fixed issues with not/double calling of constructors of SPL iterators. - Fixed issues with info-class/file-class in SPL directory handling classes. - Fixed ArrayIterator::seek(). - - Added SimpleXMLElement::count(). + - Added SimpleXMLIterator::count(). - Dropped erroneous RecursiveDirectoryIterator::getSubPathInfo(). - Improved SimpleXML: (Marcus, Rob) . Added SimpleXMLElement::getName() to retrieve name of element. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
