diff options
Diffstat (limited to 'Zend/zend_ini.c')
| -rw-r--r-- | Zend/zend_ini.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 62665d63c1..b8f65b7cf2 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -92,6 +92,7 @@ ZEND_API int zend_ini_startup(TSRMLS_D) /* {{{ */ EG(ini_directives) = registered_zend_ini_directives; EG(modified_ini_directives) = NULL; + EG(error_reporting_ini_entry) = NULL; if (zend_hash_init_ex(registered_zend_ini_directives, 100, NULL, NULL, 1, 0) == FAILURE) { return FAILURE; } @@ -133,6 +134,7 @@ ZEND_API int zend_copy_ini_directives(TSRMLS_D) /* {{{ */ zend_ini_entry ini_entry; EG(modified_ini_directives) = NULL; + EG(error_reporting_ini_entry) = NULL; EG(ini_directives) = (HashTable *) malloc(sizeof(HashTable)); if (zend_hash_init_ex(EG(ini_directives), registered_zend_ini_directives->nNumOfElements, NULL, NULL, 1, 0) == FAILURE) { return FAILURE; @@ -145,11 +147,11 @@ ZEND_API int zend_copy_ini_directives(TSRMLS_D) /* {{{ */ static int ini_key_compare(const void *a, const void *b TSRMLS_DC) /* {{{ */ { - Bucket *f; - Bucket *s; + const Bucket *f; + const Bucket *s; - f = *((Bucket **) a); - s = *((Bucket **) b); + f = *((const Bucket **) a); + s = *((const Bucket **) b); if (f->nKeyLength == 0 && s->nKeyLength == 0) { /* both numeric */ return ZEND_NORMALIZE_BOOL(f->nKeyLength - s->nKeyLength); |