[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c trunk/ext/mysqlnd/mysqlnd_net.c
andrey Tue, 05 Oct 2010 08:17:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304065
Log:
fix recent TSRM build break, with --enable-debug
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c 2010-10-05
03:33:46 UTC (rev 304064)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c 2010-10-05
08:17:33 UTC (rev 304065)
@@ -41,7 +41,7 @@
/* {{{ mysqlnd_set_sock_no_delay */
static int
-mysqlnd_set_sock_no_delay(php_stream * stream)
+mysqlnd_set_sock_no_delay(php_stream * stream TSRMLS_DC)
{
int socketd = ((php_netstream_data_t*)stream-abstract)-socket;
@@ -183,7 +183,7 @@
if (!memcmp(scheme, tcp://, sizeof(tcp://) - 1)) {
/* TCP - Set TCP_NODELAY */
- mysqlnd_set_sock_no_delay(net-stream);
+ mysqlnd_set_sock_no_delay(net-stream TSRMLS_CC);
}
{
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-10-05 03:33:46 UTC (rev
304064)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-10-05 08:17:33 UTC (rev
304065)
@@ -41,7 +41,7 @@
/* {{{ mysqlnd_set_sock_no_delay */
static int
-mysqlnd_set_sock_no_delay(php_stream * stream)
+mysqlnd_set_sock_no_delay(php_stream * stream TSRMLS_DC)
{
int socketd = ((php_netstream_data_t*)stream-abstract)-socket;
@@ -190,7 +190,7 @@
if (!memcmp(scheme, tcp://, sizeof(tcp://) - 1)) {
/* TCP - Set TCP_NODELAY */
- mysqlnd_set_sock_no_delay(net-stream);
+ mysqlnd_set_sock_no_delay(net-stream TSRMLS_CC);
}
{
--
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/mysqli/mysqli_report.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c trunk/ext/mysqli/mysqli_report.c trunk/ext/mysqlnd/mysqlnd_result_meta.c
uw Tue, 05 Oct 2010 08:29:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304066
Log:
Fix warnings
ext\mysqlnd\mysqlnd_result_meta.c(57) : warning C4090: 'initializing' :
different 'const' qualifiers
ext\mysqlnd\mysqlnd_result_meta.c(64) : warning C4090: 'initializing' :
different 'const' qualifiers
ext\mysqli\mysqli_report.c(50) : warning C4013:
'php_mysqli_throw_sql_exception' undefined; assuming extern returning int
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
U php/php-src/trunk/ext/mysqli/mysqli_report.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c 2010-10-05
08:17:33 UTC (rev 304065)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_report.c 2010-10-05
08:29:54 UTC (rev 304066)
@@ -27,6 +27,8 @@
#include ext/standard/info.h
#include php_mysqli_structs.h
+extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno
TSRMLS_DC, char *format, ...);
+
/* {{{ proto bool mysqli_report(int flags)
sets report level */
PHP_FUNCTION(mysqli_report)
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
2010-10-05 08:17:33 UTC (rev 304065)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result_meta.c
2010-10-05 08:29:54 UTC (rev 304066)
@@ -54,14 +54,14 @@
static zend_bool
mysqlnd_is_key_numeric(const char * key, size_t length, long *idx)
{
- register char * tmp = key;
+ register const char * tmp = key;
if (*tmp=='-') {
tmp++;
}
if ((*tmp='0' *tmp='9')) {
do { /* possibly a numeric index */
- char *end=key+length-1;
+ const char *end=key+length-1;
if (*tmp++=='0' length2) { /* don't accept numbers
with leading zeros */
break;
@@ -454,7 +454,7 @@
/* }}} */
-static
+static
MYSQLND_CLASS_METHODS_START(mysqlnd_res_meta)
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field),
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field_direct),
Modified: php/php-src/trunk/ext/mysqli/mysqli_report.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_report.c2010-10-05 08:17:33 UTC
(rev 304065)
+++ php/php-src/trunk/ext/mysqli/mysqli_report.c2010-10-05 08:29:54 UTC
(rev 304066)
@@ -27,6 +27,8 @@
#include ext/standard/info.h
#include php_mysqli_structs.h
+extern void php_mysqli_throw_sql_exception(char *sqlstate, int errorno
TSRMLS_DC, char *format, ...);
+
/* {{{ proto bool mysqli_report(int flags)
sets report level */
PHP_FUNCTION(mysqli_report)
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c 2010-10-05 08:17:33 UTC
(rev 304065)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result_meta.c 2010-10-05 08:29:54 UTC
(rev 304066)
@@ -54,14 +54,14 @@
static zend_bool
mysqlnd_is_key_numeric(const char * key, size_t length, long *idx)
{
- register char * tmp = key;
+ register const char * tmp = key;
if (*tmp=='-') {
tmp++;
}
if ((*tmp='0' *tmp='9')) {
do { /* possibly a numeric index */
- char *end=key+length-1;
+ const char *end=key+length-1;
if (*tmp++=='0' length2) { /* don't accept numbers
with leading zeros */
break;
@@ -454,7 +454,7 @@
/* }}} */
-static
+static
MYSQLND_CLASS_METHODS_START(mysqlnd_res_meta)
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field),
MYSQLND_METHOD(mysqlnd_res_meta, fetch_field_direct),
--
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/mysqlnd/mysqlnd_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
andrey Tue, 05 Oct 2010 08:56:21 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304068
Log:
fix types
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2010-10-05 08:50:04 UTC (rev 304067)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2010-10-05 08:56:21 UTC (rev 304068)
@@ -1106,7 +1106,7 @@
static enum_func_status
php_mysqlnd_read_row_ex(MYSQLND * conn, MYSQLND_MEMORY_POOL *
result_set_memory_pool,
MYSQLND_MEMORY_POOL_CHUNK
**buffer,
- uint64_t *data_size, zend_bool
persistent_alloc,
+ size_t *data_size, zend_bool
persistent_alloc,
unsigned int
prealloc_more_bytes TSRMLS_DC)
{
enum_func_status ret = PASS;
@@ -1527,7 +1527,7 @@
size_t old_chunk_size = net-stream-chunk_size;
MYSQLND_PACKET_ROW *packet= (MYSQLND_PACKET_ROW *) _packet;
size_t post_alloc_for_bit_fields = 0;
- uint64_t data_size = 0;
+ size_t data_size = 0;
DBG_ENTER(php_mysqlnd_rowp_read);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2010-10-05
08:50:04 UTC (rev 304067)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2010-10-05
08:56:21 UTC (rev 304068)
@@ -1106,7 +1106,7 @@
static enum_func_status
php_mysqlnd_read_row_ex(MYSQLND * conn, MYSQLND_MEMORY_POOL *
result_set_memory_pool,
MYSQLND_MEMORY_POOL_CHUNK
**buffer,
- uint64_t *data_size, zend_bool
persistent_alloc,
+ size_t *data_size, zend_bool
persistent_alloc,
unsigned int
prealloc_more_bytes TSRMLS_DC)
{
enum_func_status ret = PASS;
@@ -1527,7 +1527,7 @@
size_t old_chunk_size = net-stream-chunk_size;
MYSQLND_PACKET_ROW *packet= (MYSQLND_PACKET_ROW *) _packet;
size_t post_alloc_for_bit_fields = 0;
- uint64_t data_size = 0;
+ size_t data_size = 0;
DBG_ENTER(php_mysqlnd_rowp_read);
--
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/mysqli/mysqli_api.c branches/PHP_5_3/ext/mysqli/mysqli_prop.c trunk/ext/mysqli/mysqli.c trunk/ext/mysqli/mysqli_prop.c trunk/ext/mysqli/mysqli_result_
kalleTue, 05 Oct 2010 09:40:36 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304070
Log:
Fixed compiler warnings in mysqli
- mysqli.c: Fix unused variables, they are only used in non-mysqlnd mode
- mysqli_api.c (PHP_5_3 only): Fix constness, add_property_string expects a
char *, not a const char *
- mysqli_prop.c: Cast to long, as its below the LONG_MAX and therefore safe
- mysqli_result_iterator.c: Cast to ulong as the iterator member expects that
rather than a my_longlong
# In trunk only warnings regarding the zend_property_info
# structure is present and PHP_5_3 is warning free now
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c
U php/php-src/trunk/ext/mysqli/mysqli.c
U php/php-src/trunk/ext/mysqli/mysqli_prop.c
U php/php-src/trunk/ext/mysqli/mysqli_result_iterator.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2010-10-05
09:20:03 UTC (rev 304069)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2010-10-05
09:40:36 UTC (rev 304070)
@@ -1047,11 +1047,11 @@
/* {{{ php_add_field_properties */
static void php_add_field_properties(zval *value, const MYSQL_FIELD *field
TSRMLS_DC)
{
- add_property_string(value, name,(field-name ? field-name : ), 1);
- add_property_string(value, orgname,(field-org_name ? field-org_name
: ), 1);
- add_property_string(value, table,(field-table ? field-table : ),
1);
- add_property_string(value, orgtable,(field-org_table ?
field-org_table : ), 1);
- add_property_string(value, def,(field-def ? field-def : ), 1);
+ add_property_string(value, name, (char *) (field-name ? field-name
: ), 1);
+ add_property_string(value, orgname, (char *) (field-org_name ?
field-org_name : ), 1);
+ add_property_string(value, table, (char *) (field-table ?
field-table : ), 1);
+ add_property_string(value, orgtable, (char *) (field-org_table ?
field-org_table : ), 1);
+ add_property_string(value, def, (field-def ? field-def : ), 1);
add_property_long(value, max_length, field-max_length);
add_property_long(value, length, field-length);
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c 2010-10-05
09:20:03 UTC (rev 304069)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c 2010-10-05
09:40:36 UTC (rev 304070)
@@ -84,7 +84,7 @@
} else {\
l = (__ret_type)__int_func(p);\
if (l LONG_MAX) {\
- ZVAL_LONG(*retval, l);\
+ ZVAL_LONG(*retval, (long) l);\
} else { \
char *ret; \
int ret_len = spprintf(ret, 0, __ret_type_sprint_mod,
l); \
@@ -178,7 +178,7 @@
}
if (rc LONG_MAX) {
- ZVAL_LONG(*retval, rc);
+ ZVAL_LONG(*retval, (long) rc);
} else {
char *ret;
int l = spprintf(ret, 0, MYSQLI_LLU_SPEC, rc);
@@ -295,7 +295,7 @@
}
if (rc LONG_MAX) {
- ZVAL_LONG(*retval, rc);
+ ZVAL_LONG(*retval, (long) rc);
} else {
char *ret;
int l = spprintf(ret, 0, MYSQLI_LLU_SPEC, rc);
Modified: php/php-src/trunk/ext/mysqli/mysqli.c
===
--- php/php-src/trunk/ext/mysqli/mysqli.c 2010-10-05 09:20:03 UTC (rev
304069)
+++ php/php-src/trunk/ext/mysqli/mysqli.c 2010-10-05 09:40:36 UTC (rev
304070)
@@ -1087,12 +1087,12 @@
*/
void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result,
long fetchtype TSRMLS_DC)
{
+#if !defined(MYSQLI_USE_MYSQLND)
MYSQL_ROW row;
unsigned inti;
MYSQL_FIELD *fields;
unsigned long *field_len;
-
-#if !defined(MYSQLI_USE_MYSQLND)
+
if (!(row = mysql_fetch_row(result))) {
RETURN_NULL();
}
Modified: php/php-src/trunk/ext/mysqli/mysqli_prop.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_prop.c 2010-10-05 09:20:03 UTC (rev
304069)
+++ php/php-src/trunk/ext/mysqli/mysqli_prop.c 2010-10-05 09:40:36 UTC (rev
304070)
@@ -84,7 +84,7 @@
} else {\
l = (__ret_type)__int_func(p);\
if (l LONG_MAX) {\
- ZVAL_LONG(*retval, l);\
+ ZVAL_LONG(*retval, (long) l);\
} else { \
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysql/ php_mysql.c
kalleTue, 05 Oct 2010 09:48:07 + Revision: http://svn.php.net/viewvc?view=revisionrevision=304071 Log: Fix constness warnings Changed paths: U php/php-src/branches/PHP_5_3/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-05 09:40:36 UTC (rev 304070) +++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c 2010-10-05 09:48:07 UTC (rev 304071) @@ -2370,8 +2370,8 @@ } object_init(return_value); - add_property_string(return_value, name,(mysql_field-name?mysql_field-name:), 1); - add_property_string(return_value, table,(mysql_field-table?mysql_field-table:), 1); + add_property_string(return_value, name, (char *) (mysql_field-name?mysql_field-name:), 1); + add_property_string(return_value, table,(char *) (mysql_field-table?mysql_field-table:), 1); add_property_string(return_value, def,(mysql_field-def?mysql_field-def:), 1); add_property_long(return_value, max_length, mysql_field-max_length); add_property_long(return_value, not_null, IS_NOT_NULL(mysql_field-flags)?1:0); -- 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/pdo_mysql/mysql_statement.c trunk/ext/pdo_mysql/mysql_statement.c
kalleTue, 05 Oct 2010 09:58:15 + Revision: http://svn.php.net/viewvc?view=revisionrevision=304072 Log: Fixed constness compiler warning in pdo_mysql Changed paths: U php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c U php/php-src/trunk/ext/pdo_mysql/mysql_statement.c Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c === --- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c 2010-10-05 09:48:07 UTC (rev 304071) +++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c 2010-10-05 09:58:15 UTC (rev 304072) @@ -886,7 +886,7 @@ #endif add_assoc_zval(return_value, flags, flags); - add_assoc_string(return_value, table,(F-table?F-table:), 1); + add_assoc_string(return_value, table,(char *) (F-table?F-table:), 1); PDO_DBG_RETURN(SUCCESS); } /* }}} */ Modified: php/php-src/trunk/ext/pdo_mysql/mysql_statement.c === --- php/php-src/trunk/ext/pdo_mysql/mysql_statement.c 2010-10-05 09:48:07 UTC (rev 304071) +++ php/php-src/trunk/ext/pdo_mysql/mysql_statement.c 2010-10-05 09:58:15 UTC (rev 304072) @@ -867,7 +867,7 @@ #endif add_assoc_zval(return_value, flags, flags); - add_assoc_string(return_value, table,(F-table?F-table:), 1); + add_assoc_string(return_value, table, (char *) (F-table?F-table:), 1); PDO_DBG_RETURN(SUCCESS); } /* }}} */ -- 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/mysqlnd/mysqlnd_structs.h trunk/ext/mysqlnd/mysqlnd_structs.h
andrey Tue, 05 Oct 2010 10:30:00 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304075
Log:
fixing more types
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2010-10-05
10:09:05 UTC (rev 304074)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2010-10-05
10:30:00 UTC (rev 304075)
@@ -44,7 +44,7 @@
struct st_mysqlnd_memory_pool_chunk
{
- uint64_tapp;
+ size_t app;
MYSQLND_MEMORY_POOL *pool;
zend_uchar *ptr;
unsigned intsize;
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2010-10-05 10:09:05 UTC
(rev 304074)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h 2010-10-05 10:30:00 UTC
(rev 304075)
@@ -44,7 +44,7 @@
struct st_mysqlnd_memory_pool_chunk
{
- uint64_tapp;
+ size_t app;
MYSQLND_MEMORY_POOL *pool;
zend_uchar *ptr;
unsigned intsize;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/mysqli_api.c branches/PHP_5_3/ext/mysqli/mysqli_prop.c trunk/ext/mysqli/mysqli.c trunk/ext/mysqli/mysqli_prop.c trunk/ext/mysqli/mysqli_res
Kalle Sommer Nielsen wrote:
kalleTue, 05 Oct 2010 09:40:36 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304070
Log:
Fixed compiler warnings in mysqli
- mysqli.c: Fix unused variables, they are only used in non-mysqlnd mode
- mysqli_api.c (PHP_5_3 only): Fix constness, add_property_string expects a
char *, not a const char *
I left these for reasons, so merges are easier. These warnings don't
hurt much, do they?
- mysqli_prop.c: Cast to long, as its below the LONG_MAX and therefore safe
- mysqli_result_iterator.c: Cast to ulong as the iterator member expects that
rather than a my_longlong
# In trunk only warnings regarding the zend_property_info
# structure is present and PHP_5_3 is warning free now
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c
U php/php-src/trunk/ext/mysqli/mysqli.c
U php/php-src/trunk/ext/mysqli/mysqli_prop.c
U php/php-src/trunk/ext/mysqli/mysqli_result_iterator.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2010-10-05
09:20:03 UTC (rev 304069)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2010-10-05
09:40:36 UTC (rev 304070)
@@ -1047,11 +1047,11 @@
/* {{{ php_add_field_properties */
static void php_add_field_properties(zval *value, const MYSQL_FIELD *field
TSRMLS_DC)
{
- add_property_string(value, name,(field-name ? field-name : ), 1);
- add_property_string(value, orgname,(field-org_name ? field-org_name :
), 1);
- add_property_string(value, table,(field-table ? field-table : ),
1);
- add_property_string(value, orgtable,(field-org_table ? field-org_table :
), 1);
- add_property_string(value, def,(field-def ? field-def : ), 1);
+ add_property_string(value, name, (char *) (field-name ? field-name :
), 1);
+ add_property_string(value, orgname, (char *) (field-org_name ? field-org_name
: ), 1);
+ add_property_string(value, table, (char *) (field-table ? field-table :
), 1);
+ add_property_string(value, orgtable, (char *) (field-org_table ?
field-org_table : ), 1);
+ add_property_string(value, def, (field-def ? field-def : ), 1);
add_property_long(value, max_length, field-max_length);
add_property_long(value, length, field-length);
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c 2010-10-05
09:20:03 UTC (rev 304069)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_prop.c 2010-10-05
09:40:36 UTC (rev 304070)
@@ -84,7 +84,7 @@
} else {\
l = (__ret_type)__int_func(p);\
if (l LONG_MAX) {\
- ZVAL_LONG(*retval, l);\
+ ZVAL_LONG(*retval, (long) l);\
} else { \
char *ret; \
int ret_len = spprintf(ret, 0, __ret_type_sprint_mod,
l); \
@@ -178,7 +178,7 @@
}
if (rc LONG_MAX) {
- ZVAL_LONG(*retval, rc);
+ ZVAL_LONG(*retval, (long) rc);
} else {
char *ret;
int l = spprintf(ret, 0, MYSQLI_LLU_SPEC, rc);
@@ -295,7 +295,7 @@
}
if (rc LONG_MAX) {
- ZVAL_LONG(*retval, rc);
+ ZVAL_LONG(*retval, (long) rc);
} else {
char *ret;
int l = spprintf(ret, 0, MYSQLI_LLU_SPEC, rc);
Modified: php/php-src/trunk/ext/mysqli/mysqli.c
===
--- php/php-src/trunk/ext/mysqli/mysqli.c 2010-10-05 09:20:03 UTC (rev
304069)
+++ php/php-src/trunk/ext/mysqli/mysqli.c 2010-10-05 09:40:36 UTC (rev
304070)
@@ -1087,12 +1087,12 @@
*/
void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result,
long fetchtype TSRMLS_DC)
{
+#if !defined(MYSQLI_USE_MYSQLND)
MYSQL_ROW row;
unsigned inti;
MYSQL_FIELD *fields;
unsigned long *field_len;
-
-#if !defined(MYSQLI_USE_MYSQLND)
+
if (!(row = mysql_fetch_row(result))) {
RETURN_NULL();
}
Modified: php/php-src/trunk/ext/mysqli/mysqli_prop.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_prop.c 2010-10-05 09:20:03 UTC (rev
304069)
+++ php/php-src/trunk/ext/mysqli/mysqli_prop.c 2010-10-05 09:40:36 UTC (rev
304070)
@@ -84,7 +84,7 @@
} else {\
l = (__ret_type)__int_func(p);\
if (l LONG_MAX) {\
-
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/assert/assert02.phpt trunk/ext/standard/tests/assert/assert02.phpt
patrickallaert Tue, 05 Oct 2010 10:42:13 + Revision: http://svn.php.net/viewvc?view=revisionrevision=304076 Log: Fixed typo in tests (thx Eyal) Changed paths: U php/php-src/branches/PHP_5_3/ext/standard/tests/assert/assert02.phpt U php/php-src/trunk/ext/standard/tests/assert/assert02.phpt Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/assert/assert02.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/assert/assert02.phpt 2010-10-05 10:30:00 UTC (rev 304075) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/assert/assert02.phpt 2010-10-05 10:42:13 UTC (rev 304076) @@ -4,7 +4,7 @@ assert.active=1 assert.warning=1 assert.callback= -assert.bbail=0 +assert.bail=0 assert.quiet_eval=0 --FILE-- ?php Modified: php/php-src/trunk/ext/standard/tests/assert/assert02.phpt === --- php/php-src/trunk/ext/standard/tests/assert/assert02.phpt 2010-10-05 10:30:00 UTC (rev 304075) +++ php/php-src/trunk/ext/standard/tests/assert/assert02.phpt 2010-10-05 10:42:13 UTC (rev 304076) @@ -4,7 +4,7 @@ assert.active=1 assert.warning=1 assert.callback= -assert.bbail=0 +assert.bail=0 assert.quiet_eval=0 --FILE-- ?php -- 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/mysqlnd/mysqlnd_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
andrey Tue, 05 Oct 2010 11:08:21 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304081
Log:
add some safe casts
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2010-10-05 11:02:10 UTC (rev 304080)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
2010-10-05 11:08:21 UTC (rev 304081)
@@ -1392,7 +1392,7 @@
#else
_atoi64((char *) p);
#endif
- ZVAL_LONG(*current_field, v);
+ ZVAL_LONG(*current_field, (long) v); /*
the cast is safe */
} else {
uint64_t v =
#ifndef PHP_WIN32
@@ -1414,7 +1414,7 @@
{
ZVAL_STRINGL(*current_field,
(char *)p, len, 0);
} else {
- ZVAL_LONG(*current_field,
(int64_t)v);
+ ZVAL_LONG(*current_field,
(long) v); /* the cast is safe */
}
}
*(p + len) = save;
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2010-10-05
11:02:10 UTC (rev 304080)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c2010-10-05
11:08:21 UTC (rev 304081)
@@ -1392,7 +1392,7 @@
#else
_atoi64((char *) p);
#endif
- ZVAL_LONG(*current_field, v);
+ ZVAL_LONG(*current_field, (long) v); /*
the cast is safe */
} else {
uint64_t v =
#ifndef PHP_WIN32
@@ -1414,7 +1414,7 @@
{
ZVAL_STRINGL(*current_field,
(char *)p, len, 0);
} else {
- ZVAL_LONG(*current_field,
(int64_t)v);
+ ZVAL_LONG(*current_field,
(long) v); /* the cast is safe */
}
}
*(p + len) = save;
--
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_2/NEWS branches/PHP_5_2/ext/soap/php_http.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/soap/php_http.c trunk/ext/soap/php_http.c
dmitry Tue, 05 Oct 2010 11:43:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304084
Log:
Fixed bug #44248 (RFC2616 transgression while HTTPS request through proxy with
SoapClient object).
Bug: http://bugs.php.net/44248 (Assigned) RFC2616 transgression while HTTPS
request through proxy with SoapClient object
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/soap/php_http.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/soap/php_http.c
U php/php-src/trunk/ext/soap/php_http.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===
--- php/php-src/branches/PHP_5_2/NEWS 2010-10-05 11:28:56 UTC (rev 304083)
+++ php/php-src/branches/PHP_5_2/NEWS 2010-10-05 11:43:59 UTC (rev 304084)
@@ -16,6 +16,8 @@
(Sriram Natarajan)
- Fixed bug #52390 (mysqli_report() should be per-request setting). (Kalle)
- Fixed bug #51008 (Zend/tests/bug45877.phpt fails). (Dmitry)
+- Fixed bug #44248 (RFC2616 transgression while HTTPS request through proxy
+ with SoapClient object). (Dmitry)
22 Jul 2010, PHP 5.2.14
- Reverted bug fix #49521 (PDO fetchObject sets values before calling
Modified: php/php-src/branches/PHP_5_2/ext/soap/php_http.c
===
--- php/php-src/branches/PHP_5_2/ext/soap/php_http.c2010-10-05 11:28:56 UTC
(rev 304083)
+++ php/php-src/branches/PHP_5_2/ext/soap/php_http.c2010-10-05 11:43:59 UTC
(rev 304084)
@@ -167,6 +167,13 @@
smart_str_appendc(soap_headers, ':');
smart_str_append_unsigned(soap_headers, phpurl-port);
smart_str_append_const(soap_headers, HTTP/1.1\r\n);
+ smart_str_append_const(soap_headers, Host: );
+ smart_str_appends(soap_headers, phpurl-host);
+ if (phpurl-port != 80) {
+ smart_str_appendc(soap_headers, ':');
+ smart_str_append_unsigned(soap_headers, phpurl-port);
+ }
+ smart_str_append_const(soap_headers, \r\n);
proxy_authentication(this_ptr, soap_headers TSRMLS_CC);
smart_str_append_const(soap_headers, \r\n);
if (php_stream_write(stream, soap_headers.c, soap_headers.len)
!= soap_headers.len) {
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2010-10-05 11:28:56 UTC (rev 304083)
+++ php/php-src/branches/PHP_5_3/NEWS 2010-10-05 11:43:59 UTC (rev 304084)
@@ -121,6 +121,8 @@
- Fixed bug #48831 (php -i has different output to php --ini). (Richard,
Pierre)
- Fixed bug #45921 (Can't initialize character set hebrew). (Andrey)
+- Fixed bug #44248 (RFC2616 transgression while HTTPS request through proxy
+ with SoapClient object). (Dmitry)
22 Jul 2010, PHP 5.3.3
- Upgraded bundled sqlite to version 3.6.23.1. (Ilia)
Modified: php/php-src/branches/PHP_5_3/ext/soap/php_http.c
===
--- php/php-src/branches/PHP_5_3/ext/soap/php_http.c2010-10-05 11:28:56 UTC
(rev 304083)
+++ php/php-src/branches/PHP_5_3/ext/soap/php_http.c2010-10-05 11:43:59 UTC
(rev 304084)
@@ -137,6 +137,13 @@
smart_str_appendc(soap_headers, ':');
smart_str_append_unsigned(soap_headers, phpurl-port);
smart_str_append_const(soap_headers, HTTP/1.1\r\n);
+ smart_str_append_const(soap_headers, Host: );
+ smart_str_appends(soap_headers, phpurl-host);
+ if (phpurl-port != 80) {
+ smart_str_appendc(soap_headers, ':');
+ smart_str_append_unsigned(soap_headers, phpurl-port);
+ }
+ smart_str_append_const(soap_headers, \r\n);
proxy_authentication(this_ptr, soap_headers TSRMLS_CC);
smart_str_append_const(soap_headers, \r\n);
if (php_stream_write(stream, soap_headers.c, soap_headers.len)
!= soap_headers.len) {
Modified: php/php-src/trunk/ext/soap/php_http.c
===
--- php/php-src/trunk/ext/soap/php_http.c 2010-10-05 11:28:56 UTC (rev
304083)
+++ php/php-src/trunk/ext/soap/php_http.c 2010-10-05 11:43:59 UTC (rev
304084)
@@ -137,6 +137,13 @@
smart_str_appendc(soap_headers, ':');
smart_str_append_unsigned(soap_headers, phpurl-port);
smart_str_append_const(soap_headers, HTTP/1.1\r\n);
+ smart_str_append_const(soap_headers, Host: );
+ smart_str_appends(soap_headers, phpurl-host);
+ if (phpurl-port != 80) {
+ smart_str_appendc(soap_headers, ':');
+
[PHP-CVS] svn: /php/php-src/trunk/ext/gd/libgd/ gd_webp.c
iliaaTue, 05 Oct 2010 12:27:00 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304085
Log:
Removed debug code
Changed paths:
U php/php-src/trunk/ext/gd/libgd/gd_webp.c
Modified: php/php-src/trunk/ext/gd/libgd/gd_webp.c
===
--- php/php-src/trunk/ext/gd/libgd/gd_webp.c2010-10-05 11:43:59 UTC (rev
304084)
+++ php/php-src/trunk/ext/gd/libgd/gd_webp.c2010-10-05 12:27:00 UTC (rev
304085)
@@ -71,7 +71,6 @@
do {
n = gdGetBuf(dummy, 1024, infile);
- printf(%i\n, n);
size += n;
} while (n != EOF);
--
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/mysqli/mysqli_driver.c trunk/ext/mysqli/mysqli_driver.c
uw Tue, 05 Oct 2010 12:42:53 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304086
Log:
Greetings from SunCC.
ext/mysqli/mysqli_driver.c, line 127|128|129: warning: syntax error: empty
declaration
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_driver.c
U php/php-src/trunk/ext/mysqli/mysqli_driver.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_driver.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_driver.c 2010-10-05
12:27:00 UTC (rev 304085)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_driver.c 2010-10-05
12:42:53 UTC (rev 304086)
@@ -124,9 +124,9 @@
}
/* }}} */
-MAP_PROPERTY_MYG_BOOL_READ(driver_reconnect_read, reconnect);
-MAP_PROPERTY_MYG_BOOL_WRITE(driver_reconnect_write, reconnect);
-MAP_PROPERTY_MYG_LONG_READ(driver_report_read, report_mode);
+MAP_PROPERTY_MYG_BOOL_READ(driver_reconnect_read, reconnect)
+MAP_PROPERTY_MYG_BOOL_WRITE(driver_reconnect_write, reconnect)
+MAP_PROPERTY_MYG_LONG_READ(driver_report_read, report_mode)
ZEND_FUNCTION(mysqli_driver_construct)
{
Modified: php/php-src/trunk/ext/mysqli/mysqli_driver.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_driver.c2010-10-05 12:27:00 UTC
(rev 304085)
+++ php/php-src/trunk/ext/mysqli/mysqli_driver.c2010-10-05 12:42:53 UTC
(rev 304086)
@@ -124,9 +124,9 @@
}
/* }}} */
-MAP_PROPERTY_MYG_BOOL_READ(driver_reconnect_read, reconnect);
-MAP_PROPERTY_MYG_BOOL_WRITE(driver_reconnect_write, reconnect);
-MAP_PROPERTY_MYG_LONG_READ(driver_report_read, report_mode);
+MAP_PROPERTY_MYG_BOOL_READ(driver_reconnect_read, reconnect)
+MAP_PROPERTY_MYG_BOOL_WRITE(driver_reconnect_write, reconnect)
+MAP_PROPERTY_MYG_LONG_READ(driver_report_read, report_mode)
ZEND_FUNCTION(mysqli_driver_construct)
{
--
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/NEWS branches/PHP_5_3/configure.in trunk/configure.in
tony2001 Tue, 05 Oct 2010 13:43:35 + Revision: http://svn.php.net/viewvc?view=revisionrevision=304088 Log: fix bug #50345 (nanosleep not detected properly on some solaris versions) Bug: http://bugs.php.net/50345 (Re-Opened) nanosleep not detected properly on some solaris versions Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/configure.in U php/php-src/trunk/configure.in Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2010-10-05 13:40:14 UTC (rev 304087) +++ php/php-src/branches/PHP_5_3/NEWS 2010-10-05 13:43:35 UTC (rev 304088) @@ -117,6 +117,8 @@ both IPv4 and IPv6 addresses, on Windows). (Gustavo, Pierre) - Fixed bug #50524 (proc_open on Windows does not respect cwd as it does on other platforms). (Pierre) +- Fixed bug #50345 (nanosleep not detected properly on some solaris versions). + (Ulf, Tony) - Fixed bug #49215 (make fails on glob_wrapper). (Felipe) - Fixed bug #48831 (php -i has different output to php --ini). (Richard, Pierre) Modified: php/php-src/branches/PHP_5_3/configure.in === --- php/php-src/branches/PHP_5_3/configure.in 2010-10-05 13:40:14 UTC (rev 304087) +++ php/php-src/branches/PHP_5_3/configure.in 2010-10-05 13:43:35 UTC (rev 304088) @@ -611,7 +611,7 @@ ) dnl Some systems (like OpenSolaris) do not have nanosleep in libc -PHP_CHECK_FUNC(nanosleep, rt) +PHP_CHECK_FUNC_LIB(nanosleep, rt) dnl Check for getaddrinfo, should be a better way, but... dnl Also check for working getaddrinfo Modified: php/php-src/trunk/configure.in === --- php/php-src/trunk/configure.in 2010-10-05 13:40:14 UTC (rev 304087) +++ php/php-src/trunk/configure.in 2010-10-05 13:43:35 UTC (rev 304088) @@ -611,7 +611,7 @@ ) dnl Some systems (like OpenSolaris) do not have nanosleep in libc -PHP_CHECK_FUNC(nanosleep, rt) +PHP_CHECK_FUNC_LIB(nanosleep, rt) dnl Check for getaddrinfo, should be a better way, but... dnl Also check for working getaddrinfo -- 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/mysqlnd/mysqlnd_enum_n_def.h trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
andrey Tue, 05 Oct 2010 14:56:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304104
Log:
remove trailing commas in enums
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
2010-10-05 14:41:08 UTC (rev 304103)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_enum_n_def.h
2010-10-05 14:56:49 UTC (rev 304104)
@@ -100,21 +100,21 @@
typedef enum mysqlnd_extension
{
MYSQLND_MYSQL = 0,
- MYSQLND_MYSQLI,
+ MYSQLND_MYSQLI
} enum_mysqlnd_extension;
enum
{
MYSQLND_FETCH_ASSOC = 1,
MYSQLND_FETCH_NUM = 2,
- MYSQLND_FETCH_BOTH = 1|2,
+ MYSQLND_FETCH_BOTH = 1|2
};
/* Follow libmysql convention */
typedef enum func_status
{
PASS = 0,
- FAIL = 1,
+ FAIL = 1
} enum_func_status;
typedef enum mysqlnd_query_type
@@ -296,7 +296,7 @@
CONN_SENDING_LOAD_DATA,
CONN_FETCHING_DATA,
CONN_NEXT_RESULT_PENDING,
- CONN_QUIT_SENT, /* object is destroyed at this stage */
+ CONN_QUIT_SENT /* object is destroyed at this stage */
} enum_mysqlnd_connection_state;
@@ -307,7 +307,7 @@
MYSQLND_STMT_EXECUTED,
MYSQLND_STMT_WAITING_USE_OR_STORE,
MYSQLND_STMT_USE_OR_STORE_CALLED,
- MYSQLND_STMT_USER_FETCHING, /* fetch_row_buff or fetch_row_unbuf */
+ MYSQLND_STMT_USER_FETCHING /* fetch_row_buff or fetch_row_unbuf */
} enum_mysqlnd_stmt_state;
@@ -520,7 +520,7 @@
PROT_STATS_PACKET,
PROT_PREPARE_RESP_PACKET,
PROT_CHG_USER_RESP_PACKET,
- PROT_LAST, /* should always be last */
+ PROT_LAST /* should always be last */
};
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h 2010-10-05 14:41:08 UTC
(rev 304103)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_enum_n_def.h 2010-10-05 14:56:49 UTC
(rev 304104)
@@ -100,21 +100,21 @@
typedef enum mysqlnd_extension
{
MYSQLND_MYSQL = 0,
- MYSQLND_MYSQLI,
+ MYSQLND_MYSQLI
} enum_mysqlnd_extension;
enum
{
MYSQLND_FETCH_ASSOC = 1,
MYSQLND_FETCH_NUM = 2,
- MYSQLND_FETCH_BOTH = 1|2,
+ MYSQLND_FETCH_BOTH = 1|2
};
/* Follow libmysql convention */
typedef enum func_status
{
PASS = 0,
- FAIL = 1,
+ FAIL = 1
} enum_func_status;
typedef enum mysqlnd_query_type
@@ -296,7 +296,7 @@
CONN_SENDING_LOAD_DATA,
CONN_FETCHING_DATA,
CONN_NEXT_RESULT_PENDING,
- CONN_QUIT_SENT, /* object is destroyed at this stage */
+ CONN_QUIT_SENT /* object is destroyed at this stage */
} enum_mysqlnd_connection_state;
@@ -307,7 +307,7 @@
MYSQLND_STMT_EXECUTED,
MYSQLND_STMT_WAITING_USE_OR_STORE,
MYSQLND_STMT_USE_OR_STORE_CALLED,
- MYSQLND_STMT_USER_FETCHING, /* fetch_row_buff or fetch_row_unbuf */
+ MYSQLND_STMT_USER_FETCHING /* fetch_row_buff or fetch_row_unbuf */
} enum_mysqlnd_stmt_state;
@@ -520,7 +520,7 @@
PROT_STATS_PACKET,
PROT_PREPARE_RESP_PACKET,
PROT_CHG_USER_RESP_PACKET,
- PROT_LAST, /* should always be last */
+ PROT_LAST /* should always be last */
};
--
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/mysqlnd/mysqlnd.c branches/PHP_5_3/ext/mysqlnd/mysqlnd.h branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/
andrey Tue, 05 Oct 2010 16:27:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304112
Log:
rename parameter, should not conflict with global symbol -
the socket function
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-10-05 16:26:18 UTC (rev 304111)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-10-05 16:27:49 UTC (rev 304112)
@@ -549,7 +549,7 @@
const char *passwd, unsigned int passwd_len,
const char *db, unsigned int db_len,
unsigned int port,
- const char *socket,
+ const char * socket_or_pipe,
unsigned int mysql_flags
TSRMLS_DC)
{
@@ -617,11 +617,11 @@
int transport_len;
#ifndef PHP_WIN32
if (host_len == sizeof(localhost) - 1 !strncasecmp(host, localhost, host_len)) {
- DBG_INF_FMT(socket=%s, socket? socket:n/a);
- if (!socket) {
-socket = /tmp/mysql.sock;
+ DBG_INF_FMT(socket=%s, socket_or_pipe? socket_or_pipe:n/a);
+ if (!socket_or_pipe) {
+socket_or_pipe = /tmp/mysql.sock;
}
- transport_len = spprintf(transport, 0, unix://%s, socket);
+ transport_len = spprintf(transport, 0, unix://%s, socket_or_pipe);
unix_socket = TRUE;
} else
#endif
@@ -764,7 +764,7 @@
}
}
} else {
- conn-unix_socket = mnd_pestrdup(socket, conn-persistent);
+ conn-unix_socket = mnd_pestrdup(socket_or_pipe, conn-persistent);
conn-host_info = mnd_pestrdup(Localhost via UNIX socket, conn-persistent);
if (!conn-unix_socket || !conn-host_info) {
SET_OOM_ERROR(conn-error_info);
@@ -850,7 +850,7 @@
const char *passwd, unsigned int passwd_len,
const char *db, unsigned int db_len,
unsigned int port,
- const char *socket,
+ const char *socket_or_pipe,
unsigned int mysql_flags
TSRMLS_DC)
{
@@ -868,7 +868,7 @@
}
}
- ret = conn-m-connect(conn, host, user, passwd, passwd_len, db, db_len, port, socket, mysql_flags TSRMLS_CC);
+ ret = conn-m-connect(conn, host, user, passwd, passwd_len, db, db_len, port, socket_or_pipe, mysql_flags TSRMLS_CC);
if (ret == FAIL) {
if (self_alloced) {
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2010-10-05 16:26:18 UTC (rev 304111)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h 2010-10-05 16:27:49 UTC (rev 304112)
@@ -102,7 +102,7 @@
const char *passwd, unsigned int passwd_len,
const char *db, unsigned int db_len,
unsigned int port,
- const char *socket,
+ const char *socket_or_pipe,
unsigned int mysql_flags
TSRMLS_DC);
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2010-10-05 16:26:18 UTC (rev 304111)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h 2010-10-05 16:27:49 UTC (rev 304112)
@@ -337,7 +337,7 @@
typedef enum_func_status (*func_mysqlnd_conn__init)(MYSQLND * conn TSRMLS_DC);
-typedef enum_func_status (*func_mysqlnd_conn__connect)(MYSQLND *conn, const char *host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket, unsigned int mysql_flags TSRMLS_DC);
+typedef enum_func_status (*func_mysqlnd_conn__connect)(MYSQLND *conn, const char *host, const char * user, const char * passwd, unsigned int passwd_len, const char * db, unsigned int db_len, unsigned int port, const char * socket_or_pipe, unsigned int mysql_flags TSRMLS_DC);
typedef ulong(*func_mysqlnd_conn__escape_string)(const MYSQLND * const conn, char *newstr, const char *escapestr, size_t escapestr_len TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__set_charset)(MYSQLND * const conn, const char * const charset TSRMLS_DC);
typedef enum_func_status (*func_mysqlnd_conn__query)(MYSQLND *conn, const char *query, unsigned int query_len TSRMLS_DC);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-10-05 16:26:18 UTC (rev 304111)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-10-05 16:27:49 UTC (rev 304112)
@@ -547,7 +547,7 @@
const char *passwd, unsigned int passwd_len,
const char *db, unsigned int db_len,
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd_result.c
andrey Tue, 05 Oct 2010 16:54:14 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304113
Log:
Fix compiler warnings - on 32bit size_t is smaller than uint64_t, although
we will never hit this the compiler should be happy.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-05
16:27:49 UTC (rev 304112)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-05
16:54:14 UTC (rev 304113)
@@ -1147,7 +1147,7 @@
goto end;
}
if (free_rows) {
- set-row_buffers = mnd_pemalloc(free_rows *
sizeof(MYSQLND_MEMORY_POOL_CHUNK *), to_cache);
+ set-row_buffers = mnd_pemalloc((size_t)(free_rows *
sizeof(MYSQLND_MEMORY_POOL_CHUNK *)), to_cache);
if (!set-row_buffers) {
SET_OOM_ERROR(conn-error_info);
ret = FAIL;
@@ -1181,8 +1181,15 @@
uint64_t total_allocated_rows = free_rows = next_extend
= next_extend * 11 / 10; /* extend with 10% */
MYSQLND_MEMORY_POOL_CHUNK ** new_row_buffers;
total_allocated_rows += set-row_count;
+
+ /* don't try to allocate more than possible -
mnd_XXalloc expects size_t, and it can have narrower range than uint64_t */
+ if (total_allocated_rows *
sizeof(MYSQLND_MEMORY_POOL_CHUNK *) SIZE_MAX) {
+ SET_OOM_ERROR(conn-error_info);
+ ret = FAIL;
+ goto end;
+ }
new_row_buffers = mnd_perealloc(set-row_buffers,
-
total_allocated_rows * sizeof(MYSQLND_MEMORY_POOL_CHUNK *),
+
(size_t)(total_allocated_rows * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)),
set-persistent);
if (!new_row_buffers) {
SET_OOM_ERROR(conn-error_info);
@@ -1209,8 +1216,14 @@
}
/* Overflow ? */
if (set-row_count) {
+ /* don't try to allocate more than possible - mnd_XXalloc
expects size_t, and it can have narrower range than uint64_t */
+ if (set-row_count * meta-field_count * sizeof(zval *)
SIZE_MAX) {
+ SET_OOM_ERROR(conn-error_info);
+ ret = FAIL;
+ goto end;
+ }
/* if pecalloc is used valgrind barks gcc version 4.3.1
20080507 (prerelease) [gcc-4_3-branch revision 135036] (SUSE Linux) */
- set-data = mnd_pemalloc(set-row_count * meta-field_count *
sizeof(zval *), to_cache);
+ set-data = mnd_pemalloc((size_t)(set-row_count *
meta-field_count * sizeof(zval *)), to_cache);
if (!set-data) {
SET_OOM_ERROR(conn-error_info);
ret = FAIL;
@@ -1231,8 +1244,14 @@
}
/* save some memory */
if (free_rows) {
+ /* don't try to allocate more than possible - mnd_XXalloc
expects size_t, and it can have narrower range than uint64_t */
+ if (set-row_count * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)
SIZE_MAX) {
+ SET_OOM_ERROR(conn-error_info);
+ ret = FAIL;
+ goto end;
+ }
set-row_buffers = mnd_perealloc(set-row_buffers,
-
set-row_count * sizeof(MYSQLND_MEMORY_POOL_CHUNK *),
+
(size_t) (set-row_count * sizeof(MYSQLND_MEMORY_POOL_CHUNK *)),
set-persistent);
}
@@ -1593,7 +1612,8 @@
DBG_VOID_RETURN;
}
- mysqlnd_array_init(return_value, (unsigned int) set? set-row_count :
4); /* 4 is a magic value */
+ /* 4 is a magic value. The cast is safe, if larger then the array will
be later extended - no big deal :) */
+ mysqlnd_array_init(return_value, (unsigned int) set? (uint)
set-row_count : 4);
do {
MAKE_STD_ZVAL(row);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-10-05 16:27:49 UTC
(rev
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd.c trunk/ext/mysqlnd/mysqlnd_result.c
andrey Tue, 05 Oct 2010 17:03:50 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304114
Log:
Rename a method so it doesn't clash with a global symbol - a function
Fix compiler waring by extening the type of a variable
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-10-05 16:54:14 UTC
(rev 304113)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c 2010-10-05 17:03:50 UTC
(rev 304114)
@@ -1368,14 +1368,14 @@
/* }}} */
-/* {{{ mysqlnd_conn::stat */
+/* {{{ mysqlnd_conn::statistic */
static enum_func_status
-MYSQLND_METHOD(mysqlnd_conn, stat)(MYSQLND * conn, char **message, unsigned
int * message_len TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, statistic)(MYSQLND * conn, char **message,
unsigned int * message_len TSRMLS_DC)
{
enum_func_status ret;
MYSQLND_PACKET_STATS * stats_header;
- DBG_ENTER(mysqlnd_conn::stat);
+ DBG_ENTER(mysqlnd_conn::statistic);
DBG_INF_FMT(conn=%llu, conn-thread_id);
ret = conn-m-simple_command(conn, COM_STATISTICS, NULL, 0, PROT_LAST,
FALSE, TRUE TSRMLS_CC);
@@ -1560,13 +1560,13 @@
STAT_CLOSE_IMPLICIT,
STAT_CLOSE_DISCONNECT
};
- enum_mysqlnd_collected_stats stat = close_type_to_stat_map[close_type];
+ enum_mysqlnd_collected_stats statistic =
close_type_to_stat_map[close_type];
DBG_ENTER(mysqlnd_conn::close);
DBG_INF_FMT(conn=%llu, conn-thread_id);
if (conn-state = CONN_READY) {
- MYSQLND_INC_CONN_STATISTIC(conn-stats, stat);
+ MYSQLND_INC_CONN_STATISTIC(conn-stats, statistic);
MYSQLND_DEC_CONN_STATISTIC(conn-stats,
STAT_OPENED_CONNECTIONS);
if (conn-persistent) {
MYSQLND_DEC_CONN_STATISTIC(conn-stats,
STAT_OPENED_PERSISTENT_CONNECTIONS);
@@ -2256,7 +2256,7 @@
MYSQLND_METHOD(mysqlnd_conn, get_server_version),
MYSQLND_METHOD(mysqlnd_conn, get_server_info),
- MYSQLND_METHOD(mysqlnd_conn, stat),
+ MYSQLND_METHOD(mysqlnd_conn, statistic),
MYSQLND_METHOD(mysqlnd_conn, get_host_info),
MYSQLND_METHOD(mysqlnd_conn, get_proto_info),
MYSQLND_METHOD(mysqlnd_conn, info),
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-05
16:54:14 UTC (rev 304113)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-05
17:03:50 UTC (rev 304114)
@@ -194,7 +194,7 @@
{
MYSQLND_RES_BUFFERED *set = result-stored_data;
unsigned int field_count = result-field_count;
- int row;
+ int64_t row;
DBG_ENTER(mysqlnd_res::free_buffered_data);
DBG_INF_FMT(Freeing MYSQLND_LLU_SPEC row(s), set-row_count);
@@ -211,7 +211,7 @@
int col;
if (current_row != NULL) {
- for (col = field_count - 1; col = 0; --col) {
+ for (col = (int64_t) field_count - 1; col = 0;
--col) {
if (current_row[col]) {
zend_bool copy_ctor_called;
mysqlnd_palloc_zval_ptr_dtor((current_row[col]), result-type,
copy_ctor_called TSRMLS_CC);
@@ -1229,7 +1229,7 @@
ret = FAIL;
goto end;
}
- memset(set-data, 0, set-row_count * meta-field_count *
sizeof(zval *));
+ memset(set-data, 0, (size_t)(set-row_count *
meta-field_count * sizeof(zval *)));
}
MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn-stats,
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-10-05 16:54:14 UTC (rev
304113)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c 2010-10-05 17:03:50 UTC (rev
304114)
@@ -1391,14 +1391,14 @@
/* }}} */
-/* {{{ mysqlnd_conn::stat */
+/* {{{ mysqlnd_conn::statistic */
static enum_func_status
-MYSQLND_METHOD(mysqlnd_conn, stat)(MYSQLND * conn, char **message, unsigned
int * message_len TSRMLS_DC)
+MYSQLND_METHOD(mysqlnd_conn, statistic)(MYSQLND * conn, char **message,
unsigned int * message_len TSRMLS_DC)
{
enum_func_status ret;
MYSQLND_PACKET_STATS * stats_header;
- DBG_ENTER(mysqlnd_conn::stat);
+ DBG_ENTER(mysqlnd_conn::statistic);
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c trunk/ext/mysqlnd/mysqlnd_result.c
andrey Tue, 05 Oct 2010 17:10:47 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304115
Log:
two more compiler warnings fixed - size does matter
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-05
17:03:50 UTC (rev 304114)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_result.c 2010-10-05
17:10:47 UTC (rev 304115)
@@ -42,7 +42,7 @@
zval **data_cursor = result-stored_data?
result-stored_data-data:NULL;
zval **data_begin = result-stored_data? result-stored_data-data:NULL;
unsigned int field_count = result-meta? result-meta-field_count : 0;
- unsigned int row_count = result-stored_data?
result-stored_data-row_count:0;
+ uint64_t row_count = result-stored_data?
result-stored_data-row_count:0;
enum_func_status ret = PASS;
DBG_ENTER(mysqlnd_res::initialize_result_set_rest);
@@ -208,10 +208,10 @@
for (row = set-row_count - 1; row = 0; row--) {
zval **current_row = set-data + row * field_count;
MYSQLND_MEMORY_POOL_CHUNK *current_buffer =
set-row_buffers[row];
- int col;
+ int64_t col;
if (current_row != NULL) {
- for (col = (int64_t) field_count - 1; col = 0;
--col) {
+ for (col = field_count - 1; col = 0; --col) {
if (current_row[col]) {
zend_bool copy_ctor_called;
mysqlnd_palloc_zval_ptr_dtor((current_row[col]), result-type,
copy_ctor_called TSRMLS_CC);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-10-05 17:03:50 UTC
(rev 304114)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_result.c 2010-10-05 17:10:47 UTC
(rev 304115)
@@ -42,7 +42,7 @@
zval **data_cursor = result-stored_data?
result-stored_data-data:NULL;
zval **data_begin = result-stored_data? result-stored_data-data:NULL;
unsigned int field_count = result-meta? result-meta-field_count : 0;
- unsigned int row_count = result-stored_data?
result-stored_data-row_count:0;
+ uint64_t row_count = result-stored_data?
result-stored_data-row_count:0;
enum_func_status ret = PASS;
DBG_ENTER(mysqlnd_res::initialize_result_set_rest);
@@ -208,10 +208,10 @@
for (row = set-row_count - 1; row = 0; row--) {
zval **current_row = set-data + row * field_count;
MYSQLND_MEMORY_POOL_CHUNK *current_buffer =
set-row_buffers[row];
- int col;
+ int64_t col;
if (current_row != NULL) {
- for (col = (int64_t) field_count - 1; col = 0;
--col) {
+ for (col = field_count - 1; col = 0; --col) {
if (current_row[col]) {
zend_bool copy_ctor_called;
mysqlnd_palloc_zval_ptr_dtor((current_row[col]), result-type,
copy_ctor_called TSRMLS_CC);
--
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/mysqlnd/mysqlnd_wireprotocol.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h trunk/ext/mysqlnd/mysqlnd_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_
andrey Tue, 05 Oct 2010 17:20:00 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=304116
Log:
rename parameter name - should not shadow the global symbol alloca
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-10-05 17:10:47 UTC (rev 304115)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-10-05 17:20:00 UTC (rev 304116)
@@ -391,14 +391,14 @@
/* {{{ php_mysqlnd_greet_free_mem */
static
-void php_mysqlnd_greet_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_greet_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
{
MYSQLND_PACKET_GREET *p= (MYSQLND_PACKET_GREET *) _packet;
if (p-server_version) {
efree(p-server_version);
p-server_version = NULL;
}
- if (!alloca) {
+ if (!stack_allocation) {
mnd_pefree(p, p-header.persistent);
}
}
@@ -508,9 +508,9 @@
/* {{{ php_mysqlnd_auth_free_mem */
static
-void php_mysqlnd_auth_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_auth_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
{
- if (!alloca) {
+ if (!stack_allocation) {
MYSQLND_PACKET_AUTH * p = (MYSQLND_PACKET_AUTH *) _packet;
mnd_pefree(p, p-header.persistent);
}
@@ -591,14 +591,14 @@
/* {{{ php_mysqlnd_ok_free_mem */
static void
-php_mysqlnd_ok_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+php_mysqlnd_ok_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
{
MYSQLND_PACKET_OK *p= (MYSQLND_PACKET_OK *) _packet;
if (p-message) {
mnd_efree(p-message);
p-message = NULL;
}
- if (!alloca) {
+ if (!stack_allocation) {
mnd_pefree(p, p-header.persistent);
}
}
@@ -674,9 +674,9 @@
/* {{{ php_mysqlnd_eof_free_mem */
static
-void php_mysqlnd_eof_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_eof_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
{
- if (!alloca) {
+ if (!stack_allocation) {
mnd_pefree(_packet, ((MYSQLND_PACKET_EOF *)_packet)-header.persistent);
}
}
@@ -748,9 +748,9 @@
/* {{{ php_mysqlnd_cmd_free_mem */
static
-void php_mysqlnd_cmd_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_cmd_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
{
- if (!alloca) {
+ if (!stack_allocation) {
MYSQLND_PACKET_COMMAND * p = (MYSQLND_PACKET_COMMAND *) _packet;
mnd_pefree(p, p-header.persistent);
}
@@ -864,7 +864,7 @@
/* {{{ php_mysqlnd_rset_header_free_mem */
static
-void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_rset_header_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
{
MYSQLND_PACKET_RSET_HEADER *p= (MYSQLND_PACKET_RSET_HEADER *) _packet;
DBG_ENTER(php_mysqlnd_rset_header_free_mem);
@@ -872,7 +872,7 @@
mnd_efree(p-info_or_local_file);
p-info_or_local_file = NULL;
}
- if (!alloca) {
+ if (!stack_allocation) {
mnd_pefree(p, p-header.persistent);
}
DBG_VOID_RETURN;
@@ -1091,11 +1091,11 @@
/* {{{ php_mysqlnd_rset_field_free_mem */
static
-void php_mysqlnd_rset_field_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void php_mysqlnd_rset_field_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
{
MYSQLND_PACKET_RES_FIELD *p= (MYSQLND_PACKET_RES_FIELD *) _packet;
/* p-metadata was passed to us as temporal buffer */
- if (!alloca) {
+ if (!stack_allocation) {
mnd_pefree(p, p-header.persistent);
}
}
@@ -1614,7 +1614,7 @@
/* {{{ php_mysqlnd_rowp_free_mem */
static void
-php_mysqlnd_rowp_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+php_mysqlnd_rowp_free_mem(void *_packet, zend_bool stack_allocation TSRMLS_DC)
{
MYSQLND_PACKET_ROW *p;
@@ -1624,7 +1624,7 @@
p-row_buffer-free_chunk(p-row_buffer TSRMLS_CC);
p-row_buffer = NULL;
}
- DBG_INF_FMT(alloca=%u persistent=%u, (int)alloca, (int)p-header.persistent);
+ DBG_INF_FMT(stack_allocation=%u persistent=%u, (int)stack_allocation, (int)p-header.persistent);
/*
Don't free packet-fields :
- normal queries - store_result() | fetch_row_unbuffered() will transfer
@@ -1632,7 +1632,7 @@
- PS will pass in it the bound variables, we have to use them! and of course
not free the array. As it is passed to us, we should not clean it ourselves.
*/
- if (!alloca) {
+ if (!stack_allocation) {
mnd_pefree(p, p-header.persistent);
}
DBG_VOID_RETURN;
@@ -1664,14 +1664,14 @@
/* {{{ php_mysqlnd_stats_free_mem */
static
-void php_mysqlnd_stats_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
+void
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/LICENSE branches/PHP_5_3/LICENSE trunk/LICENSE
kalleTue, 05 Oct 2010 22:58:19 + Revision: http://svn.php.net/viewvc?view=revisionrevision=304124 Log: Update copyright year for the license Changed paths: U php/php-src/branches/PHP_5_2/LICENSE U php/php-src/branches/PHP_5_3/LICENSE U php/php-src/trunk/LICENSE Modified: php/php-src/branches/PHP_5_2/LICENSE === --- php/php-src/branches/PHP_5_2/LICENSE2010-10-05 19:36:38 UTC (rev 304123) +++ php/php-src/branches/PHP_5_2/LICENSE2010-10-05 22:58:19 UTC (rev 304124) @@ -1,6 +1,6 @@ The PHP License, version 3.01 -Copyright (c) 1999 - 2006 The PHP Group. All rights reserved. +Copyright (c) 1999 - 2010 The PHP Group. All rights reserved. Redistribution and use in source and binary forms, with or without Modified: php/php-src/branches/PHP_5_3/LICENSE === --- php/php-src/branches/PHP_5_3/LICENSE2010-10-05 19:36:38 UTC (rev 304123) +++ php/php-src/branches/PHP_5_3/LICENSE2010-10-05 22:58:19 UTC (rev 304124) @@ -1,6 +1,6 @@ The PHP License, version 3.01 -Copyright (c) 1999 - 2009 The PHP Group. All rights reserved. +Copyright (c) 1999 - 2010 The PHP Group. All rights reserved. Redistribution and use in source and binary forms, with or without Modified: php/php-src/trunk/LICENSE === --- php/php-src/trunk/LICENSE 2010-10-05 19:36:38 UTC (rev 304123) +++ php/php-src/trunk/LICENSE 2010-10-05 22:58:19 UTC (rev 304124) @@ -1,6 +1,6 @@ The PHP License, version 3.01 -Copyright (c) 1999 - 2009 The PHP Group. All rights reserved. +Copyright (c) 1999 - 2010 The PHP Group. All rights reserved. Redistribution and use in source and binary forms, with or without -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
