php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-04 22:52:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

Browse Source
This commit is contained in:
Xinchen Hui
2013-04-20 15:24:18 +08:00
parent 6ed16753c1 c7cf9b68b6
commit 63d3ef4df0
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/mysqlnd/mysqlnd_enum_n_def.h
View File

@@ -43,7 +43,7 @@
#define MYSQLND_SQLSTATE_LENGTH 5
#define MYSQLND_SQLSTATE_NULL "00000"
#define MYSQLND_MAX_ALLOWED_USER_LEN 256 /* 64 char * 4byte . MySQL supports now only 16 char, but let it be forward compatible */
#define MYSQLND_MAX_ALLOWED_USER_LEN 252 /* 63 char * 4byte . MySQL supports now only 16 char, but let it be forward compatible */
#define MYSQLND_MAX_ALLOWED_DB_LEN 1024 /* 256 char * 4byte. MySQL supports now only 64 char in the tables, but on the FS could be different. Forward compatible. */
#define MYSQLND_NET_CMD_BUFFER_MIN_SIZE 4096

13
ext/opcache/zend_accelerator_util_funcs.c
View File

@@ -120,10 +120,17 @@ void zend_accel_free_user_functions(HashTable *ht TSRMLS_DC)
ht->pDestructor = orig_dtor;
}
static int move_user_function(zend_function *function TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
static int move_user_function(zend_function *function
#if ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO
TSRMLS_DC
#endif
, int num_args, va_list args, zend_hash_key *hash_key)
{
HashTable *function_table = va_arg(args, HashTable *);
(void)num_args; /* keep the compiler happy */
#if ZEND_EXTENSION_API_NO < PHP_5_3_X_API_NO
TSRMLS_FETCH();
#endif
if (function->type == ZEND_USER_FUNCTION) {
zend_hash_quick_update(function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, function, sizeof(zend_function), NULL);
@@ -138,7 +145,11 @@ void zend_accel_move_user_functions(HashTable *src, HashTable *dst TSRMLS_DC)
dtor_func_t orig_dtor = src->pDestructor;
src->pDestructor = NULL;
#if ZEND_EXTENSION_API_NO < PHP_5_3_X_API_NO
zend_hash_apply_with_arguments(src, (apply_func_args_t)move_user_function, 1, dst);
#else
zend_hash_apply_with_arguments(src TSRMLS_CC, (apply_func_args_t)move_user_function, 1, dst);
#endif
src->pDestructor = orig_dtor;
}