Skip to content

Commit dda6e15

Browse files
committed
fix: Fix crash on windows when running remote windows inventory
Closes #1011
1 parent 0db0614 commit dda6e15

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

Changes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ Revision history for GLPI agent
22

33
1.16 not yet released
44

5+
core:
6+
* On windows, permit to use libxml2 built libraries in different threads
7+
58
inventory:
69
* PR #931: Added DrWeb & Karpersky Endpoint for Linux antivirus support on linux
710
* fix #963: Software inventory with scan-profiles option fixed for Azure AD users
@@ -26,6 +29,7 @@ remoteinventory:
2629
* fix RedHat RHN systemid set as WINPRODID
2730
* fix battery inventory on windows
2831
* fix SessionID WsMan class support
32+
* fix #1011: Fix crash on windows when running remote windows inventory
2933

3034
netdiscovery/netinventory:
3135
* fix #922: Add Radware Alteon Load Balancer support

lib/GLPI/Agent/XML.pm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ use Encode qw(encode decode);
1010

1111
use GLPI::Agent::Tools;
1212

13-
# We need to use a dedicated worker thread to support XML::LibXML on win32 as
14-
# libxml2 DLL is not fully threads-safe if few contexts
15-
my $need_dedicated_thread = $OSNAME eq "MSWin32" ? 1 : 0;
13+
# We may need to use a dedicated worker thread to support XML::LibXML on win32 if
14+
# libxml2 DLL is not fully threads-safe in some contexts
15+
#my $need_dedicated_thread = $OSNAME eq "MSWin32" ? 1 : 0;
16+
my $need_dedicated_thread = 0;
1617
if ($need_dedicated_thread) {
1718
GLPI::Agent::Tools::Win32->require() or die $@;
1819
GLPI::Agent::Tools::Win32::start_Win32_OLE_Worker();

0 commit comments

Comments
 (0)