--- embedaddon/php/Zend/zend_ini.c	2012/02/21 23:47:52	1.1
+++ embedaddon/php/Zend/zend_ini.c	2012/05/29 12:34:35	1.1.1.2
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ini.c,v 1.1 2012/02/21 23:47:52 misho Exp $ */
+/* $Id: zend_ini.c,v 1.1.1.2 2012/05/29 12:34:35 misho Exp $ */
 
 #include "zend.h"
 #include "zend_qsort.h"
@@ -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);