fixed var name, fixed memset parameter,

changed to ap_get_scoreboard_worker_from_indexes()

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

diff --git a/modules/experimental/NWGNUmakefile b/modules/experimental/NWGNUmakefile
index bab8af4a14dc48767ce6ca8d8accca456d95b061..641f3976170a7695011f360c29238719f981ce8f 100644 (file)
--- a/modules/experimental/NWGNUmakefile
+++ b/modules/experimental/NWGNUmakefile
@@ -160,6 +160,8 @@ XDCDATA             =
 # it twice to allow it parent NWGNUmakefile to work properly.  If another
 # submakefile is added, the extra reference to substitute.nlm should be removed.
 TARGET_nlm = \
+       $(OBJDIR)/noloris.nlm \
+       $(OBJDIR)/noloris.nlm \
        $(EOLIST)
 
 #

diff --git a/modules/experimental/mod_noloris.c b/modules/experimental/mod_noloris.c
index eb4ac731f74f3398d79f447278a83ba5593bc85b..6baa8933bdf9b76e3b6578c5d0e64fb7de0a8bb8 100644 (file)
--- a/modules/experimental/mod_noloris.c
+++ b/modules/experimental/mod_noloris.c
@@ -40,6 +40,7 @@
 #include "mpm_common.h"
 #include "ap_mpm.h"
 #include "apr_hash.h"
+#include "scoreboard.h"
 
 module AP_MODULE_DECLARE_DATA noloris_module;
 module AP_MODULE_DECLARE_DATA core_module;
@@ -83,7 +84,7 @@ static int noloris_conn(conn_rec *conn)
 
             return DONE;
         }
-        shm_rec += MAX_ADDR_SIZE;
+        shm_rec += ADDR_MAX_SIZE;
     }
 
     /* store this client IP for the monitor to pick up */
@@ -134,7 +135,7 @@ static int noloris_monitor(apr_pool_t *pool)
     /* Get a per-client count of connections in READ state */
     for (i = 0; i < server_limit; ++i) {
         for (j = 0; j < thread_limit; ++j) {
-            ws = ap_get_scoreboard_worker(i, j);
+            ws = ap_get_scoreboard_worker_from_indexes(i, j);
             if (ws->status == SERVER_BUSY_READ) {
                 n = apr_hash_get(connections, ws->client, APR_HASH_KEY_STRING);
                 if (n == NULL) {
@@ -152,7 +153,7 @@ static int noloris_monitor(apr_pool_t *pool)
      * with our prospective readers
      */
     shm_rec = apr_shm_baseaddr_get(shm);
-    memset(shm_rec, NULL, shm_size);
+    memset(shm_rec, 0, shm_size);
 
     /* Now check the hash for clients with too many connections in READ state */
     for (hi = apr_hash_first(NULL, connections); hi; hi = apr_hash_next(hi)) {