Index: main.c
===================================================================
RCS file: /repository/php-src/main/main.c,v
retrieving revision 1.614
diff -u -r1.614 main.c
--- main.c	18 Oct 2004 10:26:45 -0000	1.614
+++ main.c	7 Nov 2004 10:55:32 -0000
@@ -535,11 +535,11 @@
 	php_error(type, "%s", message);
 	efree(message);
 
-	if (PG(track_errors) && module_initialized && EG(active_symbol_table)) {
+	if (PG(track_errors) && module_initialized && &EG(symbol_table)) {
 		zval *tmp;
 		ALLOC_INIT_ZVAL(tmp);
 		ZVAL_STRINGL(tmp, buffer, buffer_len, 1);
-		zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) &tmp, sizeof(pval *), NULL);
+		zend_hash_update(&EG(symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) &tmp, sizeof(pval *), NULL);
 	}
 	efree(buffer);
 }
@@ -784,7 +784,7 @@
 		efree(buffer);
 		return;
 	}
-	if (PG(track_errors) && module_initialized && EG(active_symbol_table)) {
+	if (PG(track_errors) && module_initialized && &EG(symbol_table)) {
 		pval *tmp;
 
 		ALLOC_ZVAL(tmp);
@@ -792,7 +792,7 @@
 		Z_STRVAL_P(tmp) = (char *) estrndup(buffer, buffer_len);
 		Z_STRLEN_P(tmp) = buffer_len;
 		Z_TYPE_P(tmp) = IS_STRING;
-		zend_hash_update(EG(active_symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL);
+		zend_hash_update(&EG(symbol_table), "php_errormsg", sizeof("php_errormsg"), (void **) & tmp, sizeof(pval *), NULL);
 	}
 	efree(buffer);
 }
@@ -1360,7 +1360,12 @@
 	PG(disable_classes) = NULL;
 
 #if HAVE_SETLOCALE
+	setlocale(LC_COLLATE, "");
 	setlocale(LC_CTYPE, "");
+	setlocale(LC_MESSAGES, "");
+	setlocale(LC_MONETARY, "");
+	setlocale(LC_TIME, "");
+	/* LC_NUMERIC is not set due to some issues with serialize/unserialize */
 #endif
 
 #if HAVE_TZSET