Several changes:

 - CMake: We can get rid of these policies, right?
 - Updated bots list
 - plain/ajax sessions ratio: clarify what the ratio actually means

Author: RockinRoel

CMakeLists.txt

@@ -2,18 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 
 SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE true)
 
-IF(COMMAND CMAKE_POLICY)
-  CMAKE_POLICY(SET CMP0002 OLD)
-  CMAKE_POLICY(SET CMP0003 OLD)
-  CMAKE_POLICY(SET CMP0005 OLD)
-  if(POLICY CMP0022)
-    # Stops CMake from warning about CMP0022, even though we don't actually use
-    # the LINK_INTERFACE_LIBRARIES or INTERFACE_LINK_LIBRARIES (only indirectly
-    # through PUBLIC/PRIVATE in TARGET_LINK_LIBRARIES)
-    CMAKE_POLICY(SET CMP0022 NEW)
-  endif(POLICY CMP0022)
-ENDIF(COMMAND CMAKE_POLICY)
-
 PROJECT(WT)
 
 SET(CMAKE_MODULE_PATH

doc/main

@@ -782,10 +782,13 @@ appRoot=C:\Program Files\MyApplications\AppRoot
   <user-agent>.*Bot.*</user-agent>
   <user-agent>.*ia_archiver.*</user-agent>
   <user-agent>.*Twiceler.*</user-agent>
-  <user-agent>Yandex.*</user-agent>
+  <user-agent>.*Yandex.*</user-agent>
   <user-agent>.*Nutch.*</user-agent>
   <user-agent>.*MJ12bot.*</user-agent>
-  <user-agent>Baiduspider.*</user-agent>
+  <user-agent>.*Baiduspider.*</user-agent>
+  <user-agent>.*Ezooms.*</user-agent>
+  <user-agent>.*Sogou web spider.*</user-agent>
+  <user-agent>.*AhrefsBot.*</user-agent>
 </user-agents>
       \endcode
 

examples/CMakeLists.txt

@@ -30,6 +30,8 @@
 SET(EXAMPLES_WT_LIB wt)
 SET(EXAMPLES_WTDBO_LIB wtdbo)
 SET(EXAMPLES_WTDBOSQLITE3_LIB wtdbosqlite3)
+SET(EXAMPLES_WTDBOPOSTGRES_LIB wtdbopostgres)
+SET(EXAMPLES_WTDBOMYSQL_LIB wtdbomysql)
 
 IF("${CMAKE_CURRENT_LIST_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
   IF(WIN32)
@@ -58,6 +60,8 @@ IF("${CMAKE_CURRENT_LIST_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
     SET(EXAMPLES_WT_LIB Wt::Wt)
     SET(EXAMPLES_WTDBO_LIB Wt::Dbo)
     SET(EXAMPLES_WTDBOSQLITE3_LIB Wt::DboSqlite3)
+    SET(EXAMPLES_WTDBOPOSTGRES_LIB Wt::DboPostgres)
+    SET(EXAMPLES_WTDBOMYSQL_LIB Wt::DboMySQL)
 
     INCLUDE_DIRECTORIES($(CMAKE_SOURCE_DIR)/../../../include)
     LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}/../../../lib)

examples/te-benchmark/CMakeLists.txt

@@ -9,17 +9,13 @@ INCLUDE_DIRECTORIES(${WT_SOURCE_DIR}/src)
 
 IF(ENABLE_MYSQL AND MYSQL_FOUND)
 WT_ADD_EXAMPLE(te-benchmark.wt benchmark.cpp)
-TARGET_LINK_LIBRARIES(te-benchmark.wt
-		      debug wtdbod optimized wtdbo
-		      debug wtdbomysqld optimized wtdbomysql)
+TARGET_LINK_LIBRARIES(te-benchmark.wt ${EXAMPLES_WTDBO_LIB} ${EXAMPLES_WTDBOMYSQL_LIB})
 ENDIF(ENABLE_MYSQL AND MYSQL_FOUND)
 
 IF(ENABLE_POSTGRES AND POSTGRES_FOUND)
 WT_ADD_EXAMPLE(te-benchmark-pg.wt benchmark.cpp)
 TARGET_COMPILE_DEFINITIONS(te-benchmark-pg.wt PRIVATE BENCHMARK_USE_POSTGRES)
-TARGET_LINK_LIBRARIES(te-benchmark-pg.wt
-		      debug wtdbod optimized wtdbo
-		      debug wtdbopostgresd optimized wtdbopostgres)
+TARGET_LINK_LIBRARIES(te-benchmark-pg.wt ${EXAMPLES_WTDBO_LIB} ${EXAMPLES_WTDBOPOSTGRES_LIB})
 ENDIF(ENABLE_POSTGRES AND POSTGRES_FOUND)
 ELSE(BOOST_WT_FOUND)
   MESSAGE(STATUS "** Not building te-benchmark example: requires boost headers.")

wt_config.xml.in

@@ -308,6 +308,11 @@
            fraction (e.g. less than 5%) will be plain HTML
            sessions. This ratio is only enforced when more than 20 sessions
 	   have been created.
+
+           The default is 1 (= 100%), which means that 100% of all sessions
+           may be plain HTML sessions, effectively disabling this feature. If
+           you set it to 0.5 for example, that means that 50% of all sessions
+           may be plain HTML sessions.
 	  -->
 	<plain-ajax-sessions-ratio-limit>1</plain-ajax-sessions-ratio-limit>
 
@@ -459,13 +464,20 @@
            Each <user-agent> is a regular expression.
 	  -->
 	<user-agents type="bot">
-	  <user-agent>.*Googlebot.*</user-agent>
-	  <user-agent>.*msnbot.*</user-agent>
-	  <user-agent>.*Slurp.*</user-agent>
-	  <user-agent>.*Crawler.*</user-agent>
-	  <user-agent>.*Bot.*</user-agent>
-	  <user-agent>.*ia_archiver.*</user-agent>
-	  <user-agent>.*Twiceler.*</user-agent>
+            <user-agent>.*Googlebot.*</user-agent>
+            <user-agent>.*msnbot.*</user-agent>
+            <user-agent>.*Slurp.*</user-agent>
+            <user-agent>.*Crawler.*</user-agent>
+            <user-agent>.*Bot.*</user-agent>
+            <user-agent>.*ia_archiver.*</user-agent>
+            <user-agent>.*Twiceler.*</user-agent>
+            <user-agent>.*Yandex.*</user-agent>
+            <user-agent>.*Nutch.*</user-agent>
+            <user-agent>.*MJ12bot.*</user-agent>
+            <user-agent>.*Baiduspider.*</user-agent>
+            <user-agent>.*Ezooms.*</user-agent>
+            <user-agent>.*Sogou web spider.*</user-agent>
+            <user-agent>.*AhrefsBot.*</user-agent>
 	</user-agents>
 
 	<!-- Configures different rendering engines for certain browsers.