.......... [ZBXNEXT-7402,ZBXNEXT-7413] updated to latest master

# Conflicts:
#	templates/os/freebsd/README.md
#	templates/os/openbsd/README.md

14 files changed, 46 insertions, 35 deletions

diff --git a/tests/libs/zbxcommon/Makefile.am b/tests/libs/zbxcommon/Makefile.am
index 3a89906dbd2..dc77b9cb3ee 100644
--- a/tests/libs/zbxcommon/Makefile.am
+++ b/tests/libs/zbxcommon/Makefile.am
@@ -83,6 +83,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
 	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
 	$(top_srcdir)/src/libs/zbxcomms/libzbxcomms.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/libs/zbxcompress/libzbxcompress.a \
 	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
 	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
@@ -203,7 +204,7 @@ zbx_json_to_xml_LDADD += @SERVER_LIBS@
 
 zbx_json_to_xml_LDFLAGS = @SERVER_LDFLAGS@
 
-zbx_json_to_xml_CFLAGS = $(COMMON_COMPILER_FLAGS)
+zbx_json_to_xml_CFLAGS = $(COMMON_COMPILER_FLAGS) @LIBXML2_CFLAGS@
 
 
 zbx_xml_to_json_SOURCES = \
@@ -217,7 +218,7 @@ zbx_xml_to_json_LDADD += @SERVER_LIBS@
 
 zbx_xml_to_json_LDFLAGS = @SERVER_LDFLAGS@
 
-zbx_xml_to_json_CFLAGS = $(COMMON_COMPILER_FLAGS)
+zbx_xml_to_json_CFLAGS = $(COMMON_COMPILER_FLAGS) @LIBXML2_CFLAGS@
 
 
 zbx_token_find_SOURCES = \
diff --git a/tests/libs/zbxcommon/zbx_json_to_xml.c b/tests/libs/zbxcommon/zbx_json_to_xml.c
index 0f9972b65eb..461245bfe3c 100644
--- a/tests/libs/zbxcommon/zbx_json_to_xml.c
+++ b/tests/libs/zbxcommon/zbx_json_to_xml.c
@@ -20,6 +20,8 @@
 #include "zbxmocktest.h"
 #include "zbxmockutil.h"
 
+#include "zbxxml.h"
+
 #define ZBX_XML_HEADER_SIZE	22
 
 void	zbx_mock_test_entry(void **state)
diff --git a/tests/libs/zbxcommon/zbx_xml_to_json.c b/tests/libs/zbxcommon/zbx_xml_to_json.c
index 9ed16045f2b..7a2777a5e45 100644
--- a/tests/libs/zbxcommon/zbx_xml_to_json.c
+++ b/tests/libs/zbxcommon/zbx_xml_to_json.c
@@ -20,6 +20,8 @@
 #include "zbxmocktest.h"
 #include "zbxmockutil.h"
 
