Merge branch 'release/debian/6.9.5-1'debian/6.9.5-1

1 files changed, 52 insertions, 8 deletions

diff --git a/doc/API b/doc/API
index 43d5338..bb7b010 100644
--- a/doc/API
+++ b/doc/API
@@ -1,4 +1,4 @@
-Oniguruma API  Version 6.9.4  2019/09/30
+Oniguruma API  Version 6.9.5  2020/03/25
 
 #include <oniguruma.h>
 
@@ -273,6 +273,18 @@ Oniguruma API  Version 6.9.4  2019/09/30
   normal return: ONIG_NORMAL
 
 
+# int onig_set_retry_limit_in_search_of_match_param(OnigMatchParam* mp, unsigned long limit)
+
+  Set a retry limit count of a search process.
+  0 means unlimited.
+
+  arguments
+  1 mp: match-param pointer
+  2 limit: number of limit
+
+  normal return: ONIG_NORMAL
+
+
 # int onig_set_progress_callout_of_match_param(OnigMatchParam* mp, OnigCalloutFunc f)
 
   Set a function for callouts of contents in progress.
@@ -333,7 +345,7 @@ Oniguruma API  Version 6.9.4  2019/09/30
 
   arguments
   1-7:  same as onig_search()
-  8 mp: match parameter values (match_stack_limit, retry_limit_in_match)
+  8 mp: match parameter values (match_stack_limit, retry_limit_in_match, retry_limit_in_search)
 
 
 # int onig_match(regex_t* reg, const UChar* str, const UChar* end, const UChar* at,
@@ -368,7 +380,7 @@ Oniguruma API  Version 6.9.4  2019/09/30
 
    arguments
    1-6:  same as onig_match()
-   7 mp: match parameter values (match_stack_limit, retry_limit_in_match)
+   7 mp: match parameter values (match_stack_limit, retry_limit_in_match, retry_limit_in_search)
 
 
 # int onig_scan(regex_t* reg, const UChar* str, const UChar* end,
@@ -599,8 +611,8 @@ Oniguruma API  Version 6.9.4  2019/09/30
 
 
 # int onig_foreach_name(regex_t* reg,
-                        int (*func)(const UChar*, const UChar*, int,int*,regex_t*,void*),
-                        void* arg)
+          int (*func)(const UChar*, const UChar*, int,int*,regex_t*,void*),
+          void* arg)
 
   Iterate function call for all names.
 
@@ -866,19 +878,51 @@ Oniguruma API  Version 6.9.4  2019/09/30
 
 # unsigned long onig_get_retry_limit_in_match(void)
 
-  Return the limit of retry counts in matching process.
+  Return the limit of retry counts in a matching process.
   (default: 10000000)
 
-  normal return: limit value
+  normal return: current limit value
+
+
+# unsigned long onig_get_retry_limit_in_search(void)
+
+  Return the limit of retry counts in a search process.
+  0 means unlimited.
+  (default: 0)
+
+  normal return: current limit value
 
 
-# int onig_set_retry_limit_in_match(unsigned long n)
+# int onig_set_retry_limit_in_match(unsigned long limit)
 
   Set the limit of retry counts in matching process.
 
   normal return: ONIG_NORMAL
 
 
+# int onig_set_retry_limit_in_search(unsigned long limit)
+
+  Set a retry limit count of a search process.
+  0 means unlimited.
+
+  normal return: ONIG_NORMAL
+
+
+# int onig_get_subexp_call_max_nest_level(void)
+
+  Return the limit of subexp call nest level.
+  (default: 24)
+
+  normal return: current limit value
+
+
+# int onig_set_subexp_call_max_nest_level(int max_level)
+
+  Set a limit level of subexp call nest level.
+
+  normal return: ONIG_NORMAL
+
+
 # OnigCalloutFunc onig_get_progress_callout(void)
 
   Get a function for callouts of contents in progress.