[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sat Dec 16 01:31:02 2006 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1035r2=1.1036diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1035 ZendEngine2/ChangeLog:1.1036 --- ZendEngine2/ChangeLog:1.1035Wed Dec 13 01:31:03 2006 +++ ZendEngine2/ChangeLog Sat Dec 16 01:31:02 2006 @@ -1,3 +1,37 @@ +2006-12-15 Andrei Zmievski [EMAIL PROTECTED] + +* zend_alloc.c: + __builtin_expect() exists only in GCC 3.0 and higher. + +* zend_API.h: + Make all macros (RETURN_*, RETVAL_*, ZVAL_*, add_*) that convert binary + strings to Unicode actually issues errors on failure. I'm surprised we + haven't done this already. + +* zend_unicode.c: + Fix potential buffer overflow in default conversion error handler. + +* zend.c: + Make utf8_conv stop on conversion errors when converting to UTF-16. + +2006-12-15 Andi Gutmans [EMAIL PROTECTED] + +* zend_alloc.c: + - MF 5.2 (put cookie in first place) + +* (PHP_5_2) + zend_alloc.c: + - I prefer cookie to be the first element. + +2006-12-15 Dmitry Stogov [EMAIL PROTECTED] + +* zend_alloc.c + zend_alloc.c: + Added internal heap protection +. safe unlinking +. cookies +. canary protection (debug build only) + 2006-12-12 Sara Golemon [EMAIL PROTECTED] * (PHP_5_2) @@ -16055,7 +16089,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1035 2006/12/13 01:31:03 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1036 2006/12/16 01:31:02 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -17779,7 +17813,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1035 2006/12/13 01:31:03 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1036 2006/12/16 01:31:02 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php-src /ext/pdo_sqlite pdo_sqlite.c php_pdo_sqlite.h php_pdo_sqlite_int.h sqlite_driver.c sqlite_statement.c
Hi Wez, On 12/15/06, Wez Furlong [EMAIL PROTECTED] wrote: wez Fri Dec 15 05:03:03 2006 UTC Modified files: /php-src/ext/pdo_sqlite pdo_sqlite.c php_pdo_sqlite.h php_pdo_sqlite_int.h sqlite_driver.c sqlite_statement.c Log: merge php5 pdo_sqlite into head; this source compiles on both php5 and php6. Can you please clarify the compiles on both php5 and php6? The php_pdo_get_exception functions signature differs in versions before 5.2 (needs TSRM argument), or do you target 5.2+ only? --Pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pdo_sqlite pdo_sqlite.c php_pdo_sqlite.h php_pdo_sqlite_int.h sqlite_driver.c sqlite_statement.c
The version of PDO that this version of PDO_SQLITE requires does not have a tsrm arg there. --Wez. On Dec 15, 2006, at 7:23 AM, Pierre wrote: Hi Wez, On 12/15/06, Wez Furlong [EMAIL PROTECTED] wrote: wez Fri Dec 15 05:03:03 2006 UTC Modified files: /php-src/ext/pdo_sqlite pdo_sqlite.c php_pdo_sqlite.h php_pdo_sqlite_int.h sqlite_driver.c sqlite_statement.c Log: merge php5 pdo_sqlite into head; this source compiles on both php5 and php6. Can you please clarify the compiles on both php5 and php6? The php_pdo_get_exception functions signature differs in versions before 5.2 (needs TSRM argument), or do you target 5.2+ only? --Pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
mj Fri Dec 15 18:48:21 2006 UTC Modified files: /CVSROOTavail Log: * PEAR karma for new users http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1221r2=1.1222diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1221 CVSROOT/avail:1.1222 --- CVSROOT/avail:1.1221Thu Dec 14 20:46:48 2006 +++ CVSROOT/avail Fri Dec 15 18:48:21 2006 @@ -364,6 +364,8 @@ avail|crafics|pecl/iptcdata avail|beni|pear/Net_LDAP,peardoc avail|morse|pear/DB_Table,pear/MDB_Table2,peardoc +avail|saltybeagle|pear/Services_W3C_HTMLValidator,peardoc +avail|ashnazg|pear/PhpDocumentor,peardoc # php windows installer avail|jmertic|php-src/win32/installer -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pdo_sqlite pdo_sqlite.c php_pdo_sqlite.h php_pdo_sqlite_int.h sqlite_driver.c sqlite_statement.c
Hello, On 12/15/06, Wez Furlong [EMAIL PROTECTED] wrote: The version of PDO that this version of PDO_SQLITE requires does not have a tsrm arg there. Ah ok thanks, --Pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / unicode-progress.txt /ext/standard basic_functions.c
andrei Fri Dec 15 23:28:10 2006 UTC
Modified files:
/php-srcunicode-progress.txt
/php-src/ext/standard basic_functions.c
Log:
Unicode support in ini_*() functions.
http://cvs.php.net/viewvc.cgi/php-src/unicode-progress.txt?r1=1.66r2=1.67diff_format=u
Index: php-src/unicode-progress.txt
diff -u php-src/unicode-progress.txt:1.66 php-src/unicode-progress.txt:1.67
--- php-src/unicode-progress.txt:1.66 Tue Dec 12 19:25:47 2006
+++ php-src/unicode-progress.txtFri Dec 15 23:28:09 2006
@@ -14,9 +14,6 @@
set_include_path(), get_include_path(), restore_include_path()
Params API, depends on INI mechanism
-ini_get(), ini_get_all(), ini_set(), ini_restore()
-Params API, Unicode support per discussion
-
get_cfg_var()
IS_UNICODE support for varname
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.832r2=1.833diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.832
php-src/ext/standard/basic_functions.c:1.833
--- php-src/ext/standard/basic_functions.c:1.832Tue Dec 12 18:24:16 2006
+++ php-src/ext/standard/basic_functions.c Fri Dec 15 23:28:10 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.832 2006/12/12 18:24:16 andrei Exp $ */
+/* $Id: basic_functions.c,v 1.833 2006/12/15 23:28:10 andrei Exp $ */
#include php.h
#include php_streams.h
@@ -5546,26 +5546,24 @@
}
/* }}} */
-/* {{{ proto string ini_get(string varname)
+/* {{{ proto string ini_get(string varname) U
Get a configuration option */
PHP_FUNCTION(ini_get)
{
- zval **varname;
- char *str;
+ char *varname, *str;
+ int varname_len;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, varname) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, varname,
varname_len, UG(utf8_conv)) == FAILURE) {
+ return;
}
- convert_to_string_ex(varname);
-
- str = zend_ini_string(Z_STRVAL_PP(varname), Z_STRLEN_PP(varname)+1, 0);
+ str = zend_ini_string(varname, varname_len+1, 0);
if (!str) {
RETURN_FALSE;
}
- RETURN_RT_STRING(str, 1);
+ RETURN_UTF8_STRING(str, ZSTR_DUPLICATE);
}
/* }}} */
@@ -5588,15 +5586,15 @@
array_init(option);
if (ini_entry-orig_value) {
- add_ascii_assoc_stringl(option, global_value,
ini_entry-orig_value, ini_entry-orig_value_length, 1);
+ add_ascii_assoc_utf8_stringl(option, global_value,
ini_entry-orig_value, ini_entry-orig_value_length, 1);
} else if (ini_entry-value) {
- add_ascii_assoc_stringl(option, global_value,
ini_entry-value, ini_entry-value_length, 1);
+ add_ascii_assoc_utf8_stringl(option, global_value,
ini_entry-value, ini_entry-value_length, 1);
} else {
add_ascii_assoc_null(option, global_value);
}
if (ini_entry-value) {
- add_ascii_assoc_stringl(option, local_value,
ini_entry-value, ini_entry-value_length, 1);
+ add_ascii_assoc_utf8_stringl(option, local_value,
ini_entry-value, ini_entry-value_length, 1);
} else {
add_ascii_assoc_null(option, local_value);
}
@@ -5608,7 +5606,7 @@
return 0;
}
-/* {{{ proto array ini_get_all([string extension])
+/* {{{ proto array ini_get_all([string extension]) U
Get all configuration options */
PHP_FUNCTION(ini_get_all)
{
@@ -5616,8 +5614,8 @@
int extname_len = 0, extnumber = 0;
zend_module_entry *module;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s, extname,
extname_len) == FAILURE) {
- RETURN_FALSE;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s, extname,
extname_len, UG(ascii_conv)) == FAILURE) {
+ return;
}
zend_ini_sort_entries(TSRMLS_C);
@@ -5644,67 +5642,99 @@
return !strncmp(option_name, new_option_name, option_len);
}
-/* {{{ proto string ini_set(string varname, string newvalue)
+/* {{{ proto string ini_set(string varname, string newvalue) U
Set a configuration option, returns false on error and the old value of the
configuration option on success */
PHP_FUNCTION(ini_set)
{
- zval **varname, **new_value;
+ char *varname;
+ zstr new_value;
+ int varname_len, new_value_len;
+ zend_uchar type;
char *old_value;
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, varname,
new_value) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, st,
+
[PHP-CVS] cvs: php-src / README.UNICODE
andrei Fri Dec 15 23:33:48 2006 UTC Modified files: /php-srcREADME.UNICODE Log: Update with INI file info. http://cvs.php.net/viewvc.cgi/php-src/README.UNICODE?r1=1.6r2=1.7diff_format=u Index: php-src/README.UNICODE diff -u php-src/README.UNICODE:1.6 php-src/README.UNICODE:1.7 --- php-src/README.UNICODE:1.6 Thu Aug 24 21:56:57 2006 +++ php-src/README.UNICODE Fri Dec 15 23:33:48 2006 @@ -211,6 +211,15 @@ unicode.script_encoding = utf-8 +INI Files += + +INI files will be presumed to contain UTF-8 encoded keys and values when the +Unicode semantics mode is On. When the mode is off, the data is taken as-is, +similar to PHP 5. No validation occurs during parsing. Instead invalid UTF-8 +sequences are caught during access by ini_*() functions. + + Conversion Semantics -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
