diff options
| author | radek | 2002-08-30 10:19:18 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 995ae4a314b39849a81a9667b9296d5a78816e21 (patch) | |
| tree | 97ed2e475d99e8abdfe28a729bd4458def090b41 | |
| parent | 80374069f480d0960db673ca16fc8ba298359c1e (diff) | |
| download | apache1-mod_watch-995ae4a314b39849a81a9667b9296d5a78816e21.zip apache1-mod_watch-995ae4a314b39849a81a9667b9296d5a78816e21.tar.gz | |
- better (?) IPv6 handling
Changed files:
apache-mod_watch-PLD-v6stuff.patch -> 1.2
apache1-mod_watch-PLD-v6stuff.patch -> 1.2
| -rw-r--r-- | apache-mod_watch-PLD-v6stuff.patch | 28 | ||||
| -rw-r--r-- | apache1-mod_watch-PLD-v6stuff.patch | 28 |
2 files changed, 36 insertions, 20 deletions
diff --git a/apache-mod_watch-PLD-v6stuff.patch b/apache-mod_watch-PLD-v6stuff.patch index 4500895..5022123 100644 --- a/apache-mod_watch-PLD-v6stuff.patch +++ b/apache-mod_watch-PLD-v6stuff.patch @@ -1,24 +1,32 @@ ---- mod_watch.c Sun Aug 4 16:10:50 2002 -+++ mod_watch.c.new Thu Aug 29 21:26:09 2002 -@@ -719,8 +719,8 @@ +--- mod_watch-3.13/mod_watch.c Sun Aug 4 16:10:50 2002 ++++ mod_watch.c Fri Aug 30 11:51:22 2002 +@@ -719,8 +719,14 @@ struct watchConfDir *dconf; /* Do not count if the connection is excluded. */ -- if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr) -- && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr)) -+ if (ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr) ++#ifdef INET6 ++ if (r->connection->remote_addr.ss_family != AF_INET ++ || ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr) + && !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)) ++#else + if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr) + && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr)) ++#endif return DECLINED; /* ap_register_cleanup(r->pool, r, watchClean, ap_null_cleanup); */ -@@ -831,8 +831,8 @@ +@@ -831,8 +837,14 @@ } /* Do not count if the connection is excluded. */ -- if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr) -- && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr)) -+ if (ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr) ++#ifdef INET6 ++ if (r->connection->remote_addr.ss_family != AF_INET ++ || ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr) + && !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)) ++#else + if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr) + && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr)) ++#endif return DECLINED; /* Find last sub-request for bytes actually sent. */ diff --git a/apache1-mod_watch-PLD-v6stuff.patch b/apache1-mod_watch-PLD-v6stuff.patch index 4500895..5022123 100644 --- a/apache1-mod_watch-PLD-v6stuff.patch +++ b/apache1-mod_watch-PLD-v6stuff.patch @@ -1,24 +1,32 @@ ---- mod_watch.c Sun Aug 4 16:10:50 2002 -+++ mod_watch.c.new Thu Aug 29 21:26:09 2002 -@@ -719,8 +719,8 @@ +--- mod_watch-3.13/mod_watch.c Sun Aug 4 16:10:50 2002 ++++ mod_watch.c Fri Aug 30 11:51:22 2002 +@@ -719,8 +719,14 @@ struct watchConfDir *dconf; /* Do not count if the connection is excluded. */ -- if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr) -- && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr)) -+ if (ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr) ++#ifdef INET6 ++ if (r->connection->remote_addr.ss_family != AF_INET ++ || ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr) + && !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)) ++#else + if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr) + && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr)) ++#endif return DECLINED; /* ap_register_cleanup(r->pool, r, watchClean, ap_null_cleanup); */ -@@ -831,8 +831,8 @@ +@@ -831,8 +837,14 @@ } /* Do not count if the connection is excluded. */ -- if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr) -- && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr)) -+ if (ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr) ++#ifdef INET6 ++ if (r->connection->remote_addr.ss_family != AF_INET ++ || ntIsMember(networkExcludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr) + && !ntIsMember(networkIncludeList, &((struct sockaddr_in *)&r->connection->remote_addr)->sin_addr)) ++#else + if (ntIsMember(networkExcludeList, &r->connection->remote_addr.sin_addr) + && !ntIsMember(networkIncludeList, &r->connection->remote_addr.sin_addr)) ++#endif return DECLINED; /* Find last sub-request for bytes actually sent. */ |