diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-06-16 19:09:27 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-06-16 19:09:27 +0100 |
| commit | 72cd49153aee41edaf5259a2055c990abc8db0aa (patch) | |
| tree | d6eaf65409d45298899aa3cd40bc397457e9fef7 | |
| parent | b5f194d795278bfc89db104c2d6188ae16b625b6 (diff) | |
| download | rspamd-72cd49153aee41edaf5259a2055c990abc8db0aa.tar.gz rspamd-72cd49153aee41edaf5259a2055c990abc8db0aa.zip | |
Fix loops in POE.
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rwxr-xr-x | utils/redirector.pl.in | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d089ab9f..050f02559 100644 --- 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 b615dc8d3..704f5749b 100755 --- 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; |