| 995ae4a3 |
1 | --- mod_watch-3.13/mod_watch.c Sun Aug 4 16:10:50 2002 |
| 2 | +++ mod_watch.c Fri Aug 30 11:51:22 2002 |
| 3 | @@ -719,8 +719,14 @@ |
| d3fcef78 |
4 | struct watchConfDir *dconf; |
| 5 | |
| 6 | /* Do not count if the connection is excluded. */ |
| 995ae4a3 |
7 | +#ifdef INET6 |
| 8 | + if (r->connection->remote_addr.ss_family != AF_INET |
| 9 | + || ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr) |
| d3fcef78 |
10 | + && !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)) |
| 995ae4a3 |
11 | +#else |
| 12 | if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr) |
| 13 | && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr)) |
| 14 | +#endif |
| d3fcef78 |
15 | return DECLINED; |
| 16 | |
| 17 | /* ap_register_cleanup(r->pool, r, watchClean, ap_null_cleanup); */ |
| 995ae4a3 |
18 | @@ -831,8 +837,14 @@ |
| d3fcef78 |
19 | } |
| 20 | |
| 21 | /* Do not count if the connection is excluded. */ |
| 995ae4a3 |
22 | +#ifdef INET6 |
| 23 | + if (r->connection->remote_addr.ss_family != AF_INET |
| 24 | + || ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr) |
| d3fcef78 |
25 | + && !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)) |
| 995ae4a3 |
26 | +#else |
| 27 | if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr) |
| 28 | && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr)) |
| 29 | +#endif |
| d3fcef78 |
30 | return DECLINED; |
| 31 | |
| 32 | /* Find last sub-request for bytes actually sent. */ |
projects / packages / apache1-mod_watch.git / blame