Browse Source

fix previous wrong change on is_autoglobal

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@862 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 9 years ago
parent
commit
fa14a446a1
  1. 21
      xcache.c

21
xcache.c

@ -2630,19 +2630,12 @@ static int xc_entry_init_key_var(xc_entry_hash_t *entry_hash, xc_entry_var_t *xc
{
xc_hash_value_t hv;
switch (Z_TYPE_P(name)) {
#ifdef IS_UNICODE
case IS_UNICODE:
#endif
case IS_STRING:
break;
default:
#ifdef IS_UNICODE
convert_to_unicode(name);
convert_to_unicode(name);
#else
convert_to_string(name);
convert_to_string(name);
#endif
}
#ifdef IS_UNICODE
xce->entry.name_type = name->type;
#endif
@ -3146,10 +3139,16 @@ PHP_FUNCTION(xcache_is_autoglobal)
{
zval *name;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &name) == FAILURE) {
return;
}
#ifdef IS_UNICODE
convert_to_unicode(name);
#else
convert_to_string(name);
#endif
RETURN_BOOL(zend_u_hash_exists(CG(auto_globals), UG(unicode), Z_STRVAL_P(name), Z_STRLEN_P(name) + 1));
}
/* }}} */

Loading…
Cancel
Save