From 4215e2b9d4cd91ffeecd431487957714574b241e Mon Sep 17 00:00:00 2001 From: mwilliams Date: Wed, 22 May 2013 11:42:02 -0700 Subject: [PATCH] Fix defaults for preg ini settings Use the RuntimeOptions, rather than hard-coding them --- hphp/runtime/base/preg.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hphp/runtime/base/preg.cpp b/hphp/runtime/base/preg.cpp index 8603e071e..db6d2109d 100644 --- a/hphp/runtime/base/preg.cpp +++ b/hphp/runtime/base/preg.cpp @@ -149,10 +149,12 @@ static __thread int t_last_error_code; namespace { static void preg_init_thread_locals() { - IniSetting::Bind("pcre.backtrack_limit", "1000000", ini_on_update_long, - &g_context->m_preg_backtrace_limit); - IniSetting::Bind("pcre.recursion_limit", "100000", ini_on_update_long, - &g_context->m_preg_recursion_limit); + IniSetting::Bind("pcre.backtrack_limit", + std::to_string(RuntimeOption::PregBacktraceLimit).c_str(), + ini_on_update_long, &g_context->m_preg_backtrace_limit); + IniSetting::Bind("pcre.recursion_limit", + std::to_string(RuntimeOption::PregRecursionLimit).c_str(), + ini_on_update_long, &g_context->m_preg_recursion_limit); } InitFiniNode init(preg_init_thread_locals, InitFiniNode::ThreadInit);