From 77f9c8e5adf2e11fbdf8d3a22ccd9ddf3aad7d6f Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Mon, 10 Mar 2014 22:20:26 +0000
Subject: [PATCH] Prepare WoodStox Xml10AllowAllEscapedChars setting
 implementation

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2251 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/com/ctc/wstx/sr/StreamScanner.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/java/com/ctc/wstx/sr/StreamScanner.java b/src/java/com/ctc/wstx/sr/StreamScanner.java
index 215cc530..df0f76c1 100644
--- a/src/java/com/ctc/wstx/sr/StreamScanner.java
+++ b/src/java/com/ctc/wstx/sr/StreamScanner.java
@@ -276,6 +276,12 @@ public abstract class StreamScanner
      */
     protected boolean mNormalizeLFs;
 
+    /**
+     * Flag that indicates whether all escaped chars are accepted in XML 1.0.
+     */
+    protected boolean mXml10AllowAllEscapedChars = true;
+
+
     /*
     ///////////////////////////////////////////////////////////
     // Buffer(s) for local name(s) and text content
@@ -2383,11 +2389,13 @@ public abstract class StreamScanner
             if (value == 0) {
                 throwParseError("Invalid character reference: null character not allowed in XML content.");
             }
-            // XML 1.1 allows most other chars; 1.0 does not: However Exchange sends such chars with XML 1.0
-            //if (!mXml11 &&
-            //    (value != 0x9 && value != 0xA && value != 0xD)) {
-            //    reportIllegalChar(value);
-            //}
+            // XML 1.1 allows most other chars; 1.0 does not:
+            if (!mXml10AllowAllEscapedChars) {
+                if (!mXml11 &&
+                    (value != 0x9 && value != 0xA && value != 0xD)) {
+                    reportIllegalChar(value);
+                }
+            }
         }
     }