Have to_xml() already encode its output, and switch to numeric entities

2 files changed, 7 insertions, 8 deletions

diff --git a/InternetSecure.pm b/InternetSecure.pm
index 0dd4d2a..dec9ee9 100755
--- a/InternetSecure.pm
+++ b/InternetSecure.pm
@@ -213,10 +213,11 @@ sub to_xml {
 	}
 
 	xml_out(\%data,
-		NoAttr => 1,
-		RootName => 'TranxRequest',
-		SuppressEmpty => undef,
-		XMLDecl => '<?xml version="1.0" encoding="utf-8" standalone="yes"?>',
+		NoAttr		=> 1,
+		NumericEscape	=> 2,
+		RootName	=> 'TranxRequest',
+		SuppressEmpty	=> undef,
+		XMLDecl		=> '<?xml version="1.0" encoding="utf-8" standalone="yes"?>',
 	);
 }
 
@@ -286,9 +287,7 @@ sub submit {
 				undef,
 				make_form(
 					xxxRequestMode => 'X',
-					xxxRequestData => Encode::encode_utf8(
-								$self->to_xml
-							  ),
+					xxxRequestData => $self->to_xml,
 				)
 			);
 
diff --git a/t/20emit.t b/t/20emit.t
index 8ce5c8a..e51f5e7 100755
--- a/t/20emit.t
+++ b/t/20emit.t
@@ -82,7 +82,7 @@ foreach (TRANSACTIONS) {
 	};
 
 	is_deeply(
-		xml_in(Encode::encode('utf8', $txn->to_xml)),
+		xml_in($txn->to_xml),
 		xml_in($data)
 	); 
 }