--- embedaddon/pcre/testdata/testoutput15	2012/10/09 09:19:18	1.1.1.3
+++ embedaddon/pcre/testdata/testoutput15	2013/07/22 08:25:57	1.1.1.4
@@ -84,47 +84,125 @@ Options: utf no_utf_check
 First char = \x{c3}
 Need char = 'x'
 
-/abc/8
-    ร]
-Error -10 (bad UTF-8 string) offset=0 reason=6
-    ร
+/badutf/8
+    \xdf
 Error -10 (bad UTF-8 string) offset=0 reason=1
-    รรร
-Error -10 (bad UTF-8 string) offset=0 reason=6
-    รรร\?
-No match
-    \xe1\x88 
+    \xef
+Error -10 (bad UTF-8 string) offset=0 reason=2
+    \xef\x80
 Error -10 (bad UTF-8 string) offset=0 reason=1
-    \P\xe1\x88 
+    \xf7
+Error -10 (bad UTF-8 string) offset=0 reason=3
+    \xf7\x80
+Error -10 (bad UTF-8 string) offset=0 reason=2
+    \xf7\x80\x80
 Error -10 (bad UTF-8 string) offset=0 reason=1
-    \P\P\xe1\x88 
+    \xfb
+Error -10 (bad UTF-8 string) offset=0 reason=4
+    \xfb\x80
+Error -10 (bad UTF-8 string) offset=0 reason=3
+    \xfb\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=2
+    \xfb\x80\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=1
+    \xfd
+Error -10 (bad UTF-8 string) offset=0 reason=5
+    \xfd\x80
+Error -10 (bad UTF-8 string) offset=0 reason=4
+    \xfd\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=3
+    \xfd\x80\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=2
+    \xfd\x80\x80\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=1
+    \xdf\x7f
+Error -10 (bad UTF-8 string) offset=0 reason=6
+    \xef\x7f\x80
+Error -10 (bad UTF-8 string) offset=0 reason=6
+    \xef\x80\x7f
+Error -10 (bad UTF-8 string) offset=0 reason=7
+    \xf7\x7f\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=6
+    \xf7\x80\x7f\x80
+Error -10 (bad UTF-8 string) offset=0 reason=7
+    \xf7\x80\x80\x7f
+Error -10 (bad UTF-8 string) offset=0 reason=8
+    \xfb\x7f\x80\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=6
+    \xfb\x80\x7f\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=7
+    \xfb\x80\x80\x7f\x80
+Error -10 (bad UTF-8 string) offset=0 reason=8
+    \xfb\x80\x80\x80\x7f
+Error -10 (bad UTF-8 string) offset=0 reason=9
+    \xfd\x7f\x80\x80\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=6
+    \xfd\x80\x7f\x80\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=7
+    \xfd\x80\x80\x7f\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=8
+    \xfd\x80\x80\x80\x7f\x80
+Error -10 (bad UTF-8 string) offset=0 reason=9
+    \xfd\x80\x80\x80\x80\x7f
+Error -10 (bad UTF-8 string) offset=0 reason=10
+    \xed\xa0\x80
+Error -10 (bad UTF-8 string) offset=0 reason=14
+    \xc0\x8f
+Error -10 (bad UTF-8 string) offset=0 reason=15
+    \xe0\x80\x8f
+Error -10 (bad UTF-8 string) offset=0 reason=16
+    \xf0\x80\x80\x8f
+Error -10 (bad UTF-8 string) offset=0 reason=17
+    \xf8\x80\x80\x80\x8f
+Error -10 (bad UTF-8 string) offset=0 reason=18
+    \xfc\x80\x80\x80\x80\x8f
+Error -10 (bad UTF-8 string) offset=0 reason=19
+    \x80
+Error -10 (bad UTF-8 string) offset=0 reason=20
+    \xfe
+Error -10 (bad UTF-8 string) offset=0 reason=21
+    \xff
+Error -10 (bad UTF-8 string) offset=0 reason=21
+
+/badutf/8
+    \xfb\x80\x80\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=11
+    \xfd\x80\x80\x80\x80\x80
+Error -10 (bad UTF-8 string) offset=0 reason=12
+    \xf7\xbf\xbf\xbf
+Error -10 (bad UTF-8 string) offset=0 reason=13
+
+/shortutf/8
+    \P\P\xdf
 Error -25 (short UTF-8 string) offset=0 reason=1
