[trafficserver] branch 8.0.x updated (37c74b4 -> 0ba786d)

[bc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a change to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


    from 37c74b4  Fixes a segfault that may occur when the debug and a lookup fails to find an entry in the hoststatus hash table.
     new 22c76f0  Fix building Catch on macOS
     new 0ba786d  Fixed issue with macOS Catalina and pcre 8.43 enabling pcre-jit (#6189)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/tscore/Regex.cc     | 8 ++++----
 tests/include/catch.hpp | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

[trafficserver] 01/02: Fix building Catch on macOS

[bc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 22c76f0549f7a69015e6904f66ed7bf96073aec9
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Fri Nov 8 14:16:22 2019 +0900

    Fix building Catch on macOS
    
    (cherry picked from commit 98b0aeaa122ac4c2711e955003c474071c8f2086)
---
 tests/include/catch.hpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/include/catch.hpp b/tests/include/catch.hpp
index d7bb037..bc24a42 100644
--- a/tests/include/catch.hpp
+++ b/tests/include/catch.hpp
@@ -7093,6 +7093,10 @@ namespace Catch {
 #  include <stdbool.h>
 #  include <sys/types.h>
 #  include <unistd.h>
+
+// ink_autoconf.h is required to use HAVE_SYS_SYSCTL_H
+#include "ink_autoconf.h"
+
 #if defined(darwin) || defined(freebsd)
 #ifdef HAVE_SYS_SYSCTL_H
 #  include <sys/sysctl.h>
@@ -13051,4 +13055,3 @@ using Catch::Detail::Approx;
 // end catch_reenable_warnings.h
 // end catch.hpp
 #endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-

[trafficserver] 02/02: Fixed issue with macOS Catalina and pcre 8.43 enabling pcre-jit (#6189)

[bc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 0ba786d7ae44b313c3f9c03e744c47ac971b0120
Author: Bryan Call <bc...@apache.org>
AuthorDate: Mon Nov 18 18:38:34 2019 +0800

    Fixed issue with macOS Catalina and pcre 8.43 enabling pcre-jit (#6189)
    
    
    (cherry picked from commit 093317c808b01304abf0a6b4aaf9c34791e3e08e)
---
 src/tscore/Regex.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tscore/Regex.cc b/src/tscore/Regex.cc
index 1a6cbed..cdb5651 100644
--- a/src/tscore/Regex.cc
+++ b/src/tscore/Regex.cc
@@ -26,7 +26,7 @@
 #include "tscore/ink_memory.h"
 #include "tscore/Regex.h"
 
-#ifdef PCRE_CONFIG_JIT
+#if defined(PCRE_CONFIG_JIT) && !defined(darwin) // issue with macOS Catalina and pcre 8.43
 struct RegexThreadKey {
   RegexThreadKey() { ink_thread_key_create(&this->key, (void (*)(void *)) & pcre_jit_stack_free); }
   ink_thread_key key;
@@ -74,13 +74,13 @@ Regex::compile(const char *pattern, const unsigned flags)
     return false;
   }
 
-#ifdef PCRE_CONFIG_JIT
+#if defined(PCRE_CONFIG_JIT) && !defined(darwin) // issue with macOS Catalina and pcre 8.43
   study_opts |= PCRE_STUDY_JIT_COMPILE;
 #endif
 
   regex_extra = pcre_study(regex, study_opts, &error);
 
-#ifdef PCRE_CONFIG_JIT
+#if defined(PCRE_CONFIG_JIT) && !defined(darwin) // issue with macOS Catalina and pcre 8.43
   if (regex_extra) {
     pcre_assign_jit_stack(regex_extra, &get_jit_stack, nullptr);
   }
@@ -125,7 +125,7 @@ Regex::exec(const char *str, int length, int *ovector, int ovecsize)
 Regex::~Regex()
 {
   if (regex_extra) {
-#ifdef PCRE_CONFIG_JIT
+#if defined(PCRE_CONFIG_JIT) && !defined(darwin) // issue with macOS Catalina and pcre 8.43
     pcre_free_study(regex_extra);
 #else
     pcre_free(regex_extra);