From: Jim Jagielski <jim@apache.org>
Date: Mon, 24 Sep 2012 20:59:09 +0000 (+0000)
Subject: Document these new funcs and make it API aware
X-Git-Tag: 2.5.0-alpha~6269
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=176e7b84708843702d20d89f25cf9f8663683362;p=apache

Document these new funcs and make it API aware


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1389573 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index d9b909308f..1ec0a24b1d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) core: New functions to obtain load parameters: ap_get_sload()
+     and ap_get_loadavg(). [Jim Jagielski]
+
   *) mod_cache_socache: New cache implementation backed by mod_socache
      that replaces mod_mem_cache removed from httpd v2.2. [Graham
      Leggett]
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 01c750f12c..69e580215c 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -402,6 +402,7 @@
  * 20120724.2 (2.5.0-dev)  Add fgrab slotmem function to struct
  * 20120724.3 (2.5.0-dev)  Add bal_persist, inherit to proxy_server_conf
  * 20120724.4 (2.5.0-dev)  Add dirwalk_stat hook.
+ * 20120724.5 (2.5.0-dev)  Add ap_get_sload() and ap_get_loadavg().
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
@@ -409,7 +410,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20120724
 #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