Merge branch '1753-make-isc-rwlock-implementation-the-default-again' into 'master'

Make ISC rwlock implementation the default again

Closes #1753

See merge request isc-projects/bind9!3375

CHANGES

@@ -1,3 +1,6 @@
+5385.	[func]		Make ISC rwlock implementation the default again.
+			[GL #1753]
+
 5384.	[bug]		With dnssec-policy, inline-signing was implicitly set
 			to yes.  Change and only set inline-signing to yes
 			if the zone is not dynamic. [GL #1709]

configure

@@ -1624,9 +1624,8 @@ Optional Features:
   --enable-devpoll        use /dev/poll when available [default=yes]
   --disable-geoip         support GeoIP2 geolocation ACLs if available
                           [default=yes]
-  --disable-pthread-rwlock
+  --enable-pthread-rwlock use pthread rwlock instead of internal rwlock
-                          use internal rwlock implementation instead of
+                          implementation
-                          pthread rwlock
   --enable-fips-mode      enable FIPS mode in OpenSSL library [default=no]
   --enable-native-pkcs11  use native PKCS11 for public-key crypto [default=no]
   --disable-tcp-fastopen  disable TCP Fast Open support [default=yes]
@@ -16001,7 +16000,7 @@ done
 if test "${enable_pthread_rwlock+set}" = set; then :
   enableval=$enable_pthread_rwlock;
 else
-  enable_pthread_rwlock=yes
+  enable_pthread_rwlock=no
 fi
 
 

configure.ac

@@ -685,9 +685,9 @@ AC_SUBST(ALWAYS_DEFINES)
 # Do we want to use pthread rwlock?
 #
 AC_ARG_ENABLE([pthread_rwlock],
-	      [AS_HELP_STRING([--disable-pthread-rwlock],
+	      [AS_HELP_STRING([--enable-pthread-rwlock],
-			      [use internal rwlock implementation instead of pthread rwlock])],
+			      [use pthread rwlock instead of internal rwlock implementation])],
-	      [], [enable_pthread_rwlock=yes])
+	      [], [enable_pthread_rwlock=no])
 
 AS_IF([test "$enable_pthread_rwlock" = "yes"],
       [AC_CHECK_FUNCS([pthread_rwlock_rdlock], [],

doc/arm/notes-9.17.2.xml

@@ -45,7 +45,8 @@
     <itemizedlist>
       <listitem>
         <para>
-          None.
+          The default rwlock implementation has been changed back to the native
+          BIND 9 rwlock implementation. [GL #1753]
         </para>
       </listitem>
     </itemizedlist>