mod_auth_anon logs multiple times

PR:	421, 868
Submitted by:	Dean Gaudet
Reviewed by:	Ralf S. Engelschall, Dirk v.Gulik, Ken Coar, Jim Jagielski

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

diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES
index ae52529fde743fb4025c2ffde17d2c42c9ab1b78..474976dfab6bc065d50840d548cc811b7cd6df3d 100644 (file)
--- a/APACHE_1_2_X/src/CHANGES
+++ b/APACHE_1_2_X/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.2.2
 
+  *) Anonymous_LogEmail was logging on each subrequest.
+     [Dean Gaudet] PR#421, PR#868
+
   *) "force-response-1.0" now only applies to requests which are HTTP/1.0 to
      begin with.  "nokeepalive" now works for HTTP/1.1 clients.  Added
      "downgrade-1.0" which causes Apache to pretend it received a 1.0.

diff --git a/APACHE_1_2_X/src/modules/standard/mod_auth_anon.c b/APACHE_1_2_X/src/modules/standard/mod_auth_anon.c
index 2a979e6111648557db1230872770885468c1dbf6..2bb90b4d823fefd4d48eea954fb98ff6c61d62dd 100644 (file)
--- a/APACHE_1_2_X/src/modules/standard/mod_auth_anon.c
+++ b/APACHE_1_2_X/src/modules/standard/mod_auth_anon.c
@@ -239,7 +239,7 @@ int anon_authenticate_basic_user (request_rec *r)
              (strpbrk(".",send_pw) != NULL))
          ) 
        ) {
-      if (sec->auth_anon_logemail) {
+      if (sec->auth_anon_logemail && r->prev == NULL && r->main == NULL) {
        ap_snprintf(errstr, sizeof(errstr), "Anonymous: Passwd <%s> Accepted", 
                        send_pw ? send_pw : "\'none\'");
        log_error (errstr, r->server );