9 files changed, 60 insertions, 4 deletions
diff --git a/include/ap_config_auto.h.in b/include/ap_config_auto.h.in
index 246c5302..95323f08 100644
--- a/include/ap_config_auto.h.in
+++ b/include/ap_config_auto.h.in
@@ -61,6 +61,9 @@
 /* Define to 1 if you have the `getgrnam' function. */
 #undef HAVE_GETGRNAM
 
+/* Define to 1 if you have the `getpgid' function. */
+#undef HAVE_GETPGID
+
 /* Define to 1 if you have the `getpwnam' function. */
 #undef HAVE_GETPWNAM
 
diff --git a/include/ap_listen.h b/include/ap_listen.h
index a652128b..b623495b 100644
--- a/include/ap_listen.h
+++ b/include/ap_listen.h
@@ -30,6 +30,10 @@
 #include "httpd.h"
 #include "http_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct ap_listen_rec ap_listen_rec;
 typedef apr_status_t (*accept_function)(void **csd, ap_listen_rec *lr, apr_pool_t *ptrans);
 
@@ -115,5 +119,9 @@ AP_INIT_TAKE1("SendBufferSize", ap_set_send_buffer_size, NULL, RSRC_CONF, \
 AP_INIT_TAKE1("ReceiveBufferSize", ap_set_receive_buffer_size, NULL, \
               RSRC_CONF, "Receive buffer size in bytes")
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /** @} */
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 9d8d89cd..95871f1b 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -113,6 +113,8 @@
  * 20051115.3 (2.2.3)  Added server_scheme member to server_rec (minor)
  * 20051115.4 (2.2.4)  Added ap_get_server_banner() and
  *                         ap_get_server_description() (minor)
+ * 20051115.5 (2.2.5)  Added ap_mpm_safe_kill() (minor)
+ *
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503232UL /* "AP22" */
@@ -120,7 +122,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20051115
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 4                     /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 5                     /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/include/ap_mpm.h b/include/ap_mpm.h
index 107a8c08..713f97d8 100644
--- a/include/ap_mpm.h
+++ b/include/ap_mpm.h
@@ -28,6 +28,10 @@
 
 #include "apr_thread_proc.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
     The MPM, "multi-processing model" provides an abstraction of the
     interface with the OS for distributing incoming connections to
@@ -179,5 +183,9 @@ typedef struct ap_exception_info_t {
 AP_DECLARE_HOOK(int,fatal_exception,(ap_exception_info_t *ei))
 #endif /*AP_ENABLE_EXCEPTION_HOOK*/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /** @} */
diff --git a/include/ap_provider.h b/include/ap_provider.h
index e54b9188..adfc69ca 100644
--- a/include/ap_provider.h
+++ b/include/ap_provider.h
@@ -28,6 +28,10 @@
 
 #include "ap_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
     const char *provider_name;
 } ap_list_provider_names_t;
@@ -74,5 +78,9 @@ AP_DECLARE(apr_array_header_t *) ap_list_provider_names(apr_pool_t *pool,
                                               const char *provider_group,
                                               const char *provider_version);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /** @} */
diff --git a/include/ap_release.h b/include/ap_release.h
index 4b0e73ab..1777fd05 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -25,7 +25,7 @@
 #include "apr_general.h" /* stringify */
 
 #define AP_SERVER_COPYRIGHT \
-    "Copyright 2006 The Apache Software Foundation."
+    "Copyright 2007 The Apache Software Foundation."
 
 /*
  * The below defines the base string of the Server: header. Additional
@@ -45,7 +45,7 @@
 
 #define AP_SERVER_MAJORVERSION_NUMBER 2
 #define AP_SERVER_MINORVERSION_NUMBER 2
-#define AP_SERVER_PATCHLEVEL_NUMBER   4
+#define AP_SERVER_PATCHLEVEL_NUMBER   6
 #define AP_SERVER_DEVBUILD_BOOLEAN    0
 
 #if AP_SERVER_DEVBUILD_BOOLEAN
diff --git a/include/mpm_common.h b/include/mpm_common.h
index bc4480a7..bacf76f2 100644
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -145,6 +145,19 @@ int ap_unregister_extra_mpm_process(pid_t pid);
 #endif
 
 /**
+ * Safely signal an MPM child process, if the process is in the
+ * current process group.  Otherwise fail.
+ * @param pid the process id of a child process to signal
+ * @param sig the signal number to send
+ * @return APR_SUCCESS if signal is sent, otherwise an error as per kill(3);
+ * APR_EINVAL is returned if passed either an invalid (< 1) pid, or if
+ * the pid is not in the current process group
+ */
+#ifdef AP_MPM_WANT_RECLAIM_CHILD_PROCESSES
+apr_status_t ap_mpm_safe_kill(pid_t pid, int sig);
+#endif
+
+/**
  * Determine if any child process has died.  If no child process died, then
  * this process sleeps for the amount of time specified by the MPM defined
  * macro SCOREBOARD_MAINTENANCE_INTERVAL.
diff --git a/include/util_cfgtree.h b/include/util_cfgtree.h
index 78df416d..58673f6e 100644
--- a/include/util_cfgtree.h
+++ b/include/util_cfgtree.h
@@ -28,6 +28,10 @@
 
 #include "ap_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct ap_directive_t ap_directive_t;
 
 /**
@@ -83,5 +87,9 @@ AP_DECLARE_DATA extern ap_directive_t *ap_conftree;
 ap_directive_t *ap_add_node(ap_directive_t **parent, ap_directive_t *current, 
                             ap_directive_t *toadd, int child);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /** @} */
diff --git a/include/util_ldap.h b/include/util_ldap.h
index d6c034ee..f0dca264 100644
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -69,6 +69,10 @@
 #define LDAP_DECLARE_DATA             __declspec(dllimport)
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * LDAP Connections
  */
@@ -323,6 +327,8 @@ apr_status_t util_ldap_cache_init(apr_pool_t *pool, util_ldap_state_t *st);
  * @deffunc char *util_ald_cache_display(apr_pool_t *pool, util_ldap_state_t *st)
  */
 char *util_ald_cache_display(request_rec *r, util_ldap_state_t *st);
-
+#ifdef __cplusplus
+}
+#endif
 #endif /* APR_HAS_LDAP */
 #endif /* UTIL_LDAP_H */