[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c
iliaaMon, 14 Feb 2011 14:05:46 + Revision: http://svn.php.net/viewvc?view=revisionrevision=308323 Log: Fixed variable re-declarations Changed paths: U php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c U php/php-src/trunk/ext/mysql/php_mysql.c Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c === --- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2011-02-14 13:58:03 UTC (rev 308322) +++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2011-02-14 14:05:46 UTC (rev 308323) @@ -371,11 +371,11 @@ if (mysql-active_result_id) { \ do {\ int type; \ - MYSQL_RES *mysql_result;\ + MYSQL_RES *_mysql_result; \ \ - mysql_result = (MYSQL_RES *) zend_list_find(mysql-active_result_id, type);\ - if (mysql_result type==le_result) { \ - if (mysql_result_is_unbuffered(mysql_result) !mysql_eof(mysql_result)) { \ + _mysql_result = (MYSQL_RES *) zend_list_find(mysql-active_result_id, type); \ + if (_mysql_result type==le_result) { \ + if (mysql_result_is_unbuffered(_mysql_result) !mysql_eof(_mysql_result)) { \ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Function called without first fetching all rows from a previous unbuffered query); \ } \ zend_list_delete(mysql-active_result_id); \ @@ -2126,12 +2126,12 @@ fci.retval_ptr_ptr = retval_ptr; if (ctor_params Z_TYPE_P(ctor_params) != IS_NULL) { if (Z_TYPE_P(ctor_params) == IS_ARRAY) { - HashTable *ht = Z_ARRVAL_P(ctor_params); + HashTable *htl = Z_ARRVAL_P(ctor_params); Bucket *p; fci.param_count = 0; - fci.params = safe_emalloc(sizeof(zval*), ht-nNumOfElements, 0); - p = ht-pListHead; + fci.params = safe_emalloc(sizeof(zval*), htl-nNumOfElements, 0); + p = htl-pListHead; while (p != NULL) { fci.params[fci.param_count++] = (zval**)p-pData; p = p-pListNext; Modified: php/php-src/trunk/ext/mysql/php_mysql.c === --- php/php-src/trunk/ext/mysql/php_mysql.c 2011-02-14 13:58:03 UTC (rev 308322) +++ php/php-src/trunk/ext/mysql/php_mysql.c 2011-02-14 14:05:46 UTC (rev 308323) @@ -371,11 +371,11 @@ if (mysql-active_result_id) { \ do {\ int type; \ - MYSQL_RES *mysql_result;\ + MYSQL_RES *_mysql_result; \ \ - mysql_result = (MYSQL_RES *) zend_list_find(mysql-active_result_id, type);\ - if (mysql_result type==le_result) { \ - if (mysql_result_is_unbuffered(mysql_result) !mysql_eof(mysql_result)) { \ + _mysql_result = (MYSQL_RES *) zend_list_find(mysql-active_result_id, type); \ + if (_mysql_result type==le_result) { \ + if (mysql_result_is_unbuffered(_mysql_result) !mysql_eof(_mysql_result)) { \ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Function called without first fetching all rows from a previous unbuffered query); \ } \ zend_list_delete(mysql-active_result_id); \ @@ -2126,12 +2126,12 @@ fci.retval_ptr_ptr = retval_ptr; if (ctor_params Z_TYPE_P(ctor_params) != IS_NULL) { if (Z_TYPE_P(ctor_params) == IS_ARRAY) { - HashTable *ht = Z_ARRVAL_P(ctor_params); + HashTable *htl =
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c
uw Mon, 04 Oct 2010 10:08:10 + Revision: http://svn.php.net/viewvc?view=revisionrevision=303974 Log: Sorry again, nothing but removal of white space from the end of the lines. - fix compile warning ext/mysql/php_mysql.c:640:11: warning: extra tokens at end of #ifdef directive Changed paths: U php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c U php/php-src/trunk/ext/mysql/php_mysql.c Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c === --- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-10-04 10:02:58 UTC (rev 303973) +++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-10-04 10:08:10 UTC (rev 303974) @@ -17,7 +17,7 @@ | Georg Richter ge...@php.net | +--+ */ - + /* $Id$ */ /* TODO: @@ -130,7 +130,7 @@ #define MYSQL_DISABLE_MQ if (mysql-multi_query) { \ mysql_set_server_option(mysql-conn, MYSQL_OPTION_MULTI_STATEMENTS_OFF); \ mysql-multi_query = 0; \ -} +} #else #define MYSQL_DISABLE_MQ #endif @@ -295,7 +295,7 @@ PHP_FE(mysql_info, arginfo__optional_mysql_link) #ifdef MYSQL_HAS_SET_CHARSET PHP_FE(mysql_set_charset, arginfo_mysql_set_charset) -#endif +#endif /* for downwards compatability */ PHP_FALIAS(mysql,mysql_db_query, arginfo_mysql_db_query) PHP_FALIAS(mysql_fieldname, mysql_field_name, arginfo_mysql_field_name) @@ -450,7 +450,7 @@ static void _close_mysql_link(zend_rsrc_list_entry *rsrc TSRMLS_DC) { php_mysql_conn *link = (php_mysql_conn *)rsrc-ptr; - void (*handler) (int); + void (*handler) (int); handler = signal(SIGPIPE, SIG_IGN); mysql_close(link-conn); @@ -543,11 +543,11 @@ REGISTER_LONG_CONSTANT(MYSQL_NUM, MYSQL_NUM, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQL_BOTH, MYSQL_BOTH, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(MYSQL_CLIENT_COMPRESS, CLIENT_COMPRESS, CONST_CS | CONST_PERSISTENT); -#if MYSQL_VERSION_ID = 4 +#if MYSQL_VERSION_ID = 4 REGISTER_LONG_CONSTANT(MYSQL_CLIENT_SSL, CLIENT_SSL, CONST_CS | CONST_PERSISTENT); #endif REGISTER_LONG_CONSTANT(MYSQL_CLIENT_INTERACTIVE, CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT(MYSQL_CLIENT_IGNORE_SPACE, CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(MYSQL_CLIENT_IGNORE_SPACE, CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); #ifndef MYSQL_USE_MYSQLND #if MYSQL_VERSION_ID = 4 @@ -717,7 +717,7 @@ #if !defined(PHP_WIN32) !defined(NETWARE) struct servent *serv_ptr; char *env; - + MySG(default_port) = MYSQL_PORT; if ((serv_ptr = getservbyname(mysql, tcp))) { MySG(default_port) = (uint) ntohs((ushort) serv_ptr-s_port); @@ -729,7 +729,7 @@ MySG(default_port) = MYSQL_PORT; #endif } - + if (PG(sql_safe_mode)) { if (ZEND_NUM_ARGS()0) { php_error_docref(NULL TSRMLS_CC, E_NOTICE, SQL safe mode in effect - ignoring host/user/password information); @@ -748,7 +748,7 @@ } } else { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s!s!s!bl, host_and_port, host_len, - user, user_len, passwd, passwd_len, + user, user_len, passwd, passwd_len, new_link, client_flags)==FAILURE) { return; } @@ -835,7 +835,7 @@ #else mysql-multi_query = 0; #endif - + #ifndef MYSQL_USE_MYSQLND mysql-conn = mysql_init(NULL); #else @@ -890,7 +890,7 @@ /* ensure that the link did not die */ #if A0 defined(MYSQL_USE_MYSQLND) mysqlnd_end_psession(mysql-conn); -#endif +#endif if (mysql_ping(mysql-conn)) { if (mysql_errno(mysql-conn) == 2006) { #ifndef MYSQL_USE_MYSQLND @@ -915,7 +915,7 @@ ZEND_REGISTER_RESOURCE(return_value, mysql, le_plink); } else { /* non persistent */ zend_rsrc_list_entry *index_ptr, new_index_ptr; - + /* first we check the hash for the hashed_details key. if it exists, * it should point us to the right offset where the actual mysql link sits. * if it doesn't, open a new mysql link, add it to the resource list, @@ -973,7 +973,7 @@ } #ifndef MYSQL_USE_MYSQLND - if (mysql_real_connect(mysql-conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) + if (mysql_real_connect(mysql-conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) #else if (mysqlnd_connect(mysql-conn, host, user, passwd, 0, NULL, 0, port, socket, client_flags TSRMLS_CC) == NULL) #endif @@ -1074,7 +1074,7 @@ #endif zend_list_delete(resource_id); - if (!mysql_link + if (!mysql_link || (mysql_link Z_RESVAL_P(mysql_link)==MySG(default_link))) { MySG(default_link) = -1; if (mysql_link) { @@ -1096,7 +1096,7 @@ zval *mysql_link = NULL; int id = -1; php_mysql_conn *mysql; - + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|r, db, db_len, mysql_link) == FAILURE) { return; } @@ -1107,11
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c
felipe Mon, 28 Jun 2010 01:19:08 + Revision: http://svn.php.net/viewvc?view=revisionrevision=300792 Log: - Fix arginfo name Changed paths: U php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c U php/php-src/trunk/ext/mysql/php_mysql.c Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c === --- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-06-28 00:15:18 UTC (rev 300791) +++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-06-28 01:19:08 UTC (rev 300792) @@ -303,7 +303,7 @@ PHP_FALIAS(mysql_fieldlen, mysql_field_len, arginfo_mysql_field_seek) PHP_FALIAS(mysql_fieldtype, mysql_field_type, arginfo_mysql_field_seek) PHP_FALIAS(mysql_fieldflags,mysql_field_flags, arginfo_mysql_field_seek) - PHP_FALIAS(mysql_selectdb, mysql_select_db, mysql_list_tables) + PHP_FALIAS(mysql_selectdb, mysql_select_db, arginfo_mysql_select_db) #ifndef NETWARE/* The below two functions not supported on NetWare */ #if MYSQL_VERSION_ID 4 PHP_DEP_FALIAS(mysql_createdb, mysql_create_db, arginfo_mysql_select_db) Modified: php/php-src/trunk/ext/mysql/php_mysql.c === --- php/php-src/trunk/ext/mysql/php_mysql.c 2010-06-28 00:15:18 UTC (rev 300791) +++ php/php-src/trunk/ext/mysql/php_mysql.c 2010-06-28 01:19:08 UTC (rev 300792) @@ -303,7 +303,7 @@ PHP_FALIAS(mysql_fieldlen, mysql_field_len, arginfo_mysql_field_seek) PHP_FALIAS(mysql_fieldtype, mysql_field_type, arginfo_mysql_field_seek) PHP_FALIAS(mysql_fieldflags,mysql_field_flags, arginfo_mysql_field_seek) - PHP_FALIAS(mysql_selectdb, mysql_select_db, mysql_list_tables) + PHP_FALIAS(mysql_selectdb, mysql_select_db, arginfo_mysql_select_db) #ifndef NETWARE/* The below two functions not supported on NetWare */ #if MYSQL_VERSION_ID 4 PHP_DEP_FALIAS(mysql_createdb, mysql_create_db, arginfo_mysql_select_db) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c
andrey Tue, 25 May 2010 22:55:10 + Revision: http://svn.php.net/viewvc?view=revisionrevision=299764 Log: Handle the situation when mysql_init()/mysqlnd_init() return NULL. It is a rare case of OOM but PHP shouldn't crash, if possible. Changed paths: U php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c U php/php-src/trunk/ext/mysql/php_mysql.c Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c === --- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-05-25 22:46:17 UTC (rev 299763) +++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-05-25 22:55:10 UTC (rev 299764) @@ -960,9 +960,17 @@ #else mysql-conn = mysql_init(persistent); #endif + if (!mysql-conn) { + MySG(connect_error) = estrdup(OOM); + php_error_docref(NULL TSRMLS_CC, E_WARNING, OOM); + efree(hashed_details); + efree(mysql); + MYSQL_DO_CONNECT_RETURN_FALSE(); + } - if (connect_timeout != -1) - mysql_options(mysql-conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)connect_timeout); + if (connect_timeout != -1) { + mysql_options(mysql-conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)connect_timeout); + } #ifndef MYSQL_USE_MYSQLND if (mysql_real_connect(mysql-conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) Modified: php/php-src/trunk/ext/mysql/php_mysql.c === --- php/php-src/trunk/ext/mysql/php_mysql.c 2010-05-25 22:46:17 UTC (rev 299763) +++ php/php-src/trunk/ext/mysql/php_mysql.c 2010-05-25 22:55:10 UTC (rev 299764) @@ -960,9 +960,17 @@ #else mysql-conn = mysql_init(persistent); #endif + if (!mysql-conn) { + MySG(connect_error) = estrdup(OOM); + php_error_docref(NULL TSRMLS_CC, E_WARNING, OOM); + efree(hashed_details); + efree(mysql); + MYSQL_DO_CONNECT_RETURN_FALSE(); + } - if (connect_timeout != -1) - mysql_options(mysql-conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)connect_timeout); + if (connect_timeout != -1) { + mysql_options(mysql-conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)connect_timeout); + } #ifndef MYSQL_USE_MYSQLND if (mysql_real_connect(mysql-conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c
felipe Thu, 20 May 2010 17:28:16 + Revision: http://svn.php.net/viewvc?view=revisionrevision=299527 Log: - Added arginfo Changed paths: U php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c U php/php-src/trunk/ext/mysql/php_mysql.c Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c === --- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-05-20 15:26:26 UTC (rev 299526) +++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-05-20 17:28:16 UTC (rev 299527) @@ -135,65 +135,166 @@ #define MYSQL_DISABLE_MQ #endif +/* {{{ arginfo */ +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_connect, 0, 0, 0) + ZEND_ARG_INFO(0, hostname) + ZEND_ARG_INFO(0, username) + ZEND_ARG_INFO(0, password) + ZEND_ARG_INFO(0, new) + ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_pconnect, 0, 0, 0) + ZEND_ARG_INFO(0, hostname) + ZEND_ARG_INFO(0, username) + ZEND_ARG_INFO(0, password) + ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo__optional_mysql_link, 0, 0, 0) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_select_db, 0, 0, 1) + ZEND_ARG_INFO(0, database_name) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO(arginfo__void_mysql_arg, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_set_charset, 0, 0, 1) + ZEND_ARG_INFO(0, charset_name) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_query, 0, 0, 1) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_db_query, 0, 0, 2) + ZEND_ARG_INFO(0, database_name) + ZEND_ARG_INFO(0, query) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_list_fields, 0, 0, 2) + ZEND_ARG_INFO(0, database_name) + ZEND_ARG_INFO(0, table_name) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_escape_string, 0, 0, 1) + ZEND_ARG_INFO(0, string) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_real_escape_string, 0, 0, 1) + ZEND_ARG_INFO(0, string) + ZEND_ARG_INFO(0, link_identifier) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_result, 0, 0, 2) + ZEND_ARG_INFO(0, result) + ZEND_ARG_INFO(0, row) + ZEND_ARG_INFO(0, field) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo__result_mysql_arg, 0, 0, 1) + ZEND_ARG_INFO(0, result) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_fetch_object, 0, 0, 1) + ZEND_ARG_INFO(0, result) + ZEND_ARG_INFO(0, class_name) + ZEND_ARG_INFO(0, ctor_params) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_fetch_array, 0, 0, 1) + ZEND_ARG_INFO(0, result) + ZEND_ARG_INFO(0, result_type) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_data_seek, 0, 0, 2) + ZEND_ARG_INFO(0, result) + ZEND_ARG_INFO(0, row_number) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_fetch_field, 0, 0, 1) + ZEND_ARG_INFO(0, result) + ZEND_ARG_INFO(0, field_offset) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_field_seek, 0, 0, 2) + ZEND_ARG_INFO(0, result) + ZEND_ARG_INFO(0, field_offset) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_mysql_field_name, 0, 0, 2) + ZEND_ARG_INFO(0, result) + ZEND_ARG_INFO(0, field_index) +ZEND_END_ARG_INFO() +/* }}} */ + /* {{{ mysql_functions[] */ static const zend_function_entry mysql_functions[] = { - PHP_FE(mysql_connect,NULL) - PHP_FE(mysql_pconnect,NULL) - PHP_FE(mysql_close, NULL) - PHP_FE(mysql_select_db,NULL) + PHP_FE(mysql_connect,arginfo_mysql_connect) + PHP_FE(mysql_pconnect,arginfo_mysql_pconnect) + PHP_FE(mysql_close, arginfo__optional_mysql_link) + PHP_FE(mysql_select_db,arginfo_mysql_select_db) #ifndef NETWARE /* The below two functions not supported on NetWare */ #if MYSQL_VERSION_ID 4 - PHP_DEP_FE(mysql_create_db, NULL) - PHP_DEP_FE(mysql_drop_db, NULL) + PHP_DEP_FE(mysql_create_db, arginfo_mysql_select_db) + PHP_DEP_FE(mysql_drop_db, arginfo_mysql_select_db) #endif #endif /* NETWARE */ - PHP_FE(mysql_query, NULL) - PHP_FE(mysql_unbuffered_query, NULL) - PHP_FE(mysql_db_query,NULL) - PHP_FE(mysql_list_dbs,NULL) - PHP_DEP_FE(mysql_list_tables, NULL) - PHP_FE(mysql_list_fields, NULL) - PHP_FE(mysql_list_processes, NULL) - PHP_FE(mysql_error, NULL) + PHP_FE(mysql_query, arginfo_mysql_query) + PHP_FE(mysql_unbuffered_query, arginfo_mysql_query) + PHP_FE(mysql_db_query,arginfo_mysql_db_query) + PHP_FE(mysql_list_dbs,arginfo__optional_mysql_link) + PHP_DEP_FE(mysql_list_tables, arginfo_mysql_select_db) + PHP_FE(mysql_list_fields, arginfo_mysql_list_fields) +