FS-3736 --resolve

NOTE: This patch might affect xml_cdr, so better check if the output is to your liking after this commit

diff --git a/conf/autoload_configs/xml_cdr.conf.xml b/conf/autoload_configs/xml_cdr.conf.xml
index 6f8ef0deb50c73820c53ec637dd9e27a9baeb678..ac9b1f94d30fdfebe55c3b32f8c1a89cfcc89562 100644 (file)
--- a/conf/autoload_configs/xml_cdr.conf.xml
+++ b/conf/autoload_configs/xml_cdr.conf.xml
@@ -27,7 +27,7 @@
     <!-- true or false if a leg files are prefixed "a_" -->
     <param name="prefix-a-leg" value="true"/>
 
-    <!-- encode the post data may be 'true' for url encoding, 'false' for no encoding or 'base64' for base64 encoding -->
+    <!-- encode the post data may be 'true' for url encoding, 'false' for no encoding, 'base64' for base64 encoding or 'textxml' for text/xml -->
     <param name="encode" value="true"/>
 
     <!-- optional: set to true to disable Expect: 100-continue lighttpd requires this setting --> 

diff --git a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
index 980598c16777fec83d6141d844578bb9c649f78e..06d474e0bf2ec4d3079552fc163fdabdd6384d57 100644 (file)
--- a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
+++ b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c
@@ -38,7 +38,7 @@
 #define ENCODING_NONE 0
 #define ENCODING_DEFAULT 1
 #define ENCODING_BASE64 2
-#define ENCODING_TEXTXML 2
+#define ENCODING_TEXTXML 3
 
 static struct {
        char *cred;