-    XX\xea
-Error -10 (bad UTF-8 string) offset=2 reason=2
-    \O0XX\xea
-Error -10 (bad UTF-8 string)
-    \O1XX\xea
-Error -10 (bad UTF-8 string)
-    \O2XX\xea
-Error -10 (bad UTF-8 string) offset=2 reason=2
-    XX\xf1
-Error -10 (bad UTF-8 string) offset=2 reason=3
-    XX\xf8  
-Error -10 (bad UTF-8 string) offset=2 reason=4
-    XX\xfc
-Error -10 (bad UTF-8 string) offset=2 reason=5
-    ZZ\xea\xaf\x20YY
-Error -10 (bad UTF-8 string) offset=2 reason=7
-    ZZ\xfd\xbf\xbf\x2f\xbf\xbfYY  
-Error -10 (bad UTF-8 string) offset=2 reason=8
-    ZZ\xfd\xbf\xbf\xbf\x2f\xbfYY  
-Error -10 (bad UTF-8 string) offset=2 reason=9
-    ZZ\xfd\xbf\xbf\xbf\xbf\x2fYY  
-Error -10 (bad UTF-8 string) offset=2 reason=10
-    ZZ\xffYY
-Error -10 (bad UTF-8 string) offset=2 reason=21
-    ZZ\xfeYY  
-Error -10 (bad UTF-8 string) offset=2 reason=21
+    \P\P\xef
+Error -25 (short UTF-8 string) offset=0 reason=2
+    \P\P\xef\x80
+Error -25 (short UTF-8 string) offset=0 reason=1
+    \P\P\xf7
+Error -25 (short UTF-8 string) offset=0 reason=3
+    \P\P\xf7\x80
+Error -25 (short UTF-8 string) offset=0 reason=2
+    \P\P\xf7\x80\x80
+Error -25 (short UTF-8 string) offset=0 reason=1
+    \P\P\xfb
+Error -25 (short UTF-8 string) offset=0 reason=4
+    \P\P\xfb\x80
+Error -25 (short UTF-8 string) offset=0 reason=3
+    \P\P\xfb\x80\x80
+Error -25 (short UTF-8 string) offset=0 reason=2
+    \P\P\xfb\x80\x80\x80
+Error -25 (short UTF-8 string) offset=0 reason=1
+    \P\P\xfd
+Error -25 (short UTF-8 string) offset=0 reason=5
+    \P\P\xfd\x80
+Error -25 (short UTF-8 string) offset=0 reason=4
+    \P\P\xfd\x80\x80
+Error -25 (short UTF-8 string) offset=0 reason=3
+    \P\P\xfd\x80\x80\x80
+Error -25 (short UTF-8 string) offset=0 reason=2
+    \P\P\xfd\x80\x80\x80\x80
+Error -25 (short UTF-8 string) offset=0 reason=1
 
 /anything/8
     \xc0\x80
@@ -560,7 +638,7 @@ Need char = \x{81}
 /[^\x{c4}]/DZ
 ------------------------------------------------------------------
         Bra
-        [^\xc4]
+        [^\x{c4}]
         Ket
         End
 ------------------------------------------------------------------
@@ -677,8 +755,6 @@ Failed: missing terminating ] for character class at o
 /-- This tests the stricter UTF-8 check according to RFC 3629. --/ 
     
 /X/8
-    \x{0}\x{d7ff}\x{e000}\x{10ffff}
-No match
     \x{d800}
 Error -10 (bad UTF-8 string) offset=0 reason=14
     \x{d800}\?
@@ -708,7 +784,7 @@ No match
   abcd\x{1234}pqr
  0: \x{1234}
 
-/(*CRLF)(*UTF8)(*BSR_UNICODE)a\Rb/I
+/(*CRLF)(*UTF)(*BSR_UNICODE)a\Rb/I
 Capturing subpattern count = 0
 Options: bsr_unicode utf
 Forced newline sequence: CRLF
@@ -1045,5 +1121,17 @@ Need char = \x{bf}
 ------------------------------------------------------------------
     \x{a0}\x20!
  0: \x{a0} !
+
+/A/8
+  \x{ff000041}
+** Character \x{ff000041} is greater than 0x7fffffff and so cannot be converted to UTF-8
+  \x{7f000041} 
+Error -10 (bad UTF-8 string) offset=0 reason=12
+
+/(*UTF8)abc/9
+Failed: setting UTF is disabled by the application at offset 0
+
+/abc/89
+Failed: setting UTF is disabled by the application at offset 0
 
 /-- End of testinput15 --/