From 0e50b276d50f7286a33eb44c80da300ed8a2fdc0 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Thu, 21 Jun 2012 11:47:23 +0000 Subject: [PATCH] 2012-06-21 Juan Manuel Ramon * util/pandora_xml_stress.conf util/pandora_xml_stress.pl: Changed XML character codification of Pandora XML stress to UTF-8. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6651 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/util/pandora_xml_stress.conf | 4 ++-- pandora_server/util/pandora_xml_stress.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pandora_server/util/pandora_xml_stress.conf b/pandora_server/util/pandora_xml_stress.conf index 25a86134ec..e114356c5b 100644 --- a/pandora_server/util/pandora_xml_stress.conf +++ b/pandora_server/util/pandora_xml_stress.conf @@ -19,8 +19,8 @@ log_file pandora_xml_stress.log # XML version, by default 1.0. xml_version 1.0 -# XML encoding, by default ISO-8859-1. -encoding ISO-8859-1 +# XML encoding, by default UTF-8. +encoding UTF-8 # Operating system (shared by all agents), by default Linux. os_name Linux diff --git a/pandora_server/util/pandora_xml_stress.pl b/pandora_server/util/pandora_xml_stress.pl index 128d4cd06b..99528f219c 100755 --- a/pandora_server/util/pandora_xml_stress.pl +++ b/pandora_server/util/pandora_xml_stress.pl @@ -90,7 +90,7 @@ sub generate_xml_files ($$$$$$) { # Read agent configuration my $interval = get_conf_token ($conf, 'agent_interval', '300'); my $xml_version = get_conf_token ($conf, 'xml_version', '1.0'); - my $encoding = get_conf_token ($conf, 'encoding', 'ISO-8859-1'); + my $encoding = get_conf_token ($conf, 'encoding', 'UTF-8'); my $os_name = get_conf_token ($conf, 'os_name', 'Linux'); my $os_version = get_conf_token ($conf, 'os_version', '2.6'); my $temporal = get_conf_token ($conf, 'temporal', '/tmp');