+#include "zbxxml.h"
+
 void	zbx_mock_test_entry(void **state)
 {
 	char	*xml, *expected_json, *json = NULL, *error = NULL;
diff --git a/tests/libs/zbxcomms/Makefile.am b/tests/libs/zbxcomms/Makefile.am
index 52b75778463..71e8bd25e0c 100644
--- a/tests/libs/zbxcomms/Makefile.am
+++ b/tests/libs/zbxcomms/Makefile.am
@@ -25,6 +25,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
 	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
 	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
 	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
 	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
diff --git a/tests/libs/zbxcomms/zbx_tcp_check_allowed_peers.c b/tests/libs/zbxcomms/zbx_tcp_check_allowed_peers.c
index 9496bf3d127..1a44e2e4353 100644
--- a/tests/libs/zbxcomms/zbx_tcp_check_allowed_peers.c
+++ b/tests/libs/zbxcomms/zbx_tcp_check_allowed_peers.c
@@ -24,7 +24,7 @@
 #include "zbxmockhelper.h"
 
 #include "common.h"
-#include "comms.h"
+#include "zbxcomms.h"
 
 static void	mock_accept(zbx_socket_t *s)
 {
diff --git a/tests/libs/zbxcomms/zbx_tcp_check_allowed_peers_ipv4.c b/tests/libs/zbxcomms/zbx_tcp_check_allowed_peers_ipv4.c
index 1dbd2ed544e..a2820cdde8a 100644
--- a/tests/libs/zbxcomms/zbx_tcp_check_allowed_peers_ipv4.c
+++ b/tests/libs/zbxcomms/zbx_tcp_check_allowed_peers_ipv4.c
@@ -24,7 +24,7 @@
 #include "zbxmockhelper.h"
 
 #include "common.h"
-#include "comms.h"
+#include "zbxcomms.h"
 
 static void	mock_accept(zbx_socket_t *s)
 {
diff --git a/tests/libs/zbxcommshigh/Makefile.am b/tests/libs/zbxcommshigh/Makefile.am
index 3798a316fce..af699c1fd05 100644
--- a/tests/libs/zbxcommshigh/Makefile.am
+++ b/tests/libs/zbxcommshigh/Makefile.am
@@ -25,6 +25,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxconf/libzbxconf.a \
 	$(top_srcdir)/src/libs/zbxlog/libzbxlog.a \
 	$(top_srcdir)/src/libs/zbxsys/libzbxsys.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/libs/zbxcommon/libzbxcommon.a \
 	$(top_srcdir)/src/libs/zbxcrypto/libzbxcrypto.a \
 	$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
diff --git a/tests/libs/zbxcommshigh/zbx_tcp_recv_ext.c b/tests/libs/zbxcommshigh/zbx_tcp_recv_ext.c
index 999823a76f4..b5cfb066d09 100644
--- a/tests/libs/zbxcommshigh/zbx_tcp_recv_ext.c
+++ b/tests/libs/zbxcommshigh/zbx_tcp_recv_ext.c
@@ -24,7 +24,7 @@
 #include "zbxmockhelper.h"
 
 #include "common.h"
-#include "comms.h"
+#include "zbxcomms.h"
 
 void	zbx_mock_test_entry(void **state)
 {
diff --git a/tests/libs/zbxcommshigh/zbx_tcp_recv_raw_ext.c b/tests/libs/zbxcommshigh/zbx_tcp_recv_raw_ext.c
index 9b14905848d..2820127a9c6 100644
--- a/tests/libs/zbxcommshigh/zbx_tcp_recv_raw_ext.c
+++ b/tests/libs/zbxcommshigh/zbx_tcp_recv_raw_ext.c
@@ -24,7 +24,7 @@
 #include "zbxmockhelper.h"
 
 #include "common.h"
-#include "comms.h"
+#include "zbxcomms.h"
 
 void	zbx_mock_test_entry(void **state)
 {
diff --git a/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml b/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml
index 6f3970463a7..2e6df0cef8c 100644
--- a/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml
+++ b/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml
@@ -682,84 +682,84 @@ in:
     key: k
     poller: ZBX_NO_POLLER
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 122
     access: DIRECT
     type: ITEM_TYPE_INTERNAL
     key: k
     poller: ZBX_NO_POLLER
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 123
     access: DIRECT
     type: ITEM_TYPE_INTERNAL
     key: k
-    poller: ZBX_POLLER_TYPE_HISTORY
+    poller: ZBX_POLLER_TYPE_NORMAL
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 124
     access: DIRECT
     type: ITEM_TYPE_INTERNAL
     key: k
-    poller: ZBX_POLLER_TYPE_HISTORY
+    poller: ZBX_POLLER_TYPE_NORMAL
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 125
     access: DIRECT
     type: ITEM_TYPE_INTERNAL
     key: k
     poller: ZBX_POLLER_TYPE_IPMI
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 126
     access: DIRECT
     type: ITEM_TYPE_INTERNAL
     key: k
     poller: ZBX_POLLER_TYPE_IPMI
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 127
     access: DIRECT
     type: ITEM_TYPE_INTERNAL
     key: k
     poller: ZBX_POLLER_TYPE_PINGER
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 128
     access: DIRECT
     type: ITEM_TYPE_INTERNAL
     key: k
     poller: ZBX_POLLER_TYPE_PINGER
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 129
     access: DIRECT
     type: ITEM_TYPE_INTERNAL
     key: k
     poller: ZBX_POLLER_TYPE_JAVA
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 130
     access: DIRECT
     type: ITEM_TYPE_INTERNAL
     key: k
     poller: ZBX_POLLER_TYPE_JAVA
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 131
     access: DIRECT
     type: ITEM_TYPE_INTERNAL
     key: k
     poller: ZBX_POLLER_TYPE_UNREACHABLE
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_UNREACHABLE
   - ref: 132
     access: DIRECT
     type: ITEM_TYPE_INTERNAL
     key: k
     poller: ZBX_POLLER_TYPE_UNREACHABLE
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 157
     access: DIRECT
     type: ITEM_TYPE_ZABBIX_ACTIVE
@@ -2793,84 +2793,84 @@ in:
     key: zabbix[host,,items]
     poller: ZBX_NO_POLLER
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 146
     access: PROXY
     type: ITEM_TYPE_INTERNAL
     key: zabbix[host,,items]
     poller: ZBX_NO_POLLER
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 147
     access: PROXY
     type: ITEM_TYPE_INTERNAL
     key: zabbix[host,,items]
-    poller: ZBX_POLLER_TYPE_HISTORY
+    poller: ZBX_POLLER_TYPE_NORMAL
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 148
     access: PROXY
     type: ITEM_TYPE_INTERNAL
     key: zabbix[host,,items]
-    poller: ZBX_POLLER_TYPE_HISTORY
+    poller: ZBX_POLLER_TYPE_NORMAL
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 149
     access: PROXY
     type: ITEM_TYPE_INTERNAL
     key: zabbix[host,,items]
     poller: ZBX_POLLER_TYPE_IPMI
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 150
     access: PROXY
     type: ITEM_TYPE_INTERNAL
     key: zabbix[host,,items]
     poller: ZBX_POLLER_TYPE_IPMI
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 151
     access: PROXY
     type: ITEM_TYPE_INTERNAL
     key: zabbix[host,,items]
     poller: ZBX_POLLER_TYPE_PINGER
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 152
     access: PROXY
     type: ITEM_TYPE_INTERNAL
     key: zabbix[host,,items]
     poller: ZBX_POLLER_TYPE_PINGER
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 153
     access: PROXY
     type: ITEM_TYPE_INTERNAL
     key: zabbix[host,,items]
     poller: ZBX_POLLER_TYPE_JAVA
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 154
     access: PROXY
     type: ITEM_TYPE_INTERNAL
     key: zabbix[host,,items]
     poller: ZBX_POLLER_TYPE_JAVA
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 155
     access: PROXY
     type: ITEM_TYPE_INTERNAL
     key: zabbix[host,,items]
     poller: ZBX_POLLER_TYPE_UNREACHABLE
     flags: 0
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_UNREACHABLE
   - ref: 156
     access: PROXY
     type: ITEM_TYPE_INTERNAL
     key: zabbix[host,,items]
     poller: ZBX_POLLER_TYPE_UNREACHABLE
     flags: ZBX_ITEM_COLLECTED
-    result: ZBX_POLLER_TYPE_HISTORY
+    result: ZBX_POLLER_TYPE_NORMAL
   - ref: 157
     access: PROXY
     type: ITEM_TYPE_INTERNAL
diff --git a/tests/libs/zbxsysinfo/Makefile.am b/tests/libs/zbxsysinfo/Makefile.am
index 17de2bbc969..6d8ed642636 100644
--- a/tests/libs/zbxsysinfo/Makefile.am
+++ b/tests/libs/zbxsysinfo/Makefile.am
@@ -80,6 +80,7 @@ parse_item_key_LDADD = \
 	$(top_srcdir)/src/libs/zbxdb/libzbxdb.a \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
 	$(top_srcdir)/src/libs/zbxtasks/libzbxtasks.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/zabbix_server/libzbxserver.a \
 	$(top_srcdir)/tests/libzbxmocktest.a \
 	$(top_srcdir)/tests/libzbxmockdata.a
@@ -115,6 +116,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
 	$(top_srcdir)/src/zabbix_agent/libzbxagent.a \
 	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/tests/libzbxmocktest.a \
 	$(top_srcdir)/tests/libzbxmockdata.a
 
diff --git a/tests/libs/zbxsysinfo/common/Makefile.am b/tests/libs/zbxsysinfo/common/Makefile.am
index b66785e1c36..d818c4ec1d2 100644
--- a/tests/libs/zbxsysinfo/common/Makefile.am
+++ b/tests/libs/zbxsysinfo/common/Makefile.am
@@ -35,6 +35,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
 	$(top_srcdir)/src/libs/zbxexec/libzbxexec.a \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/zabbix_agent/libzbxagent.a \
 	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
 	$(top_srcdir)/tests/libzbxmocktest.a \
diff --git a/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.c b/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.c
index c46930c547a..43620c44686 100644
--- a/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.c
+++ b/tests/libs/zbxsysinfo/common/WEB_PAGE_GET.c
@@ -21,7 +21,7 @@
 #include "zbxmockdata.h"
 #include "zbxmockutil.h"
 
-#include "comms.h"
+#include "zbxcomms.h"
 #include "sysinfo.h"
 #include "../../../../src/libs/zbxsysinfo/common/http.h"
 
diff --git a/tests/libs/zbxsysinfo/linux/Makefile.am b/tests/libs/zbxsysinfo/linux/Makefile.am
index 498ef42b76b..ad7cfe07732 100644
--- a/tests/libs/zbxsysinfo/linux/Makefile.am
+++ b/tests/libs/zbxsysinfo/linux/Makefile.am
@@ -43,6 +43,7 @@ COMMON_LIB_FILES = \
 	$(top_srcdir)/src/libs/zbxhttp/libzbxhttp.a \
 	$(top_srcdir)/src/libs/zbxexec/libzbxexec.a \
 	$(top_srcdir)/src/libs/zbxmodules/libzbxmodules.a \
+	$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
 	$(top_srcdir)/src/zabbix_agent/libzbxagent.a \
 	$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
 	$(top_srcdir)/tests/libzbxmocktest.a \