Fix loops in POE.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2af631c87884847d4683e99fed2768871f62bb5a..cd352a6858157a51857e484238e2fdcf2d9b3b40 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -420,7 +420,7 @@ IF(NOT BUILD_CPU_MODE)
        ENDIF(AMD_64)
 ENDIF(NOT BUILD_CPU_MODE)
 
-SET(POE_LOOP "POE::Loop::IO_Poll")
+SET(POE_LOOP "Loop::IO_Poll")
 
 # Platform specific configuration
 IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
@@ -451,7 +451,7 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
                        CHECK_FUNCTION_EXISTS(pidfile_fileno HAVE_PIDFILE_FILENO)
                ENDIF(_LIBUTIL_H)
        ENDIF(LIBUTIL_LIBRARY)
-       SET(POE_LOOP "POE::Loop::Kqueue")
+       SET(POE_LOOP "Loop::Kqueue")
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 
 IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
@@ -461,7 +461,6 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
                SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000")
        ENDIF(ENABLE_LUAJIT MATCHES "ON")
        MESSAGE(STATUS "Configuring for Darwin")
-       SET(POE_LOOP "POE::Loop::Kqueue")
 
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 
@@ -488,7 +487,7 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
        ELSE(EXISTS "/etc/debian_version")
                SET(LINUX_START_SCRIPT "rspamd_rh.in")
        ENDIF(EXISTS "/etc/debian_version")
-       SET(POE_LOOP "POE::XS::Loop::EPoll")
+       SET(POE_LOOP "XS::Loop::EPoll")
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 
 IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")

diff --git a/utils/redirector.pl.in b/utils/redirector.pl.in
index b615dc8d307ff2c531728b099c859f2e80e71e96..704f5749b2775af22d48311ccce19818bfa56582 100755 (executable)
--- a/utils/redirector.pl.in
+++ b/utils/redirector.pl.in
@@ -24,10 +24,7 @@ use Digest;
 use Proc::Daemon;
 use Proc::PidUtil;
 
-my $loop;
-eval "require @POE_LOOP@" or $loop = "POE::Loop::IO_Poll";
-use POE qw(Component::Server::TCP Filter::HTTPD Component::Client::HTTP)
-  ;    # p5-POE-Component-Client-HTTP
+use POE qw(@POE_LOOP@ Component::Server::TCP Filter::HTTPD Component::Client::HTTP);
 
 my $with_swf = 1;
 my $swf_parser;