[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Feb 26 20:32:32 2004 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.415r2=1.416ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.415 ZendEngine2/ChangeLog:1.416 --- ZendEngine2/ChangeLog:1.415 Wed Feb 25 20:32:27 2004 +++ ZendEngine2/ChangeLog Thu Feb 26 20:32:32 2004 @@ -1,3 +1,12 @@ +2004-02-26 Marcus Boerger [EMAIL PROTECTED] + +* zend_language_parser.y + zend_language_scanner.l: + Fix __METHOD__ (noticed by Davey Sahfik) + +* zend_reflection_api.c: + Fix problem with Reflection_Property (patch from Timm slightly modified). + 2004-02-25 Marcus Boerger [EMAIL PROTECTED] * zend_objects_API.c: @@ -3630,7 +3639,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.415 2004/02/26 01:32:27 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.416 2004/02/27 01:32:32 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -5354,7 +5363,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.415 2004/02/26 01:32:27 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.416 2004/02/27 01:32:32 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c mysqli_fe.c mysqli_prop.c
georg Thu Feb 26 03:27:26 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_fe.c mysqli_api.c mysqli_prop.c
Log:
removed blocking calls to mysql_set_server_option (MYSQLI_DISABLE_MQ)
added mysqli_multi_query to function table
changed stmt-affected_rows property (http://bugs.mysql.com/?id=2247) for 4.1.2
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.29r2=1.30ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.29 php-src/ext/mysqli/mysqli_fe.c:1.30
--- php-src/ext/mysqli/mysqli_fe.c:1.29 Sat Feb 21 02:37:41 2004
+++ php-src/ext/mysqli/mysqli_fe.c Thu Feb 26 03:27:24 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_fe.c,v 1.29 2004/02/21 07:37:41 georg Exp $
+ $Id: mysqli_fe.c,v 1.30 2004/02/26 08:27:24 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -98,6 +98,7 @@
PHP_FE(mysqli_kill,
NULL)
PHP_FE(mysqli_master_query,
NULL)
PHP_FE(mysqli_more_results,
NULL)
+ PHP_FE(mysqli_multi_query,
NULL)
PHP_FE(mysqli_next_result,
NULL)
PHP_FE(mysqli_num_fields,
NULL)
PHP_FE(mysqli_num_rows,
NULL)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.74r2=1.75ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.74 php-src/ext/mysqli/mysqli_api.c:1.75
--- php-src/ext/mysqli/mysqli_api.c:1.74Mon Feb 23 01:35:18 2004
+++ php-src/ext/mysqli/mysqli_api.c Thu Feb 26 03:27:24 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.74 2004/02/23 06:35:18 georg Exp $
+ $Id: mysqli_api.c,v 1.75 2004/02/26 08:27:24 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1656,13 +1656,11 @@
if (!(result = mysql_store_result(mysql))) {
MYSQLI_REPORT_MYSQL_ERROR(mysql);
- MYSQLI_DISABLE_MQ;
RETURN_FALSE;
}
if (MyG(report_mode) MYSQLI_REPORT_INDEX) {
php_mysqli_report_index(from previous query, mysql-server_status
TSRMLS_CC);
}
- MYSQLI_DISABLE_MQ;
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
mysqli_resource-ptr = (void *)result;
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_result_class_entry);
@@ -1710,7 +1708,6 @@
if (!(result = mysql_use_result(mysql))) {
MYSQLI_REPORT_MYSQL_ERROR(mysql);
- MYSQLI_DISABLE_MQ;
RETURN_FALSE;
}
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.9r2=1.10ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.9 php-src/ext/mysqli/mysqli_prop.c:1.10
--- php-src/ext/mysqli/mysqli_prop.c:1.9Fri Jan 30 17:45:19 2004
+++ php-src/ext/mysqli/mysqli_prop.cThu Feb 26 03:27:24 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_prop.c,v 1.9 2004/01/30 22:45:19 georg Exp $
+ $Id: mysqli_prop.c,v 1.10 2004/02/26 08:27:24 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -177,7 +177,11 @@
/* statement properties */
+#if MYSQL_VERSION_ID 40102
MYSQLI_MAP_PROPERTY_LONG_LONG(stmt_affected_rows_read, STMT,
stmt-mysql-last_used_con-affected_rows);
+#else
+MYSQLI_MAP_PROPERTY_LONG_LONG(stmt_affected_rows_read, STMT, stmt-affected_rows);
+#endif
MYSQLI_MAP_PROPERTY_LONG_LONG(stmt_num_rows_read, STMT, stmt-result-row_count);
MYSQLI_MAP_PROPERTY_STRING(stmt_query_read, STMT, stmt-query);
MYSQLI_MAP_PROPERTY_LONG(stmt_param_count_read, STMT, stmt-param_count);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c php_mysqli.h
georg Thu Feb 26 06:40:36 2004 EDT Modified files: /php-srcphp.ini-dist php.ini-recommended /php-src/ext/mysqli mysqli.c mysqli_api.c mysqli_nonapi.c php_mysqli.h Log: added MySQLI ini entries added ini parameter for mysql-reconnect http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.207r2=1.208ty=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.207 php-src/php.ini-dist:1.208 --- php-src/php.ini-dist:1.207 Wed Feb 25 05:58:05 2004 +++ php-src/php.ini-distThu Feb 26 06:40:34 2004 @@ -681,6 +681,37 @@ ; SQL-Erros will be displayed. mysql.trace_mode = Off +[MySQLI] + +; Maximum number of links. -1 means no limit. +mysqli.max_links = -1 + +; Default port number for mysqli_connect(). If unset, mysqli_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +mysqli.default_port = 3306 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +mysqli.default_socket = + +; Default host for mysql_connect() (doesn't apply in safe mode). +mysqli.default_host = + +; Default user for mysql_connect() (doesn't apply in safe mode). +mysqli.default_user = + +; Default password for mysqli_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var(mysqli.default_password) +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +mysqli.default_password = + +; Allow or prevent reconnect +mysqli.reconnect = Off + [mSQL] ; Allow or prevent persistent links. msql.allow_persistent = On http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.152r2=1.153ty=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.152 php-src/php.ini-recommended:1.153 --- php-src/php.ini-recommended:1.152 Wed Feb 25 05:58:05 2004 +++ php-src/php.ini-recommended Thu Feb 26 06:40:34 2004 @@ -701,6 +701,37 @@ ; SQL-Erros will be displayed. mysql.trace_mode = Off +[MySQLI] + +; Maximum number of links. -1 means no limit. +mysqli.max_links = -1 + +; Default port number for mysqli_connect(). If unset, mysqli_connect() will use +; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the +; compile-time value defined MYSQL_PORT (in that order). Win32 will only look +; at MYSQL_PORT. +mysqli.default_port = 3306 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +mysqli.default_socket = + +; Default host for mysql_connect() (doesn't apply in safe mode). +mysqli.default_host = + +; Default user for mysql_connect() (doesn't apply in safe mode). +mysqli.default_user = + +; Default password for mysqli_connect() (doesn't apply in safe mode). +; Note that this is generally a *bad* idea to store passwords in this file. +; *Any* user with PHP access can run 'echo get_cfg_var(mysqli.default_password) +; and reveal this password! And of course, any users with read access to this +; file will be able to reveal the password as well. +mysqli.default_password = + +; Allow or prevent reconnect +mysqli.reconnect = Off + [mSQL] ; Allow or prevent persistent links. msql.allow_persistent = On http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.32r2=1.33ty=u Index: php-src/ext/mysqli/mysqli.c diff -u php-src/ext/mysqli/mysqli.c:1.32 php-src/ext/mysqli/mysqli.c:1.33 --- php-src/ext/mysqli/mysqli.c:1.32Sun Feb 15 07:58:18 2004 +++ php-src/ext/mysqli/mysqli.c Thu Feb 26 06:40:35 2004 @@ -15,7 +15,7 @@ | Author: Georg Richter [EMAIL PROTECTED]| +--+ - $Id: mysqli.c,v 1.32 2004/02/15 12:58:18 zeev Exp $ + $Id: mysqli.c,v 1.33 2004/02/26 11:40:35 georg Exp $ */ #ifdef HAVE_CONFIG_H @@ -316,6 +316,7 @@ STD_PHP_INI_ENTRY(mysqli.default_pw, NULL, PHP_INI_ALL,OnUpdateString, default_pw, zend_mysqli_globals,mysqli_globals) STD_PHP_INI_ENTRY(mysqli.default_port,3306, PHP_INI_ALL,OnUpdateLong, default_port, zend_mysqli_globals,mysqli_globals) STD_PHP_INI_ENTRY(mysqli.default_socket, NULL, PHP_INI_ALL,OnUpdateStringUnempty, default_socket, zend_mysqli_globals, mysqli_globals) + STD_PHP_INI_BOOLEAN(mysqli.reconnect, 0, PHP_INI_SYSTEM, OnUpdateLong, reconnect, zend_mysqli_globals,mysqli_globals) PHP_INI_END() /* }}} */ @@ -331,6 +332,7 @@ mysqli_globals-default_user = NULL;
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_prop.c mysqli_repl.c mysqli_report.h php_mysqli.h
sniper Thu Feb 26 07:33:24 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_prop.c mysqli_repl.c mysqli_report.h
php_mysqli.h
Log:
ws cs fixes
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.10r2=1.11ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.10 php-src/ext/mysqli/mysqli_prop.c:1.11
--- php-src/ext/mysqli/mysqli_prop.c:1.10 Thu Feb 26 03:27:24 2004
+++ php-src/ext/mysqli/mysqli_prop.cThu Feb 26 07:33:23 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_prop.c,v 1.10 2004/02/26 08:27:24 georg Exp $
+ $Id: mysqli_prop.c,v 1.11 2004/02/26 12:33:23 sniper Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -40,7 +40,7 @@
ZVAL_LONG(*retval, (long)p-__val);\
}\
return SUCCESS;\
-}\
+}
#define MYSQLI_MAP_PROPERTY_LONG_LONG( __func, __type, __val)\
int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
@@ -59,12 +59,12 @@
} \
}\
return SUCCESS;\
-}\
+}
#define MYSQLI_MAP_PROPERTY_STRING( __func, __type, __val)\
-int __func(mysqli_object *obj, zval **retval TSRMLS_DC) \
+int __func(mysqli_object *obj, zval **retval TSRMLS_DC)\
{\
- __type *p = (__type *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr; \
+ __type *p = (__type *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;\
ALLOC_ZVAL(*retval);\
if (!p) {\
ZVAL_NULL(*retval);\
@@ -76,10 +76,11 @@
}\
}\
return SUCCESS;\
-}\
+}
/* {{{ property link_client_version_read */
-int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) {
+int link_client_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+{
ALLOC_ZVAL(*retval);
ZVAL_STRING(*retval, MYSQL_SERVER_VERSION, 1);
return SUCCESS;
@@ -87,7 +88,8 @@
/* }}} */
/* {{{ property link_connect_errno_read */
-int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC) {
+int link_connect_errno_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+{
ALLOC_ZVAL(*retval);
ZVAL_LONG(*retval, (long)MyG(error_no));
return SUCCESS;
@@ -95,8 +97,9 @@
/* }}} */
/* {{{ property link_server_version_read */
-int link_server_version_read(mysqli_object *obj, zval **retval TSRMLS_DC) {
-MYSQL *mysql = (MYSQL *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
+int link_server_version_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+{
+ MYSQL *mysql = (MYSQL *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
ALLOC_ZVAL(*retval);
ZVAL_LONG(*retval, mysql_get_server_version(mysql));
return SUCCESS;
@@ -104,7 +107,8 @@
/* }}} */
/* {{{ property link_connect_error_read */
-int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC) {
+int link_connect_error_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+{
ALLOC_ZVAL(*retval);
ZVAL_STRING(*retval, MyG(error_msg), 1);
return SUCCESS;
@@ -135,7 +139,8 @@
/* result properties */
/* {{{ property result_type_read */
-int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC) {
+int result_type_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+{
MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
ALLOC_ZVAL(*retval);
@@ -149,7 +154,8 @@
/* }}} */
/* {{{ property result_lengths_read */
-int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC) {
+int result_lengths_read(mysqli_object *obj, zval **retval TSRMLS_DC)
+{
MYSQL_RES *p = (MYSQL_RES *)((MYSQLI_RESOURCE *)(obj-ptr))-ptr;
ALLOC_ZVAL(*retval);
@@ -207,7 +213,7 @@
{server_capabilities, link_server_capabilities_read, NULL},
{server_status, link_server_status_read, NULL},
{server_info, link_server_info_read, NULL},
-{server_version, link_server_version_read, NULL},
+ {server_version, link_server_version_read, NULL},
{sqlstate, link_sqlstate_read, NULL},
{port, link_port_read, NULL},
{protocol_version, link_protocol_version_read, NULL},
@@ -239,3 +245,12 @@
{sqlstate, stmt_sqlstate_read, NULL},
{NULL, NULL, NULL}
};
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim600: noet sw=4 ts=4
+ */
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_repl.c?r1=1.1r2=1.2ty=u
Index: php-src/ext/mysqli/mysqli_repl.c
diff -u php-src/ext/mysqli/mysqli_repl.c:1.1 php-src/ext/mysqli/mysqli_repl.c:1.2
--- php-src/ext/mysqli/mysqli_repl.c:1.1Fri Feb 20 08:09:14 2004
+++ php-src/ext/mysqli/mysqli_repl.cThu Feb 26 07:33:23 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
-
[PHP-CVS] cvs: php-src /ext/tidy tidy.c
sniper Thu Feb 26 08:22:11 2004 EDT Modified files: /php-src/ext/tidy tidy.c Log: Fix typo http://cvs.php.net/diff.php/php-src/ext/tidy/tidy.c?r1=1.40r2=1.41ty=u Index: php-src/ext/tidy/tidy.c diff -u php-src/ext/tidy/tidy.c:1.40 php-src/ext/tidy/tidy.c:1.41 --- php-src/ext/tidy/tidy.c:1.40Sun Feb 22 19:59:29 2004 +++ php-src/ext/tidy/tidy.c Thu Feb 26 08:22:11 2004 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: tidy.c,v 1.40 2004/02/23 00:59:29 sniper Exp $ */ +/* $Id: tidy.c,v 1.41 2004/02/26 13:22:11 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -34,8 +34,8 @@ #include Zend/zend_exceptions.h #include Zend/zend_object_handlers.h -#include tidy/tidy.h -#include tidy/buffio.h +#include tidy.h +#include buffio.h #define PHP_TIDY_MODULE_VERSION2.0-dev @@ -948,7 +948,7 @@ php_info_print_table_start(); php_info_print_table_header(2, Tidy support, enabled); php_info_print_table_row(2, libTidy Release, (char *)tidyReleaseDate()); - php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.40 2004/02/23 00:59:29 sniper Exp $)); + php_info_print_table_row(2, Extension Version, PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.41 2004/02/26 13:22:11 sniper Exp $)); php_info_print_table_end(); DISPLAY_INI_ENTRIES(); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Thu Feb 26 08:31:25 2004 EDT Modified files: /CVSROOTavail Log: - Upgrading pierre's karma http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.830r2=1.831ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.830 CVSROOT/avail:1.831 --- CVSROOT/avail:1.830 Tue Feb 17 04:45:39 2004 +++ CVSROOT/avail Thu Feb 26 08:31:24 2004 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry|phpfi,php3,php-src,pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,livedocs +avail|alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,mlwmohawk,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye|phpfi,php3,php-src,pecl,pear,peardoc,spl,phpdoc,ZendAPI,phpdoc-ar,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,livedocs # People who work on the Engine avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,sniper,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon|Zend,ZendEngine2,TSRM @@ -44,10 +44,10 @@ # 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,pajoye,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|pear,peardoc
[PHP-CVS] cvs: CVSROOT / avail
andrei Thu Feb 26 11:28:30 2004 EDT Modified files: /CVSROOTavail Log: Give cweiske PHP-GTK docs karma. http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.831r2=1.832ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.831 CVSROOT/avail:1.832 --- CVSROOT/avail:1.831 Thu Feb 26 08:31:24 2004 +++ CVSROOT/avail Thu Feb 26 11:28:29 2004 @@ -74,7 +74,7 @@ # The PHP-GTK Documentation Group has access to the PHP-GTK # documentation. -avail|jmoore,sfox,pgod,henning,manu,pablo,cortesi,rambik,hirokawa,thomasgm,jstarkey,fernandoc,richy,simon,josx,didou,derick,nicos,bens,andreas|php-gtk-doc +avail|jmoore,sfox,pgod,henning,manu,pablo,cortesi,rambik,hirokawa,thomasgm,jstarkey,fernandoc,richy,simon,josx,didou,derick,nicos,bens,andreas,cweiske|php-gtk-doc # The PHP-GTK Web Group has access to the PHP-GTK website. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang foreach_with_object_001.phpt
helly Thu Feb 26 14:51:09 2004 EDT
Added files:
/php-src/tests/lang foreach_with_object_001.phpt
Log:
Add new test (from pierre)
http://cvs.php.net/co.php/php-src/tests/lang/foreach_with_object_001.phpt?r=1.1p=1
Index: php-src/tests/lang/foreach_with_object_001.phpt
+++ php-src/tests/lang/foreach_with_object_001.phpt
--TEST--
foreach() with foreach($o-mthd()-arr)
--FILE--
?php
class Test {
public $a = array(1,2,3,4,5); // removed, crash too
function c() {
return new Test();
}
}
$obj = new Test();
foreach ($obj-c()-a as $value) {
print $value\n;
}
?
===DONE===
--EXPECT--
1
2
3
4
5
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fbsql php_fbsql.c php_fbsql.h
fmk Thu Feb 26 15:31:15 2004 EDT
Modified files:
/php-src/ext/fbsql php_fbsql.c php_fbsql.h
Log:
Adding function to change user passwords
http://cvs.php.net/diff.php/php-src/ext/fbsql/php_fbsql.c?r1=1.103r2=1.104ty=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.103 php-src/ext/fbsql/php_fbsql.c:1.104
--- php-src/ext/fbsql/php_fbsql.c:1.103 Mon Feb 9 12:58:04 2004
+++ php-src/ext/fbsql/php_fbsql.c Thu Feb 26 15:31:14 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_fbsql.c,v 1.103 2004/02/09 17:58:04 fmk Exp $ */
+/* $Id: php_fbsql.c,v 1.104 2004/02/26 20:31:14 fmk Exp $ */
/* TODO:
*
@@ -163,6 +163,21 @@
#define FBSQL_LOB_DIRECT 0 /* default */
#define FBSQL_LOB_HANDLE 1 /* default */
+int mdOk(PHPFBLink* link, FBCMetaData* md, char* sql);
+char *DigestPassword(char *user, char *password)
+{
+ char *digest = NULL;
+
+ if (user strlen(user) password strlen(password)) {
+ char *user_upper = estrdup(user);
+ digest = emalloc(17);
+ digest[0] = '\0';
+ (void)fbcDigestPassword(php_strtoupper(user_upper,
strlen(user_upper)), password, digest);
+ efree(user_upper);
+ }
+
+ return digest;
+}
/* {{{ fbsql_functions[]
*/
@@ -225,6 +240,7 @@
PHP_FE(fbsql_username, NULL)
PHP_FE(fbsql_password, NULL)
PHP_FE(fbsql_warnings, NULL)
+ PHP_FE(fbsql_set_password, NULL)
PHP_FE(fbsql_get_autostart_info,NULL)
/* PHP_FE(fbsql_set_autostart_info,NULL) */
@@ -1319,6 +1335,48 @@
}
/* }}} */
+/* {{{ proto bool fbsql_set_password(resource link_identifier, string user, string
password, string old_password)
+ Change the password for a given user */
+PHP_FUNCTION(fbsql_set_password)
+{
+ PHPFBLink* phpLink = NULL;
+ zval **fbsql_link_index = NULL, **user, **password, **old_password;
+ char *digest_password, *digest_old_password;
+ FBCMetaData *md;
+
+ switch (ZEND_NUM_ARGS()) {
+ case 4:
+ if (zend_get_parameters_ex(4, fbsql_link_index, user,
password, old_password)==FAILURE) {
+ RETURN_FALSE;
+ }
+ break;
+ default:
+ WRONG_PARAM_COUNT;
+ break;
+ }
+ ZEND_FETCH_RESOURCE2(phpLink, PHPFBLink *, fbsql_link_index, -1,
FrontBase-Link, le_link, le_plink);
+
+ convert_to_string_ex(user);
+ convert_to_string_ex(password);
+ convert_to_string_ex(old_password);
+
+ digest_password = DigestPassword(Z_STRVAL_PP(user), Z_STRVAL_PP(password));
+ digest_old_password = DigestPassword(Z_STRVAL_PP(user),
Z_STRVAL_PP(old_password));
+
+ md = fbcdcSetPasswordForUser(phpLink-connection, Z_STRVAL_PP(user),
digest_password, digest_old_password);
+ if (mdOk(phpLink, md, Change password)) {
+ ZVAL_BOOL(return_value, 1);
+ }
+ else {
+ ZVAL_BOOL(return_value, 0);
+ }
+ fbcmdRelease(md);
+ if (digest_old_password) efree(digest_old_password);
+ if (digest_password) efree(digest_password);
+}
+/* }}} */
+
+
/* {{{ proto bool fbsql_select_db([string database_name [, resource link_identifier]])
Select the database to open */
PHP_FUNCTION(fbsql_select_db)
http://cvs.php.net/diff.php/php-src/ext/fbsql/php_fbsql.h?r1=1.27r2=1.28ty=u
Index: php-src/ext/fbsql/php_fbsql.h
diff -u php-src/ext/fbsql/php_fbsql.h:1.27 php-src/ext/fbsql/php_fbsql.h:1.28
--- php-src/ext/fbsql/php_fbsql.h:1.27 Thu Jan 8 12:32:05 2004
+++ php-src/ext/fbsql/php_fbsql.h Thu Feb 26 15:31:14 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_fbsql.h,v 1.27 2004/01/08 17:32:05 sniper Exp $ */
+/* $Id: php_fbsql.h,v 1.28 2004/02/26 20:31:14 fmk Exp $ */
#define HAVE_FBSQL 1
@@ -97,6 +97,7 @@
PHP_FUNCTION(fbsql_username);
PHP_FUNCTION(fbsql_password);
PHP_FUNCTION(fbsql_warnings);
+PHP_FUNCTION(fbsql_set_password);
PHP_FUNCTION(fbsql_get_autostart_info);
/* PHP_FUNCTION(fbsql_set_autostart_info); */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/fbsql php_fbsql.c php_fbsql.h
Hi, On 26 Feb 2004, at 21:31, Frank M. Kromann wrote: fmk Thu Feb 26 15:31:15 2004 EDT Modified files: /php-src/ext/fbsql php_fbsql.c php_fbsql.h Log: Adding function to change user passwords bugfix-only-and-feature-freeze-please-check-with-andi-alert. Jan -- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c /ext/sqlite/tests sqlite_027.phpt
iliaa Thu Feb 26 19:29:11 2004 EDT
Added files:
/php-src/ext/sqlite/tests sqlite_027.phpt
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Fixed possible crash inside sqlite_escape_string() and
sqlite_udf_encode_binary().
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.125r2=1.126ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.125 php-src/ext/sqlite/sqlite.c:1.126
--- php-src/ext/sqlite/sqlite.c:1.125 Wed Feb 25 15:16:25 2004
+++ php-src/ext/sqlite/sqlite.c Thu Feb 26 19:29:09 2004
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.125 2004/02/25 20:16:25 abies Exp $
+ $Id: sqlite.c,v 1.126 2004/02/27 00:29:09 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1054,7 +1054,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.125 2004/02/25 20:16:25 abies Exp $);
+ php_info_print_table_row(2, PECL Module version, PHP_SQLITE_MODULE_VERSION
$Id: sqlite.c,v 1.126 2004/02/27 00:29:09 iliaa Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -2604,7 +2604,7 @@
/* binary string */
int enclen;
- ret = emalloc( 1 + ((256 * stringlen + 1262) / 253) );
+ ret = emalloc( 1 + 5 + stringlen * (256 / 253) );
ret[0] = '\x01';
enclen = php_sqlite_encode_binary(string, stringlen, ret+1);
RETVAL_STRINGL(ret, enclen+1, 0);
@@ -2834,7 +2834,7 @@
int enclen;
char *ret;
- ret = emalloc( 1 + ((256 * datalen + 1262) / 253) );
+ ret = emalloc( 1 + 5 + datalen * (256 / 253) );
ret[0] = '\x01';
enclen = php_sqlite_encode_binary(data, datalen, ret+1);
RETVAL_STRINGL(ret, enclen+1, 0);
http://cvs.php.net/co.php/php-src/ext/sqlite/tests/sqlite_027.phpt?r=1.1p=1
Index: php-src/ext/sqlite/tests/sqlite_027.phpt
+++ php-src/ext/sqlite/tests/sqlite_027.phpt
--TEST--
sqlite: crash inside sqlite_escape_string() sqlite_udf_encode_binary
--SKIPIF--
?php # vim:ft=php
if (!extension_loaded(sqlite)) print skip; ?
--FILE--
?php
var_dump(strlen(sqlite_escape_string(str_repeat(\0, 2000;
var_dump(strlen(sqlite_udf_encode_binary(str_repeat(\0, 2000;
?
--EXPECT--
int(2002)
int(2002)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/classes abstract_derived.phpt
helly Thu Feb 26 15:11:29 2004 EDT
Added files:
/php-src/tests/classes abstract_derived.phpt
Log:
Fixes for abstract classes
http://cvs.php.net/co.php/php-src/tests/classes/abstract_derived.phpt?r=1.1p=1
Index: php-src/tests/classes/abstract_derived.phpt
+++ php-src/tests/classes/abstract_derived.phpt
--TEST--
ZE2 A derived class with an abstract method must be abstract
--SKIPIF--
?php if (version_compare(zend_version(), '2.0.0-dev', '')) die('skip ZendEngine 2
needed'); ?
--FILE--
?php
class base {
}
class derived extends base {
abstract function show();
}
?
===DONE===
?php exit(0); ?
--EXPECTF--
Fatal error: Class derived contains 1 abstract methods and must therefore be declared
abstract (derived::show) in %sabstract_derived.php on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_api.c
georg Thu Feb 26 07:24:22 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c
Log:
prototype fix for mysqli_ping
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.76r2=1.77ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.76 php-src/ext/mysqli/mysqli_api.c:1.77
--- php-src/ext/mysqli/mysqli_api.c:1.76Thu Feb 26 06:40:35 2004
+++ php-src/ext/mysqli/mysqli_api.c Thu Feb 26 07:24:21 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.76 2004/02/26 11:40:35 georg Exp $
+ $Id: mysqli_api.c,v 1.77 2004/02/26 12:24:21 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1142,7 +1142,7 @@
}
/* }}} */
-/* {{{ proto int mysqli_ping(object link)
+/* {{{ proto bool mysqli_ping(object link)
Ping a server connection or reconnect if there is no connection */
PHP_FUNCTION(mysqli_ping)
{
@@ -1156,7 +1156,10 @@
MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, mysql_link, mysqli_link);
rc = mysql_ping(mysql);
MYSQLI_REPORT_MYSQL_ERROR(mysql);
- RETURN_LONG(rc);
+ if (rc) {
+ RETURN_FALSE;
+ }
+ RETURN_TRUE;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
