[Pcre-svn] [1025] code/trunk: Apply user patch to allow PCR…

Startseite
Nachricht löschen
Autor: Subversion repository
Datum:  
To: pcre-svn
Betreff: [Pcre-svn] [1025] code/trunk: Apply user patch to allow PCRE_NO_UTF8_CHECK in pcrecpp. cc.
Revision: 1025
          http://vcs.pcre.org/viewvc?view=rev&revision=1025
Author:   ph10
Date:     2012-08-29 12:24:23 +0100 (Wed, 29 Aug 2012)


Log Message:
-----------
Apply user patch to allow PCRE_NO_UTF8_CHECK in pcrecpp.cc.

Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/pcrecpp.cc


Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2012-08-29 11:08:24 UTC (rev 1024)
+++ code/trunk/ChangeLog    2012-08-29 11:24:23 UTC (rev 1025)
@@ -61,6 +61,9 @@
 13. In the POSIX wrapper regcomp() function, setting re_nsub field in the preg 
     structure could go wrong in environments where size_t is not the same size 
     as int.
+    
+14. Applied user-supplied patch to pcrecpp.cc to allow PCRE_NO_UTF8_CHECK to be 
+    set.





Modified: code/trunk/pcrecpp.cc
===================================================================
--- code/trunk/pcrecpp.cc    2012-08-29 11:08:24 UTC (rev 1024)
+++ code/trunk/pcrecpp.cc    2012-08-29 11:24:23 UTC (rev 1025)
@@ -521,7 +521,10 @@
     extra.match_limit_recursion = options_.match_limit_recursion();
   }


-  int options = 0;
+  // int options = 0;
+  // Changed by PH as a result of bugzilla #1288 
+  int options = (options_.all_options() & PCRE_NO_UTF8_CHECK);
+   
   if (anchor != UNANCHORED)
     options |= PCRE_ANCHORED;
   if (!empty_ok)