Now ASCII strings use UTF8 variant of PCRE code.

diff --git a/njs/njs_regexp.c b/njs/njs_regexp.c
index a0a93969f90600103f4f5bd00697ce052607cbb0..614524375de3cb89703ae1cb194d3b92913f71e3 100644 (file)
--- a/njs/njs_regexp.c
+++ b/njs/njs_regexp.c
@@ -476,7 +476,7 @@ njs_regexp_prototype_test(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
 
     (void) njs_string_prop(&string, value);
 
-    n = (string.length != 0 && string.length != string.size);
+    n = (string.length != 0);
 
     pattern = args[0].data.u.regexp->pattern;
 
@@ -527,14 +527,17 @@ njs_regexp_prototype_exec(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
 
     (void) njs_string_prop(&string, value);
 
+    /* Byte string. */
     utf8 = 0;
     n = 0;
 
     if (string.length != 0) {
+        /* ASCII string. */
         utf8 = 1;
         n = 1;
 
         if (string.length != string.size) {
+            /* UTF-8 string. */
             utf8 = 2;
         }
     }

diff --git a/njs/njs_string.c b/njs/njs_string.c
index 195f1547d835b88760932e1d62aa9f669e990b06..b071a95d63026d380b5c541f18ab086ab27422c1 100644 (file)
--- a/njs/njs_string.c
+++ b/njs/njs_string.c
@@ -1450,7 +1450,7 @@ njs_string_prototype_search(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
 
         (void) njs_string_prop(&string, &args[0]);
 
-        n = (string.length != 0 && string.length != string.size);
+        n = (string.length != 0);
 
         if (nxt_regex_is_valid(&pattern->regex[n])) {
             ret = nxt_regex_match(&pattern->regex[n], string.start, string.size,
@@ -1696,11 +1696,11 @@ njs_string_prototype_split(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
         if (string.length != 0) {
             /* ASCII string. */
             utf8 = 1;
-            n = 1;
 
             if (string.length != string.size) {
                 /* UTF-8 string. */
                 utf8 = 2;
+                n = 1;
             }
         }