|
|
ebde72 |
diff --git a/acinclude.m4 b/acinclude.m4
|
|
|
ebde72 |
index 05abe18..97484c9 100644
|
|
|
ebde72 |
--- a/acinclude.m4
|
|
|
ebde72 |
+++ b/acinclude.m4
|
|
|
ebde72 |
@@ -631,7 +631,6 @@ case $host in
|
|
|
ebde72 |
if test "${ac_cv_header_systemd_sd_daemon_h}" = "no" || test -z "${SYSTEMD_LIBS}"; then
|
|
|
ebde72 |
AC_MSG_WARN([Your system does not support systemd.])
|
|
|
ebde72 |
else
|
|
|
ebde72 |
- APR_ADDTO(HTTPD_LIBS, [$SYSTEMD_LIBS])
|
|
|
ebde72 |
AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is supported])
|
|
|
ebde72 |
fi
|
|
|
ebde72 |
fi
|
|
|
ebde72 |
diff --git a/include/ap_listen.h b/include/ap_listen.h
|
|
|
ebde72 |
index 58c2574..d5ed968 100644
|
|
|
ebde72 |
--- a/include/ap_listen.h
|
|
|
ebde72 |
+++ b/include/ap_listen.h
|
|
|
ebde72 |
@@ -29,6 +29,7 @@
|
|
|
ebde72 |
#include "apr_network_io.h"
|
|
|
ebde72 |
#include "httpd.h"
|
|
|
ebde72 |
#include "http_config.h"
|
|
|
ebde72 |
+#include "apr_optional.h"
|
|
|
ebde72 |
|
|
|
ebde72 |
#ifdef __cplusplus
|
|
|
ebde72 |
extern "C" {
|
|
|
ebde72 |
@@ -143,6 +144,15 @@ AP_DECLARE_NONSTD(const char *) ap_set_receive_buffer_size(cmd_parms *cmd,
|
|
|
ebde72 |
void *dummy,
|
|
|
ebde72 |
const char *arg);
|
|
|
ebde72 |
|
|
|
ebde72 |
+#ifdef HAVE_SYSTEMD
|
|
|
ebde72 |
+APR_DECLARE_OPTIONAL_FN(int,
|
|
|
ebde72 |
+ ap_find_systemd_socket, (process_rec *, apr_port_t));
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+APR_DECLARE_OPTIONAL_FN(int,
|
|
|
ebde72 |
+ ap_systemd_listen_fds, (int));
|
|
|
ebde72 |
+#endif
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+
|
|
|
ebde72 |
#define LISTEN_COMMANDS \
|
|
|
ebde72 |
AP_INIT_TAKE1("ListenBacklog", ap_set_listenbacklog, NULL, RSRC_CONF, \
|
|
|
ebde72 |
"Maximum length of the queue of pending connections, as used by listen(2)"), \
|
|
|
ebde72 |
diff --git a/modules/arch/unix/mod_systemd.c b/modules/arch/unix/mod_systemd.c
|
|
|
ebde72 |
index eda1272..fc059fc 100644
|
|
|
ebde72 |
--- a/modules/arch/unix/mod_systemd.c
|
|
|
ebde72 |
+++ b/modules/arch/unix/mod_systemd.c
|
|
|
ebde72 |
@@ -35,6 +35,15 @@
|
|
|
ebde72 |
#include <unistd.h>
|
|
|
ebde72 |
#endif
|
|
|
ebde72 |
|
|
|
ebde72 |
+APR_DECLARE_OPTIONAL_FN(int,
|
|
|
ebde72 |
+ ap_find_systemd_socket, (process_rec *, apr_port_t));
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+APR_DECLARE_OPTIONAL_FN(int,
|
|
|
ebde72 |
+ ap_systemd_listen_fds, (int));
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+APR_DECLARE_OPTIONAL_FN(int,
|
|
|
ebde72 |
+ ap_systemd_journal_stream_fd, (const char *, int, int));
|
|
|
ebde72 |
+
|
|
|
ebde72 |
static char describe_listeners[30];
|
|
|
ebde72 |
|
|
|
ebde72 |
static int systemd_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
|
|
|
ebde72 |
@@ -145,8 +154,47 @@ static int systemd_monitor(apr_pool_t *p, server_rec *s)
|
|
|
ebde72 |
return DECLINED;
|
|
|
ebde72 |
}
|
|
|
ebde72 |
|
|
|
ebde72 |
+static int ap_find_systemd_socket(process_rec * process, apr_port_t port) {
|
|
|
ebde72 |
+ int fdcount, fd;
|
|
|
ebde72 |
+ int sdc = sd_listen_fds(0);
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+ if (sdc < 0) {
|
|
|
ebde72 |
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, sdc, process->pool, APLOGNO(02486)
|
|
|
ebde72 |
+ "find_systemd_socket: Error parsing enviroment, sd_listen_fds returned %d",
|
|
|
ebde72 |
+ sdc);
|
|
|
ebde72 |
+ return -1;
|
|
|
ebde72 |
+ }
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+ if (sdc == 0) {
|
|
|
ebde72 |
+ ap_log_perror(APLOG_MARK, APLOG_CRIT, sdc, process->pool, APLOGNO(02487)
|
|
|
ebde72 |
+ "find_systemd_socket: At least one socket must be set.");
|
|
|
ebde72 |
+ return -1;
|
|
|
ebde72 |
+ }
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+ fdcount = atoi(getenv("LISTEN_FDS"));
|
|
|
ebde72 |
+ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + fdcount; fd++) {
|
|
|
ebde72 |
+ if (sd_is_socket_inet(fd, 0, 0, -1, port) > 0) {
|
|
|
ebde72 |
+ return fd;
|
|
|
ebde72 |
+ }
|
|
|
ebde72 |
+ }
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+ return -1;
|
|
|
ebde72 |
+}
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+static int ap_systemd_listen_fds(int unset_environment){
|
|
|
ebde72 |
+ return sd_listen_fds(unset_environment);
|
|
|
ebde72 |
+}
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+static int ap_systemd_journal_stream_fd(const char *identifier, int priority, int level_prefix){
|
|
|
ebde72 |
+ return sd_journal_stream_fd("httpd", priority, 0);
|
|
|
ebde72 |
+}
|
|
|
ebde72 |
+
|
|
|
ebde72 |
static void systemd_register_hooks(apr_pool_t *p)
|
|
|
ebde72 |
{
|
|
|
ebde72 |
+ APR_REGISTER_OPTIONAL_FN(ap_systemd_listen_fds);
|
|
|
ebde72 |
+ APR_REGISTER_OPTIONAL_FN(ap_find_systemd_socket);
|
|
|
ebde72 |
+ APR_REGISTER_OPTIONAL_FN(ap_systemd_journal_stream_fd);
|
|
|
ebde72 |
+
|
|
|
ebde72 |
/* Enable ap_extended_status. */
|
|
|
ebde72 |
ap_hook_pre_config(systemd_pre_config, NULL, NULL, APR_HOOK_LAST);
|
|
|
ebde72 |
/* Signal service is ready. */
|
|
|
ebde72 |
diff --git a/modules/loggers/config.m4 b/modules/loggers/config.m4
|
|
|
ebde72 |
index 0848d2e..8af2299 100644
|
|
|
ebde72 |
--- a/modules/loggers/config.m4
|
|
|
ebde72 |
+++ b/modules/loggers/config.m4
|
|
|
ebde72 |
@@ -5,7 +5,6 @@ dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
|
|
|
ebde72 |
APACHE_MODPATH_INIT(loggers)
|
|
|
ebde72 |
|
|
|
ebde72 |
APACHE_MODULE(log_config, logging configuration. You won't be able to log requests to the server without this module., , , yes)
|
|
|
ebde72 |
-APR_ADDTO(MOD_LOG_CONFIG_LDADD, [$SYSTEMD_LIBS])
|
|
|
ebde72 |
|
|
|
ebde72 |
APACHE_MODULE(log_debug, configurable debug logging, , , most)
|
|
|
ebde72 |
APACHE_MODULE(log_forensic, forensic logging)
|
|
|
ebde72 |
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
|
|
|
ebde72 |
index 0b11f60..c3f0a51 100644
|
|
|
ebde72 |
--- a/modules/loggers/mod_log_config.c
|
|
|
ebde72 |
+++ b/modules/loggers/mod_log_config.c
|
|
|
ebde72 |
@@ -172,10 +172,6 @@
|
|
|
ebde72 |
#include <limits.h>
|
|
|
ebde72 |
#endif
|
|
|
ebde72 |
|
|
|
ebde72 |
-#ifdef HAVE_SYSTEMD
|
|
|
ebde72 |
-#include <systemd/sd-journal.h>
|
|
|
ebde72 |
-#endif
|
|
|
ebde72 |
-
|
|
|
ebde72 |
#define DEFAULT_LOG_FORMAT "%h %l %u %t \"%r\" %>s %b"
|
|
|
ebde72 |
|
|
|
ebde72 |
module AP_MODULE_DECLARE_DATA log_config_module;
|
|
|
ebde72 |
@@ -1640,8 +1636,15 @@ static apr_status_t wrap_journal_stream(apr_pool_t *p, apr_file_t **outfd,
|
|
|
ebde72 |
{
|
|
|
ebde72 |
#ifdef HAVE_SYSTEMD
|
|
|
ebde72 |
int fd;
|
|
|
ebde72 |
+ APR_OPTIONAL_FN_TYPE(ap_systemd_journal_stream_fd) *systemd_journal_stream_fd;
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+ systemd_journal_stream_fd = APR_RETRIEVE_OPTIONAL_FN(ap_systemd_journal_stream_fd);
|
|
|
ebde72 |
+ if (systemd_journal_stream_fd == NULL) {
|
|
|
ebde72 |
+ return APR_ENOTIMPL;
|
|
|
ebde72 |
+ }
|
|
|
ebde72 |
|
|
|
ebde72 |
- fd = sd_journal_stream_fd("httpd", priority, 0);
|
|
|
ebde72 |
+ fd = systemd_journal_stream_fd("httpd", priority, 0);
|
|
|
ebde72 |
+
|
|
|
ebde72 |
if (fd < 0) return fd;
|
|
|
ebde72 |
|
|
|
ebde72 |
/* This is an AF_UNIX socket fd so is more pipe-like than
|
|
|
ebde72 |
diff --git a/modules/loggers/mod_log_config.h b/modules/loggers/mod_log_config.h
|
|
|
ebde72 |
index 877a593..bd52a98 100644
|
|
|
ebde72 |
--- a/modules/loggers/mod_log_config.h
|
|
|
ebde72 |
+++ b/modules/loggers/mod_log_config.h
|
|
|
ebde72 |
@@ -69,6 +69,10 @@ APR_DECLARE_OPTIONAL_FN(ap_log_writer_init*, ap_log_set_writer_init,(ap_log_writ
|
|
|
ebde72 |
*/
|
|
|
ebde72 |
APR_DECLARE_OPTIONAL_FN(ap_log_writer*, ap_log_set_writer, (ap_log_writer* func));
|
|
|
ebde72 |
|
|
|
ebde72 |
+#ifdef HAVE_SYSTEMD
|
|
|
ebde72 |
+APR_DECLARE_OPTIONAL_FN(int, ap_systemd_journal_stream_fd, (const char *, int, int));
|
|
|
ebde72 |
+#endif
|
|
|
ebde72 |
+
|
|
|
ebde72 |
#endif /* MOD_LOG_CONFIG */
|
|
|
ebde72 |
/** @} */
|
|
|
ebde72 |
|
|
|
ebde72 |
diff --git a/server/listen.c b/server/listen.c
|
|
|
ebde72 |
index e2e028a..5d1c0e1 100644
|
|
|
ebde72 |
--- a/server/listen.c
|
|
|
ebde72 |
+++ b/server/listen.c
|
|
|
ebde72 |
@@ -34,10 +34,6 @@
|
|
|
ebde72 |
#include <unistd.h>
|
|
|
ebde72 |
#endif
|
|
|
ebde72 |
|
|
|
ebde72 |
-#ifdef HAVE_SYSTEMD
|
|
|
ebde72 |
-#include <systemd/sd-daemon.h>
|
|
|
ebde72 |
-#endif
|
|
|
ebde72 |
-
|
|
|
ebde72 |
/* we know core's module_index is 0 */
|
|
|
ebde72 |
#undef APLOG_MODULE_INDEX
|
|
|
ebde72 |
#define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX
|
|
|
ebde72 |
@@ -325,34 +321,6 @@ static int find_listeners(ap_listen_rec **from, ap_listen_rec **to,
|
|
|
ebde72 |
}
|
|
|
ebde72 |
|
|
|
ebde72 |
#ifdef HAVE_SYSTEMD
|
|
|
ebde72 |
-
|
|
|
ebde72 |
-static int find_systemd_socket(process_rec * process, apr_port_t port) {
|
|
|
ebde72 |
- int fdcount, fd;
|
|
|
ebde72 |
- int sdc = sd_listen_fds(0);
|
|
|
ebde72 |
-
|
|
|
ebde72 |
- if (sdc < 0) {
|
|
|
ebde72 |
- ap_log_perror(APLOG_MARK, APLOG_CRIT, sdc, process->pool, APLOGNO(02486)
|
|
|
ebde72 |
- "find_systemd_socket: Error parsing enviroment, sd_listen_fds returned %d",
|
|
|
ebde72 |
- sdc);
|
|
|
ebde72 |
- return -1;
|
|
|
ebde72 |
- }
|
|
|
ebde72 |
-
|
|
|
ebde72 |
- if (sdc == 0) {
|
|
|
ebde72 |
- ap_log_perror(APLOG_MARK, APLOG_CRIT, sdc, process->pool, APLOGNO(02487)
|
|
|
ebde72 |
- "find_systemd_socket: At least one socket must be set.");
|
|
|
ebde72 |
- return -1;
|
|
|
ebde72 |
- }
|
|
|
ebde72 |
-
|
|
|
ebde72 |
- fdcount = atoi(getenv("LISTEN_FDS"));
|
|
|
ebde72 |
- for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + fdcount; fd++) {
|
|
|
ebde72 |
- if (sd_is_socket_inet(fd, 0, 0, -1, port) > 0) {
|
|
|
ebde72 |
- return fd;
|
|
|
ebde72 |
- }
|
|
|
ebde72 |
- }
|
|
|
ebde72 |
-
|
|
|
ebde72 |
- return -1;
|
|
|
ebde72 |
-}
|
|
|
ebde72 |
-
|
|
|
ebde72 |
static apr_status_t alloc_systemd_listener(process_rec * process,
|
|
|
ebde72 |
int fd, const char *proto,
|
|
|
ebde72 |
ap_listen_rec **out_rec)
|
|
|
ebde72 |
@@ -412,6 +380,14 @@ static const char *set_systemd_listener(process_rec *process, apr_port_t port,
|
|
|
ebde72 |
{
|
|
|
ebde72 |
ap_listen_rec *last, *new;
|
|
|
ebde72 |
apr_status_t rv;
|
|
|
ebde72 |
+ APR_OPTIONAL_FN_TYPE(ap_find_systemd_socket) *find_systemd_socket;
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+ find_systemd_socket = APR_RETRIEVE_OPTIONAL_FN(ap_find_systemd_socket);
|
|
|
ebde72 |
+
|
|
|
ebde72 |
+ if (!find_systemd_socket)
|
|
|
ebde72 |
+ return "Systemd socket activation is used, but mod_systemd is probably "
|
|
|
ebde72 |
+ "not loaded";
|
|
|
ebde72 |
+
|
|
|
ebde72 |
int fd = find_systemd_socket(process, port);
|
|
|
ebde72 |
if (fd < 0) {
|
|
|
ebde72 |
return "Systemd socket activation is used, but this port is not "
|
|
|
ebde72 |
@@ -438,7 +414,6 @@ static const char *set_systemd_listener(process_rec *process, apr_port_t port,
|
|
|
ebde72 |
|
|
|
ebde72 |
return NULL;
|
|
|
ebde72 |
}
|
|
|
ebde72 |
-
|
|
|
ebde72 |
#endif /* HAVE_SYSTEMD */
|
|
|
ebde72 |
|
|
|
ebde72 |
static const char *alloc_listener(process_rec *process, const char *addr,
|
|
|
ebde72 |
@@ -707,6 +682,9 @@ AP_DECLARE(int) ap_setup_listeners(server_rec *s)
|
|
|
ebde72 |
int num_listeners = 0;
|
|
|
ebde72 |
const char* proto;
|
|
|
ebde72 |
int found;
|
|
|
ebde72 |
+#ifdef HAVE_SYSTEMD
|
|
|
ebde72 |
+ APR_OPTIONAL_FN_TYPE(ap_systemd_listen_fds) *systemd_listen_fds;
|
|
|
ebde72 |
+#endif
|
|
|
ebde72 |
|
|
|
ebde72 |
for (ls = s; ls; ls = ls->next) {
|
|
|
ebde72 |
proto = ap_get_server_protocol(ls);
|
|
|
ebde72 |
@@ -746,7 +724,10 @@ AP_DECLARE(int) ap_setup_listeners(server_rec *s)
|
|
|
ebde72 |
apr_pool_cleanup_null, s->process->pool);
|
|
|
ebde72 |
}
|
|
|
ebde72 |
else {
|
|
|
ebde72 |
- sd_listen_fds(1);
|
|
|
ebde72 |
+ systemd_listen_fds = APR_RETRIEVE_OPTIONAL_FN(ap_systemd_listen_fds);
|
|
|
ebde72 |
+ if (systemd_listen_fds != NULL) {
|
|
|
ebde72 |
+ systemd_listen_fds(1);
|
|
|
ebde72 |
+ }
|
|
|
ebde72 |
}
|
|
|
ebde72 |
}
|
|
|
ebde72 |
else
|
|
|
ebde72 |
@@ -963,6 +944,9 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
|
|
|
ebde72 |
apr_port_t port;
|
|
|
ebde72 |
apr_status_t rv;
|
|
|
ebde72 |
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
|
|
|
ebde72 |
+#ifdef HAVE_SYSTEMD
|
|
|
ebde72 |
+ APR_OPTIONAL_FN_TYPE(ap_systemd_listen_fds) *systemd_listen_fds;
|
|
|
ebde72 |
+#endif
|
|
|
ebde72 |
|
|
|
ebde72 |
if (err != NULL) {
|
|
|
ebde72 |
return err;
|
|
|
ebde72 |
@@ -973,7 +957,12 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
|
|
|
ebde72 |
}
|
|
|
ebde72 |
#ifdef HAVE_SYSTEMD
|
|
|
ebde72 |
if (use_systemd == -1) {
|
|
|
ebde72 |
- use_systemd = sd_listen_fds(0) > 0;
|
|
|
ebde72 |
+ systemd_listen_fds = APR_RETRIEVE_OPTIONAL_FN(ap_systemd_listen_fds);
|
|
|
ebde72 |
+ if (systemd_listen_fds != NULL) {
|
|
|
ebde72 |
+ use_systemd = systemd_listen_fds(0) > 0;
|
|
|
ebde72 |
+ } else {
|
|
|
ebde72 |
+ use_systemd = 0;
|
|
|
ebde72 |
+ }
|
|
|
ebde72 |
}
|
|
|
ebde72 |
#endif
|
|
|
ebde72 |
|