Merge remote-tracking branch 'asf/9.1.x' into 9.1.x

* asf/9.1.x: (26 commits)
  Updated ChangeLog
  Use return values to fix ubuntu release build error (apache#7591)
  Build the test library for tls_engine consistently (apache#7588)
  if transaction status non-success, bypass intercept plugin (apache#7724)
  Fix build on FreeBSD 13 (apache#7730)
  Fix use of -mcx16 flag - only use if it compiles cleanly. (apache#7684)
  Add class to normalize handling of pending action (apache#7667)
  Fix a bug in tspush that pushes corrupted content to cache (apache#7696)
  Add new TS API function TSUrlRawPortGet. (apache#7568)
  fix mem leak in session cache (apache#7707)
  Fix doc for http2.no_activity_timeout_in (apache#7721)
  Add a chunked disabled test. (apache#7743)
  Adding DNS TTL AuTests. (apache#7742)
  header_rewrite: Various fixes for MaxMind support (apache#7746)
  header_rewrite: Allow for relative path to geo database files (apache#7727)
  header_rewrite: allow for use of maxminddb as source of geo truth (apache#7695)
  Propagate TLS errors (apache#7714)
  Experimental Cache fill plugin (apache#7470)
  Make when_to_revalidate setting available on HTTPS (apache#7753)
  Clean up HTTP version processing (apache#7766)
  ...

CHANGELOG-9.1.0

@@ -270,6 +270,7 @@ Changes with Apache Traffic Server 9.1.0
   #7464 - Upgrade Catch.hpp to v2.13.4
   #7465 - Select lua context per thread
   #7466 - Change atoi to atol, causing obvious issues on what needs to be int64's
+  #7470 - Experimental Cache fill plugin
   #7473 - Adjust so transfer-encoding header can be treated hop-by-hop
   #7488 - Avoid -Warray-bounds on PROXY Protocol Builder
   #7491 - Add new log field for negotiated ALPN Protocol ID with the client
@@ -290,11 +291,14 @@ Changes with Apache Traffic Server 9.1.0
   #7545 - For TSHttpHdrEffectiveUrlBufGet(), include scheme for request to server URL.
   #7550 - Fix ja3_fingerprint configure syntax
   #7567 - Remove ProxyTransaction::set_proxy_ssn
+  #7568 - Add new TS API function TSUrlRawPortGet.
   #7569 - Cleanup: Rename IOBufferReader of Http2ClientSession
   #7571 - Tidy up session/transaction destruction process
   #7572 - FQ pacing plugin memory leak fix
   #7580 -  Refine connection failure logging and messages and eliminate spurious connection errors
+  #7588 - Build the test library for tls_engine consistently
   #7589 - Add gold test for remap config .include directive.
+  #7591 - Use return values to fix ubuntu release build error
   #7601 - Update -with-profile and add some profiling documentation
   #7608 - Set pcre_malloc/free function pointers in core main() only.
   #7619 - Use standard isdigit library function
@@ -306,4 +310,18 @@ Changes with Apache Traffic Server 9.1.0
   #7630 - Add default implementation for allow_half_open
   #7631 - Fix HttpSessionManager::acquireSession from previous rebase error
   #7633 - Updating documentation for negative_revalidating_lifetime
+  #7667 - Add class to normalize handling of pending action
   #7679 - Add close header normalize openclose test
+  #7680 - Add sqpv log field for server protocol
+  #7695 - header_rewrite: allow for use of maxminddb as source of geo truth
+  #7707 - Fix mem leak in session cache
+  #7709 - Increase the maximum slice block size from 32MB to 128MB
+  #7714 - Propagate TLS errors
+  #7724 - if transaction status non-success, bypass intercept plugin
+  #7727 - header_rewrite: Allow for relative path to geo database files
+  #7742 - Adding DNS TTL AuTests.
+  #7743 - Add a chunked disabled test.
+  #7746 - header_rewrite: Various fixes for MaxMind support
+  #7747 - Remove unused variable is_revalidation_necessary
+  #7753 - Make when_to_revalidate setting available on HTTPS
+  #7766 - Clean up HTTP version processing

configure.ac

@@ -1569,6 +1569,8 @@ __saved_CXXFLAGS="${CXXFLAGS}"
 __saved_CFLAGS="${CFLAGS}"
 
 has_128bit_cas=0
+# Don't add the -mcx16 flag unless needed and it compiles cleanly.
+needs_mcx16_for_cas=0
 
 TS_TRY_COMPILE_NO_WARNING([],[
     __int128_t x = 0;
@@ -1587,6 +1589,7 @@ TS_TRY_COMPILE_NO_WARNING([],[
       ], [
         AC_MSG_RESULT(yes)
         has_128bit_cas=1
+        needs_mcx16_for_cas=1
       ], [
         AC_MSG_RESULT(no)
     ])
@@ -1597,11 +1600,9 @@ CFLAGS="${__saved_CFLAGS}"
 AC_LANG_POP
 AC_SUBST(has_128bit_cas)
 
-AS_IF([test "x$has_128bit_cas" = "x1"], [
-  AS_IF([test "x$ax_cv_c_compiler_vendor" != "xintel"], [
+AS_IF([test "x$needs_mcx16_for_cas" = "x1"], [
     TS_ADDTO(AM_CFLAGS, [-mcx16])
     TS_ADDTO(AM_CXXFLAGS, [-mcx16])
-  ])
 ])
 
 # Check for POSIX capabilities library.
@@ -1696,27 +1697,66 @@ AC_SUBST(use_hwloc)
 #
 AC_CHECK_HEADERS([GeoIP.h], [
   AC_CHECK_LIB([GeoIP], [GeoIP_new], [
-    AC_SUBST([GEO_LIBS], ["-lGeoIP"])
+    AC_SUBST([GEOIP_LIBS], ["-lGeoIP"])
+    AC_SUBST(has_geoip, 1)
   ], [
-    AC_SUBST([GEO_LIBS], [""])
+    AC_SUBST([GEOIP_LIBS], [""])
+    AC_SUBST(has_geoip, 0)
   ])
 ])
 
+AM_CONDITIONAL([HAS_GEOIP], [test "x${has_geoip}" = "x1" ])
+
 #
 # Check for libmaxmind.  This is the maxmind v2 API where GeoIP is the legacy
 # v1 dat file based API
 #
 AC_CHECK_HEADERS([maxminddb.h], [
   AC_CHECK_LIB([maxminddb], [MMDB_open], [
     AC_SUBST([MAXMINDDB_LIBS], ["-lmaxminddb"])
-    AC_SUBST(has_maxmind, 1)
+    AC_SUBST(has_maxminddb, 1)
   ], [
     AC_SUBST([MAXMINDDB_LIBS], [""])
-    AC_SUBST(has_maxmind, 0)
+    AC_SUBST(has_maxminddb, 0)
   ])
 ])
 
-AM_CONDITIONAL([BUILD_MAXMIND_ACL_PLUGIN], [test "x${has_maxmind}" = "x1" ])
+AM_CONDITIONAL([HAS_MAXMINDDB], [test "x${has_maxminddb}" = "x1" ])
+
+AC_ARG_WITH([hrw-geo-provider],
+  [AS_HELP_STRING([--with-hrw-geo-provider=geoip|maxminddb],[geo provider to use with header_rewrite [default=auto] ])],
+  [geo_provider=$withval],
+  [geo_provider="auto"]
+)
+use_hrw_geoip=0
+use_hrw_maxminddb=0
+
+AS_IF([test "x$geo_provider" = "xauto"], [
+  if test "x$has_geoip" = "x1"; then
+    use_hrw_geoip=1
+    AC_MSG_NOTICE([Using GeoIP interface for header_rewrite])
+  elif test "x$has_maxminddb" = "x1"; then
+    use_hrw_maxminddb=1
+    AC_MSG_NOTICE([Using MaxMindDB interface for header_rewrite])
+  fi
+],[
+  case "x$geo_provider" in
+    xgeoip)
+      use_hrw_geoip=1
+      AC_MSG_RESULT([forced to GeoIP])
+      ;;
+    xmaxminddb)
+      use_hrw_maxminddb=1
+      AC_MSG_RESULT([forced to MaxMindDB])
+      ;;
+    *)
+      AC_MSG_RESULT([failed])
+      AC_MSG_FAILURE([unknown geo interface $geo_provider])
+  esac
+])
+
+AC_SUBST(use_hrw_geoip)
+AC_SUBST(use_hrw_maxminddb)
 
 # Right now, the healthcheck plugins requires inotify_init (and friends)
 AM_CONDITIONAL([BUILD_HEALTHCHECK_PLUGIN], [ test "$ac_cv_func_inotify_init" = "yes" ])