httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Guenter Knauf <fua...@apache.org>
Subject Re: svn commit: r791498 - in /httpd/httpd/trunk/modules/experimental: NWGNUmakefile mod_noloris.c
Date Mon, 06 Jul 2009 14:51:14 GMT
Hi Nick,
please correct me if I'm worng ....

G√ľnter.

fuankg@apache.org schrieb:
> Author: fuankg
> Date: Mon Jul  6 14:48:23 2009
> New Revision: 791498
> 
> URL: http://svn.apache.org/viewvc?rev=791498&view=rev
> Log:
> fixed var name, fixed memset parameter,
> changed to ap_get_scoreboard_worker_from_indexes()
> 
> Modified:
>     httpd/httpd/trunk/modules/experimental/NWGNUmakefile
>     httpd/httpd/trunk/modules/experimental/mod_noloris.c
> 
> Modified: httpd/httpd/trunk/modules/experimental/mod_noloris.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/experimental/mod_noloris.c?rev=791498&r1=791497&r2=791498&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/experimental/mod_noloris.c (original)
> +++ httpd/httpd/trunk/modules/experimental/mod_noloris.c Mon Jul  6 14:48:23 2009
> @@ -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 @@
>  
>              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 @@
>      /* 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 @@
>       * 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)) {
> 
> 
> 



Mime
View raw message