httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/os/unix unixd.c
Date Fri, 17 May 2002 11:33:10 GMT
trawick     02/05/17 04:33:10

  Modified:    modules/aaa mod_access.c mod_auth.c mod_auth_anon.c
                        mod_auth_dbm.c mod_auth_digest.c
               modules/arch/win32 mod_isapi.c mod_win32.c
               modules/cache mod_file_cache.c
               modules/dav/main mod_dav.c util_lock.c
               modules/experimental mod_cache.c mod_charset_lite.c
                        mod_disk_cache.c mod_ext_filter.c mod_mem_cache.c
               modules/filters mod_deflate.c mod_include.c
               modules/generators mod_asis.c mod_autoindex.c mod_cgi.c
                        mod_cgid.c mod_status.c mod_suexec.c
               modules/http http_protocol.c http_request.c
               modules/metadata mod_cern_meta.c mod_env.c mod_expires.c
                        mod_headers.c mod_mime_magic.c mod_unique_id.c
               os/beos  beosd.c
               os/bs2000 bs2login.c
               os/unix  unixd.c
  Log:
  stop using APLOG_NOERRNO in calls to ap_log_[pr]error()
  
  Revision  Changes    Path
  1.38      +1 -1      httpd-2.0/modules/aaa/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_access.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- mod_access.c	13 Mar 2002 20:47:44 -0000	1.37
  +++ mod_access.c	17 May 2002 11:33:08 -0000	1.38
  @@ -321,7 +321,7 @@
   
       if (ret == HTTP_FORBIDDEN
           && (ap_satisfies(r) != SATISFY_ANY || !ap_some_auth_required(r))) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
               "client denied by server configuration: %s",
               r->filename);
       }
  
  
  
  1.39      +4 -4      httpd-2.0/modules/aaa/mod_auth.c
  
  Index: mod_auth.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_auth.c	13 Mar 2002 20:47:44 -0000	1.38
  +++ mod_auth.c	17 May 2002 11:33:08 -0000	1.39
  @@ -229,14 +229,14 @@
           if (!(conf->auth_authoritative)) {
               return DECLINED;
           }
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "user %s not found: %s", r->user, r->uri);
           ap_note_basic_auth_failure(r);
           return HTTP_UNAUTHORIZED;
       }
       invalid_pw = apr_password_validate(sent_pw, real_pw);
       if (invalid_pw != APR_SUCCESS) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "user %s: authentication failure for \"%s\": "
                         "Password Mismatch",
                         r->user, r->uri);
  @@ -316,7 +316,7 @@
                * That something could be a missing "AuthAuthoritative off", but
                * more likely is a typo in the require directive.
                */
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "access to %s failed, reason: unknown require "
                             "directive:\"%s\"", r->uri, reqs[x].requirement);
           }
  @@ -330,7 +330,7 @@
           return DECLINED;
       }
   
  -    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                     "access to %s failed, reason: user %s not allowed access",
                     r->uri, user);
           
  
  
  
  1.31      +2 -2      httpd-2.0/modules/aaa/mod_auth_anon.c
  
  Index: mod_auth_anon.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_anon.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- mod_auth_anon.c	13 Mar 2002 20:47:44 -0000	1.30
  +++ mod_auth_anon.c	17 May 2002 11:33:08 -0000	1.31
  @@ -224,7 +224,7 @@
   	       || ((strpbrk("@", sent_pw) != NULL)
   		   && (strpbrk(".", sent_pw) != NULL)))) {
   	if (conf->anon_auth_logemail && ap_is_initial_req(r)) {
  -	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, APR_SUCCESS, r,
  +	    ap_log_rerror(APLOG_MARK, APLOG_INFO, APR_SUCCESS, r,
   			"Anonymous: Passwd <%s> Accepted",
   			sent_pw ? sent_pw : "\'none\'");
   	}
  @@ -232,7 +232,7 @@
       }
       else {
   	if (conf->anon_auth_authoritative) {
  -	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, APR_SUCCESS, r,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_SUCCESS, r,
   			"Anonymous: Authoritative, Passwd <%s> not accepted",
   			sent_pw ? sent_pw : "\'none\'");
   	    return HTTP_UNAUTHORIZED;
  
  
  
  1.44      +4 -4      httpd-2.0/modules/aaa/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_dbm.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- mod_auth_dbm.c	13 Mar 2002 20:47:44 -0000	1.43
  +++ mod_auth_dbm.c	17 May 2002 11:33:08 -0000	1.44
  @@ -231,7 +231,7 @@
                                  conf->auth_dbmtype))) {
           if (!(conf->auth_dbmauthoritative))
               return DECLINED;
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "DBM user %s not found: %s", r->user, r->filename);
           ap_note_basic_auth_failure(r);
           return HTTP_UNAUTHORIZED;
  @@ -243,7 +243,7 @@
       }
       invalid_pw = apr_password_validate(sent_pw, real_pw);
       if (invalid_pw != APR_SUCCESS) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "DBM user %s: authentication failure for \"%s\": "
                         "Password Mismatch",
                         r->user, r->uri);
  @@ -290,7 +290,7 @@
                                          conf->auth_dbmtype))) {
                   if (!(conf->auth_dbmauthoritative))
                       return DECLINED;
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "user %s not in DBM group file %s: %s",
                               user, conf->auth_dbmgrpfile, r->filename);
                   ap_note_basic_auth_failure(r);
  @@ -306,7 +306,7 @@
                           return OK;
                   }
               }
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "user %s not in right group: %s",
                             user, r->filename);
               ap_note_basic_auth_failure(r);
  
  
  
  1.64      +34 -34    httpd-2.0/modules/aaa/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.c,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- mod_auth_digest.c	2 May 2002 22:03:58 -0000	1.63
  +++ mod_auth_digest.c	17 May 2002 11:33:08 -0000	1.64
  @@ -239,7 +239,7 @@
   
   static apr_status_t cleanup_tables(void *not_used)
   {
  -    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
  +    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 
                     "Digest: cleaning up shared memory");
       fflush(stderr);
   
  @@ -265,7 +265,7 @@
   {
       apr_status_t status;
   
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s,
  +    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
                    "Digest: generating secret for digest authentication ...");
   
   #if APR_HAS_RANDOM
  @@ -282,7 +282,7 @@
           return status;
       }
   
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "Digest: done");
  +    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s, "Digest: done");
   
       return APR_SUCCESS;
   }
  @@ -510,7 +510,7 @@
       }
   
       if (!strcasecmp(op, "auth-int")) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, cmd->server,
  +        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
                        "Digest: WARNING: qop `auth-int' currently only works "
                        "correctly for responses with no entity");
       }
  @@ -557,7 +557,7 @@
   static const char *set_nc_check(cmd_parms *cmd, void *config, int flag)
   {
       if (flag && !client_shm)
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0,
  +        ap_log_error(APLOG_MARK, APLOG_WARNING, 0,
                        cmd->server, "Digest: WARNING: nonce-count checking "
                        "is not supported on platforms without shared-memory "
                        "support - disabling check");
  @@ -570,7 +570,7 @@
   {
       if (!strcasecmp(alg, "MD5-sess")) {
           if (!client_shm) {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0,
  +            ap_log_error(APLOG_MARK, APLOG_WARNING, 0,
                            cmd->server, "Digest: WARNING: algorithm `MD5-sess' "
                            "is not supported on platforms without shared-memory "
                            "support - reverting to MD5");
  @@ -632,7 +632,7 @@
       if (num_buckets == 0) {
           num_buckets = 1;
       }
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, 0, cmd->server,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,
                    "Digest: Set shmem-size: %ld, num-buckets: %ld", shmem_size,
                    num_buckets);
   
  @@ -748,11 +748,11 @@
       apr_global_mutex_unlock(client_lock);
   
       if (entry) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                         "get_client(): client %lu found", key);
       }
       else {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                         "get_client(): client %lu not found", key);
       }
   
  @@ -824,7 +824,7 @@
       entry = (client_entry *)apr_rmm_malloc(client_rmm, sizeof(client_entry));
       if (!entry) {
           long num_removed = gc();
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, s,
  +        ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
                        "Digest: gc'd %ld client entries. Total new clients: "
                        "%ld; Total removed clients: %ld; Total renewed clients: "
                        "%ld", num_removed,
  @@ -847,7 +847,7 @@
   
       apr_global_mutex_unlock(client_lock);
   
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, 0, s,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
                    "allocated new client %lu", key);
   
       return entry;
  @@ -1466,7 +1466,7 @@
   
       nc = strtol(snc, &endptr, 16);
       if (endptr < (snc+strlen(snc)) && !apr_isspace(*endptr)) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Digest: invalid nc %s received - not a number", snc);
           return !OK;
       }
  @@ -1476,7 +1476,7 @@
       }
   
       if (nc != resp->client->nonce_count) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Digest: Warning, possible replay attack: nonce-count "
                         "check failed: %lu != %lu", nc,
                         resp->client->nonce_count);
  @@ -1495,7 +1495,7 @@
       char tmp, hash[NONCE_HASH_LEN+1];
   
       if (strlen(resp->nonce) != NONCE_LEN) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Digest: invalid nonce %s received - length is not %d",
                         resp->nonce, NONCE_LEN);
           note_digest_auth_failure(r, conf, resp, 1);
  @@ -1510,7 +1510,7 @@
       resp->nonce_time = nonce_time.time;
   
       if (strcmp(hash, resp->nonce+NONCE_TIME_LEN)) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Digest: invalid nonce %s received - hash is not %s",
                         resp->nonce, hash);
           note_digest_auth_failure(r, conf, resp, 1);
  @@ -1519,7 +1519,7 @@
   
       dt = r->request_time - nonce_time.time;
       if (conf->nonce_lifetime > 0 && dt < 0) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Digest: invalid nonce %s received - user attempted "
                         "time travel", resp->nonce);
           note_digest_auth_failure(r, conf, resp, 1);
  @@ -1528,7 +1528,7 @@
   
       if (conf->nonce_lifetime > 0) {
           if (dt > conf->nonce_lifetime) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0,r,
  +            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0,r,
                             "Digest: user %s: nonce expired (%.2f seconds old "
                             "- max lifetime %.2f) - sending new nonce", 
                             r->user, ((double)dt)/APR_USEC_PER_SEC, 
  @@ -1539,7 +1539,7 @@
       }
       else if (conf->nonce_lifetime == 0 && resp->client) {
           if (memcmp(resp->client->last_nonce, resp->nonce, NONCE_LEN)) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
                             "Digest: user %s: one-time-nonce mismatch - sending "
                             "new nonce", r->user);
               note_digest_auth_failure(r, conf, resp, 1);
  @@ -1672,7 +1672,7 @@
       }
   
       if (!ap_auth_name(r)) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Digest: need AuthName: %s", r->uri);
           return HTTP_INTERNAL_SERVER_ERROR;
       }
  @@ -1702,12 +1702,12 @@
   
       if (resp->auth_hdr_sts != VALID) {
           if (resp->auth_hdr_sts == NOT_DIGEST) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Digest: client used wrong authentication scheme "
                             "`%s': %s", resp->scheme, r->uri);
           }
           else if (resp->auth_hdr_sts == INVALID) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Digest: missing user, realm, nonce, uri, digest, "
                             "cnonce, or nonce_count in authorization header: %s",
                             r->uri);
  @@ -1730,7 +1730,7 @@
   
           copy_uri_components(&r_uri, resp->psd_request_uri, r);
           if (apr_uri_parse(r->pool, resp->uri, &d_uri) != APR_SUCCESS) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Digest: invalid uri <%s> in Authorization header",
                             resp->uri);
               return HTTP_BAD_REQUEST;
  @@ -1748,7 +1748,7 @@
   
           if (r->method_number == M_CONNECT) {
               if (strcmp(resp->uri, r_uri.hostinfo)) {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                 "Digest: uri mismatch - <%s> does not match "
                                 "request-uri <%s>", resp->uri, r_uri.hostinfo);
                   return HTTP_BAD_REQUEST;
  @@ -1776,7 +1776,7 @@
                   && (!d_uri.query || !r_uri.query
                       || strcmp(d_uri.query, r_uri.query)))
               ) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Digest: uri mismatch - <%s> does not match "
                             "request-uri <%s>", resp->uri, resp->raw_request_uri);
               return HTTP_BAD_REQUEST;
  @@ -1784,7 +1784,7 @@
       }
   
       if (resp->opaque && resp->opaque_num == 0) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Digest: received invalid opaque - got `%s'",
                         resp->opaque);
           note_digest_auth_failure(r, conf, resp, 0);
  @@ -1792,7 +1792,7 @@
       }
   
       if (strcmp(resp->realm, conf->realm)) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Digest: realm mismatch - got `%s' but expected `%s'",
                         resp->realm, conf->realm);
           note_digest_auth_failure(r, conf, resp, 0);
  @@ -1802,7 +1802,7 @@
       if (resp->algorithm != NULL
           && strcasecmp(resp->algorithm, "MD5")
           && strcasecmp(resp->algorithm, "MD5-sess")) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Digest: unknown algorithm `%s' received: %s",
                         resp->algorithm, r->uri);
           note_digest_auth_failure(r, conf, resp, 0);
  @@ -1814,7 +1814,7 @@
       }
   
       if (!(conf->ha1 = get_hash(r, r->user, conf->realm, conf->pwfile))) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Digest: user `%s' in realm `%s' not found: %s",
                         r->user, conf->realm, r->uri);
           note_digest_auth_failure(r, conf, resp, 0);
  @@ -1825,7 +1825,7 @@
       if (resp->message_qop == NULL) {
           /* old (rfc-2069) style digest */
           if (strcmp(resp->digest, old_digest(r, resp, conf->ha1))) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Digest: user %s: password mismatch: %s", r->user,
                             r->uri);
               note_digest_auth_failure(r, conf, resp, 0);
  @@ -1845,7 +1845,7 @@
           if (!match
               && !(conf->qop_list[0] == NULL
                    && !strcasecmp(resp->message_qop, "auth"))) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Digest: invalid qop `%s' received: %s",
                             resp->message_qop, r->uri);
               note_digest_auth_failure(r, conf, resp, 0);
  @@ -1858,7 +1858,7 @@
               return HTTP_INTERNAL_SERVER_ERROR;
           }
           if (strcmp(resp->digest, exp_digest)) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Digest: user %s: password mismatch: %s", r->user,
                             r->uri);
               note_digest_auth_failure(r, conf, resp, 0);
  @@ -1996,7 +1996,7 @@
               }
           }
           else {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Digest: access to %s failed, reason: unknown "
                             "require directive \"%s\"",
                             r->uri, reqs[x].requirement);
  @@ -2008,7 +2008,7 @@
           return OK;
       }
   
  -    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                     "Digest: access to %s failed, reason: user %s not "
                     "allowed access", r->uri, user);
   
  @@ -2135,7 +2135,7 @@
           if (resp->algorithm && !strcasecmp(resp->algorithm, "MD5-sess")) {
               ha1 = get_session_HA1(r, resp, conf, 0);
               if (!ha1) {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                 "Digest: internal error: couldn't find session "
                                 "info for user %s", resp->username);
                   return !OK;
  
  
  
  1.74      +16 -16    httpd-2.0/modules/arch/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/win32/mod_isapi.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- mod_isapi.c	15 May 2002 23:29:03 -0000	1.73
  +++ mod_isapi.c	17 May 2002 11:33:08 -0000	1.74
  @@ -189,7 +189,7 @@
   	return NULL;
       }
       if (tmp.filetype != APR_REG) {
  -	ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, cmd->server,
  +	ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
   	    "ISAPI: not a regular file, skipping %s", fspec);
   	return NULL;
       }
  @@ -900,7 +900,7 @@
   
       case HSE_REQ_GET_SSPI_INFO:
           if (cid->dconf.log_unsupported)
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                              "ISAPI: ServerSupportFunction HSE_REQ_GET_SSPI_INFO "
                              "is not supported: %s", r->filename);
           SetLastError(ERROR_INVALID_PARAMETER);
  @@ -917,7 +917,7 @@
                   r->args = apr_pstrdup(r->pool, (char*) buf_data);
           }
           if (cid->dconf.log_to_errlog)
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
                             "ISAPI: %s: %s", cid->r->filename,
                             (char*) buf_data);
           return 1;
  @@ -935,7 +935,7 @@
               return 1;
           }
           if (cid->dconf.log_unsupported)
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                         "ISAPI: ServerSupportFunction HSE_REQ_IO_COMPLETION "
                         "is not supported: %s", r->filename);
           SetLastError(ERROR_INVALID_PARAMETER);
  @@ -956,7 +956,7 @@
   
           if (!cid->dconf.fake_async && (tf->dwFlags & HSE_IO_ASYNC)) {
               if (cid->dconf.log_unsupported)
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                            "ISAPI: ServerSupportFunction HSE_REQ_TRANSMIT_FILE "
                            "as HSE_IO_ASYNC is not supported: %s", r->filename);
               SetLastError(ERROR_INVALID_PARAMETER);
  @@ -1080,7 +1080,7 @@
   
       case HSE_REQ_REFRESH_ISAPI_ACL:
           if (cid->dconf.log_unsupported)
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                             "ISAPI: ServerSupportFunction "
                             "HSE_REQ_REFRESH_ISAPI_ACL "
                             "is not supported: %s", r->filename);
  @@ -1097,7 +1097,7 @@
           int res;
           if (!cid->dconf.fake_async) {
               if (cid->dconf.log_unsupported) 
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                               "ISAPI: asynchronous I/O not supported: %s", 
                               r->filename);
               SetLastError(ERROR_INVALID_PARAMETER);
  @@ -1129,7 +1129,7 @@
   
       case HSE_REQ_GET_IMPERSONATION_TOKEN:  /* Added in ISAPI 4.0 */
           if (cid->dconf.log_unsupported)
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                             "ISAPI: ServerSupportFunction "
                             "HSE_REQ_GET_IMPERSONATION_TOKEN "
                             "is not supported: %s", r->filename);
  @@ -1207,7 +1207,7 @@
   
       case HSE_REQ_ABORTIVE_CLOSE:
           if (cid->dconf.log_unsupported)
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                             "ISAPI: ServerSupportFunction HSE_REQ_ABORTIVE_CLOSE"
                             " is not supported: %s", r->filename);
           SetLastError(ERROR_INVALID_PARAMETER);
  @@ -1215,7 +1215,7 @@
   
       case HSE_REQ_GET_CERT_INFO_EX:  /* Added in ISAPI 4.0 */
           if (cid->dconf.log_unsupported)
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                             "ISAPI: ServerSupportFunction "
                             "HSE_REQ_GET_CERT_INFO_EX "
                             "is not supported: %s", r->filename);        
  @@ -1253,7 +1253,7 @@
   
       case HSE_REQ_CLOSE_CONNECTION:  /* Added after ISAPI 4.0 */
           if (cid->dconf.log_unsupported)
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                             "ISAPI: ServerSupportFunction "
                             "HSE_REQ_CLOSE_CONNECTION "
                             "is not supported: %s", r->filename);
  @@ -1271,7 +1271,7 @@
           /*  Undocumented - defined by the Microsoft Jan '00 Platform SDK
            */
           if (cid->dconf.log_unsupported)
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                             "ISAPI: ServerSupportFunction "
                             "HSE_REQ_EXTENSION_TRIGGER "
                             "is not supported: %s", r->filename);
  @@ -1280,7 +1280,7 @@
   
       default:
           if (cid->dconf.log_unsupported)
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                             "ISAPI: ServerSupportFunction (%d) not supported: "
                             "%s", HSE_code, r->filename);
           SetLastError(ERROR_INVALID_PARAMETER);
  @@ -1454,7 +1454,7 @@
   
       /* Check for a log message - and log it */
       if (cid->ecb->lpszLogData && *cid->ecb->lpszLogData)
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,
                         "ISAPI: %s: %s", r->filename, cid->ecb->lpszLogData);
   
       switch(rv) {
  @@ -1502,7 +1502,7 @@
                   break;
               }
               else if (cid->dconf.log_unsupported) {
  -                 ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, r,
  +                 ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
                                  "ISAPI: asynch I/O result HSE_STATUS_PENDING "
                                  "from HttpExtensionProc() is not supported: %s",
                                  r->filename);
  @@ -1550,7 +1550,7 @@
       
       loaded.hash = apr_hash_make(loaded.pool);
       if (!loaded.hash) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO, 0, NULL,
  +        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
                        "ISAPI: Failed to create module cache");
           return APR_EGENERAL;
       }
  
  
  
  1.15      +2 -2      httpd-2.0/modules/arch/win32/mod_win32.c
  
  Index: mod_win32.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/win32/mod_win32.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- mod_win32.c	13 Apr 2002 22:34:16 -0000	1.14
  +++ mod_win32.c	17 May 2002 11:33:08 -0000	1.15
  @@ -461,7 +461,7 @@
               *type = APR_PROGRAM_PATH;
           }
           else {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, r->server,
  +            ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
                    strict ? "No ExecCGI verb found for files of type '%s'."
                           : "No ExecCGI or Open verb found for files of type '%s'.", 
                    ext);
  @@ -520,7 +520,7 @@
           }
       }
       if (!interpreter) {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "%s is not executable; ensure interpreted scripts have "
                         "\"#!\" first line", *cmd);
           return APR_EBADF;
  
  
  
  1.72      +4 -4      httpd-2.0/modules/cache/mod_file_cache.c
  
  Index: mod_file_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/cache/mod_file_cache.c,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- mod_file_cache.c	19 Apr 2002 19:16:23 -0000	1.71
  +++ mod_file_cache.c	17 May 2002 11:33:08 -0000	1.72
  @@ -209,12 +209,12 @@
   	return;
       }
       if (tmp.finfo.filetype != APR_REG) {
  -	ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, cmd->server,
  +	ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
   	    "mod_file_cache: %s isn't a regular file, skipping", fspec);
   	return;
       }
       if (tmp.finfo.size > AP_MAX_SENDFILE) {
  -	ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, cmd->server,
  +	ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
   	    "mod_file_cache: %s is too large to cache, skipping", fspec);
   	return;
       }
  @@ -288,7 +288,7 @@
       cache_the_file(cmd, filename, 0);
   #else
       /* Sendfile not supported by this OS */
  -    ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, cmd->server,
  +    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
                    "mod_file_cache: unable to cache file: %s. Sendfile is not supported on this OS", filename);
   #endif
       return NULL;
  @@ -299,7 +299,7 @@
       cache_the_file(cmd, filename, 1);
   #else
       /* MMAP not supported by this OS */
  -    ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, cmd->server,
  +    ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
                    "mod_file_cache: unable to cache file: %s. MMAP is not supported by this OS", filename);
   #endif
       return NULL;
  
  
  
  1.79      +45 -45    httpd-2.0/modules/dav/main/mod_dav.c
  
  Index: mod_dav.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/mod_dav.c,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- mod_dav.c	6 Apr 2002 01:11:50 -0000	1.78
  +++ mod_dav.c	17 May 2002 11:33:08 -0000	1.79
  @@ -214,13 +214,13 @@
       newconf->provider = DAV_INHERIT_VALUE(parent, child, provider);
       if (parent->provider_name != NULL) {
           if (child->provider_name == NULL) {
  -            ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, NULL,
  +            ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
                            "\"DAV Off\" cannot be used to turn off a subtree "
                            "of a DAV-enabled location.");
           }
           else if (strcasecmp(child->provider_name,
                               parent->provider_name) != 0) {
  -            ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, NULL,
  +            ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
                            "A subtree cannot specify a different DAV provider "
                            "than its parent.");
           }
  @@ -551,7 +551,7 @@
                             errscan->desc, errscan->status, errscan->error_id);
           }
           else {
  -            ap_log_rerror(APLOG_MARK, level | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, level, 0, r,
                             "%s  [%d, #%d]",
                             errscan->desc, errscan->status, errscan->error_id);
           }
  @@ -655,7 +655,7 @@
   
       /* The caller will return an HTTP_BAD_REQUEST. This will augment the
        * default message that Apache provides. */
  -    ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                     "An invalid Depth header was specified.");
       return -1;
   }
  @@ -678,7 +678,7 @@
   
       /* The caller will return an HTTP_BAD_REQUEST. This will augment the
        * default message that Apache provides. */
  -    ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                     "An invalid Overwrite header was specified.");
       return -1;
   }
  @@ -1106,14 +1106,14 @@
   
       if (resource->collection && depth != DAV_INFINITY) {
           /* This supplies additional information for the default message. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Depth must be \"infinity\" for DELETE of a collection.");
           return HTTP_BAD_REQUEST;
       }
   
       if (!resource->collection && depth == 1) {
           /* This supplies additional information for the default message. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Depth of \"1\" is not allowed for DELETE.");
           return HTTP_BAD_REQUEST;
       }
  @@ -1528,7 +1528,7 @@
       /* note: doc == NULL if no request body */
   
       if (doc && !dav_validate_root(doc, "options")) {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The \"options\" element was not found.");
           return HTTP_BAD_REQUEST;
       }
  @@ -1922,7 +1922,7 @@
   
       if (doc && !dav_validate_root(doc, "propfind")) {
           /* This supplies additional information for the default message. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The \"propfind\" element was not found.");
           return HTTP_BAD_REQUEST;
       }
  @@ -1944,7 +1944,7 @@
           /* "propfind" element must have one of the above three children */
   
           /* This supplies additional information for the default message. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The \"propfind\" element does not contain one of "
                         "the required child elements (the specific command).");
           return HTTP_BAD_REQUEST;
  @@ -2165,7 +2165,7 @@
   
       if (doc == NULL || !dav_validate_root(doc, "propertyupdate")) {
           /* This supplies additional information for the default message. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The request body does not contain "
                         "a \"propertyupdate\" element.");
           return HTTP_BAD_REQUEST;
  @@ -2228,7 +2228,7 @@
               dav_auto_checkin(r, resource, 1 /*undo*/, 0 /*unlock*/, &av_info);
   
               /* This supplies additional information for the default message. */
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "A \"prop\" element is missing inside "
                             "the propertyupdate command.");
               return HTTP_BAD_REQUEST;
  @@ -2307,7 +2307,7 @@
       if (tenc) {
           if (strcasecmp(tenc, "chunked")) {
               /* Use this instead of Apache's default error string */
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Unknown Transfer-Encoding %s", tenc);
               return HTTP_NOT_IMPLEMENTED;
           }
  @@ -2323,7 +2323,7 @@
   
           if (*pos != '\0') {
               /* This supplies additional information for the default message. */
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Invalid Content-Length %s", lenp);
               return HTTP_BAD_REQUEST;
           }
  @@ -2519,7 +2519,7 @@
       }
       if (dest == NULL) {
           /* This supplies additional information for the default message. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The request is missing a Destination header.");
           return HTTP_BAD_REQUEST;
       }
  @@ -2528,7 +2528,7 @@
       if (lookup.rnew == NULL) {
           if (lookup.err.status == HTTP_BAD_REQUEST) {
               /* This supplies additional information for the default message. */
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             lookup.err.desc);
               return HTTP_BAD_REQUEST;
           }
  @@ -2593,13 +2593,13 @@
       }
       if (depth == 1) {
           /* This supplies additional information for the default message. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Depth must be \"0\" or \"infinity\" for COPY or MOVE.");
           return HTTP_BAD_REQUEST;
       }
       if (is_move && is_dir && depth != DAV_INFINITY) {
           /* This supplies additional information for the default message. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Depth must be \"infinity\" when moving a collection.");
           return HTTP_BAD_REQUEST;
       }
  @@ -2887,7 +2887,7 @@
   
       depth = dav_get_depth(r, DAV_INFINITY);
       if (depth != 0 && depth != DAV_INFINITY) {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Depth must be 0 or \"infinity\" for LOCK.");
           return HTTP_BAD_REQUEST;
       }
  @@ -3046,7 +3046,7 @@
   
       if ((const_locktoken_txt = apr_table_get(r->headers_in,
                                                "Lock-Token")) == NULL) {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Unlock failed (%s):  "
                         "No Lock-Token specified in header", r->filename);
           return HTTP_BAD_REQUEST;
  @@ -3156,7 +3156,7 @@
           apr_size_t tsize;
   
           if (!dav_validate_root(doc, "version-control")) {
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "The request body does not contain "
                             "a \"version-control\" element.");
               return HTTP_BAD_REQUEST;
  @@ -3164,14 +3164,14 @@
   
           /* get the version URI */
           if ((child = dav_find_child(doc->root, "version")) == NULL) {
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "The \"version-control\" element does not contain "
                             "a \"version\" element.");
               return HTTP_BAD_REQUEST;
           }
   
           if ((child = dav_find_child(child, "href")) == NULL) {
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "The \"version\" element does not contain "
                             "an \"href\" element.");
               return HTTP_BAD_REQUEST;
  @@ -3181,7 +3181,7 @@
           ap_xml_to_text(r->pool, child, AP_XML_X2T_INNER, NULL, NULL,
                          &target, &tsize);
           if (tsize == 0) {
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "An \"href\" element does not contain a URI.");
               return HTTP_BAD_REQUEST;
           }
  @@ -3333,7 +3333,7 @@
   
           if (!dav_validate_root(doc, "checkout")) {
               /* This supplies additional information for the default msg. */
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "The request body, if present, must be a "
                             "DAV:checkout element.");
               return HTTP_BAD_REQUEST;
  @@ -3380,7 +3380,7 @@
                       */
   
                       /* This supplies additional info for the default msg. */
  -                    ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                     "Within the DAV:activity-set element, the "
                                     "DAV:new element must be used, or at least "
                                     "one DAV:href must be specified.");
  @@ -3533,7 +3533,7 @@
       if (doc != NULL) {
           if (!dav_validate_root(doc, "checkin")) {
               /* This supplies additional information for the default msg. */
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "The request body, if present, must be a "
                             "DAV:checkin element.");
               return HTTP_BAD_REQUEST;
  @@ -3621,7 +3621,7 @@
   
       if (doc == NULL || !dav_validate_root(doc, "update")) {
           /* This supplies additional information for the default message. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The request body does not contain "
                         "an \"update\" element.");
           return HTTP_BAD_REQUEST;
  @@ -3633,14 +3633,14 @@
       else if ((child = dav_find_child(doc->root, "version")) != NULL) {
           /* get the href element */
           if ((child = dav_find_child(child, "href")) == NULL) {
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "The version element does not contain "
                             "an \"href\" element.");
               return HTTP_BAD_REQUEST;
           }
       }
       else {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The \"update\" element does not contain "
                         "a \"label-name\" or \"version\" element.");
           return HTTP_BAD_REQUEST;
  @@ -3648,7 +3648,7 @@
   
       /* a depth greater than zero is only allowed for a label */
       if (!is_label && depth != 0) {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Depth must be zero for UPDATE with a version");
           return HTTP_BAD_REQUEST;
       }
  @@ -3657,7 +3657,7 @@
       ap_xml_to_text(r->pool, child, AP_XML_X2T_INNER, NULL, NULL,
                      &target, &tsize);
       if (tsize == 0) {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "A \"label-name\" or \"href\" element does not contain "
                         "any content.");
           return HTTP_BAD_REQUEST;
  @@ -3690,7 +3690,7 @@
           if (lookup.rnew == NULL) {
               if (lookup.err.status == HTTP_BAD_REQUEST) {
                   /* This supplies additional information for the default message. */
  -                ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                 lookup.err.desc);
                   return HTTP_BAD_REQUEST;
               }
  @@ -3837,7 +3837,7 @@
   
       if (doc == NULL || !dav_validate_root(doc, "label")) {
           /* This supplies additional information for the default message. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The request body does not contain "
                         "a \"label\" element.");
           return HTTP_BAD_REQUEST;
  @@ -3854,7 +3854,7 @@
           ctx.label_op = DAV_LABEL_REMOVE;
       }
       else {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The \"label\" element does not contain "
                         "an \"add\", \"set\", or \"remove\" element.");
           return HTTP_BAD_REQUEST;
  @@ -3862,7 +3862,7 @@
   
       /* get the label string */
       if ((child = dav_find_child(child, "label-name")) == NULL) {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The label command element does not contain "
                         "a \"label-name\" element.");
           return HTTP_BAD_REQUEST;
  @@ -3871,7 +3871,7 @@
       ap_xml_to_text(r->pool, child, AP_XML_X2T_INNER, NULL, NULL,
                      &ctx.label, &tsize);
       if (tsize == 0) {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "A \"label-name\" element does not contain "
                         "a label name.");
           return HTTP_BAD_REQUEST;
  @@ -3938,7 +3938,7 @@
           return result;
       if (doc == NULL) {
           /* This supplies additional information for the default msg. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The request body must specify a report.");
           return HTTP_BAD_REQUEST;
       }
  @@ -4000,7 +4000,7 @@
   
       if (doc == NULL
           || !dav_validate_root(doc, "mkworkspace")) {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The request body does not contain "
                         "a \"mkworkspace\" element.");
           return HTTP_BAD_REQUEST;
  @@ -4125,7 +4125,7 @@
   
       if (doc == NULL || !dav_validate_root(doc, "merge")) {
           /* This supplies additional information for the default msg. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The request body must be present and must be a "
                         "DAV:merge element.");
           return HTTP_BAD_REQUEST;
  @@ -4133,14 +4133,14 @@
   
       if ((source_elem = dav_find_child(doc->root, "source")) == NULL) {
           /* This supplies additional information for the default msg. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The DAV:merge element must contain a DAV:source "
                         "element.");
           return HTTP_BAD_REQUEST;
       }
       if ((href_elem = dav_find_child(source_elem, "href")) == NULL) {
           /* This supplies additional information for the default msg. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The DAV:source element must contain a DAV:href "
                         "element.");
           return HTTP_BAD_REQUEST;
  @@ -4153,7 +4153,7 @@
       if (lookup.rnew == NULL) {
           if (lookup.err.status == HTTP_BAD_REQUEST) {
               /* This supplies additional information for the default message. */
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             lookup.err.desc);
               return HTTP_BAD_REQUEST;
           }
  @@ -4266,7 +4266,7 @@
       dest = apr_table_get(r->headers_in, "Destination");
       if (dest == NULL) {
           /* This supplies additional information for the default message. */
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "The request is missing a Destination header.");
           return HTTP_BAD_REQUEST;
       }
  @@ -4275,7 +4275,7 @@
       if (lookup.rnew == NULL) {
           if (lookup.err.status == HTTP_BAD_REQUEST) {
               /* This supplies additional information for the default message. */
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             lookup.err.desc);
               return HTTP_BAD_REQUEST;
           }
  
  
  
  1.19      +1 -1      httpd-2.0/modules/dav/main/util_lock.c
  
  Index: util_lock.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/util_lock.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- util_lock.c	13 Mar 2002 20:47:45 -0000	1.18
  +++ util_lock.c	17 May 2002 11:33:08 -0000	1.19
  @@ -756,7 +756,7 @@
           if (err != NULL) {
   	    /* ### don't log an error. return err. add higher-level desc. */
   
  -	    ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   		          "Failed to query lock-null status for %s",
   			  r->filename);
   
  
  
  
  1.42      +18 -18    httpd-2.0/modules/experimental/mod_cache.c
  
  Index: mod_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_cache.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- mod_cache.c	17 May 2002 03:05:40 -0000	1.41
  +++ mod_cache.c	17 May 2002 11:33:09 -0000	1.42
  @@ -106,12 +106,12 @@
       if (!(types = ap_cache_get_cachetype(r, conf, path))) {
           return DECLINED;
       }
  -    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                    "cache: URL %s is being handled by %s", path, types);
   
       urllen = strlen(url);
       if (urllen > MAX_URL_LENGTH) {
  -        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  +        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                        "cache: URL exceeds length threshold: %s", url);
           return DECLINED;
       }
  @@ -156,7 +156,7 @@
        * - TODO: Make MAX_URL_LENGTH a config directive?
        */
       if (conf->ignorecachecontrol_set == 1 && conf->ignorecachecontrol == 1 && auth == NULL) {
  -        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  +        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
               "incoming request is asking for a uncached version of %s, but we know better and are ignoring it", url);
       }
       else {
  @@ -165,7 +165,7 @@
               /* delete the previously cached file */
               cache_remove_url(r, cache->types, url);
   
  -            ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  +            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                           "cache: no-store forbids caching of %s", url);
               return DECLINED;
           }
  @@ -191,7 +191,7 @@
       if (DECLINED == rv) {
           if (!lookup) {
               /* no existing cache file */
  -            ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  +            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                            "cache: no cache - add cache_in filter and DECLINE");
               /* add cache_in filter to cache this request */
               ap_add_output_filter("CACHE_IN", NULL, r, r->connection);
  @@ -208,7 +208,7 @@
               if (lookup) {
                   return OK;
               }
  -            ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  +            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                            "cache: fresh cache - add cache_out filter and "
                            "handle request");
   
  @@ -244,11 +244,11 @@
                   return DECLINED;
               }
   
  -            ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  +            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                            "cache: stale cache - test conditional");
               /* if conditional request */
               if (ap_cache_request_is_conditional(r)) {
  -                ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, 
  +                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, 
                                r->server,
                                "cache: conditional - add cache_in filter and "
                                "DECLINE");
  @@ -261,7 +261,7 @@
               else {
                   /* fudge response into a conditional */
                   if (info && info->etag) {
  -                    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, 
  +                    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, 
                                    r->server,
                                    "cache: nonconditional - fudge conditional "
                                    "by etag");
  @@ -269,7 +269,7 @@
                       apr_table_set(r->headers_in, "If-None-Match", info->etag);
                   }
                   else if (info && info->lastmods) {
  -                    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, 
  +                    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, 
                                    r->server,
                                    "cache: nonconditional - fudge conditional "
                                    "by lastmod");
  @@ -280,7 +280,7 @@
                   }
                   else {
                       /* something else - pretend there was no cache */
  -                    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, 
  +                    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, 
                                    r->server,
                                    "cache: nonconditional - no cached "
                                    "etag/lastmods - add cache_in and DECLINE");
  @@ -290,7 +290,7 @@
                       return DECLINED;
                   }
                   /* add cache_conditional filter */
  -                ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, 
  +                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, 
                                r->server,
                                "cache: nonconditional - add cache_conditional and"
                                " DECLINE");
  @@ -368,7 +368,7 @@
   
   static int cache_conditional_filter(ap_filter_t *f, apr_bucket_brigade *in)
   {
  -    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, f->r->server,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, f->r->server,
                    "cache: running CACHE_CONDITIONAL filter");
   
       if (f->r->status == HTTP_NOT_MODIFIED) {
  @@ -416,7 +416,7 @@
       (cache_request_rec *) ap_get_module_config(scache, &cache_module);
   
   
  -    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, f->r->server,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, f->r->server,
                    "cache: running CACHE_IN filter");
   
       /* check first whether running this filter has any point or not */
  @@ -551,7 +551,7 @@
       /* or we've been asked not to cache it above */
           r->no_cache) {
   
  -        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  +        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                    "cache: response is not cachable");
   
           /* remove this object from the cache 
  @@ -647,7 +647,7 @@
           return ap_pass_brigade(f->next, in);
       }
   
  -    ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                    "cache: Caching url: %s", url);
   
       /*
  @@ -678,7 +678,7 @@
           dates = apr_pcalloc(r->pool, MAX_STRING_LEN);
           apr_rfc822_date(dates, now);
           ap_table_set(r->headers_out, "Date", dates);
  -        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
  +        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                        "cache: Added date header");
           info->date = date;
       }
  @@ -699,7 +699,7 @@
           /* if its in the future, then replace by date */
           lastmod = date;
           lastmods = dates;
  -        ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, 
  +        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, 
                        r->server,
                        "cache: Last modified is in the future, "
                        "replacing with now");
  
  
  
  1.62      +15 -15    httpd-2.0/modules/experimental/mod_charset_lite.c
  
  Index: mod_charset_lite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_charset_lite.c,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- mod_charset_lite.c	29 Mar 2002 08:17:21 -0000	1.61
  +++ mod_charset_lite.c	17 May 2002 11:33:09 -0000	1.62
  @@ -244,7 +244,7 @@
       const char *mime_type;
   
       if (dc->debug >= DBGLVL_FLOW) {
  -        ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK,APLOG_DEBUG, 0, r,
                         "uri: %s file: %s method: %d "
                         "imt: %s flags: %s%s%s %s->%s",
                         r->uri, r->filename, r->method_number,
  @@ -259,7 +259,7 @@
        */
       if (!dc->charset_source || !dc->charset_default) {
           if (dc->debug >= DBGLVL_PMC) {
  -            ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                             "incomplete configuration: src %s, dst %s",
                             dc->charset_source ? dc->charset_source : "unspecified",
                             dc->charset_default ? dc->charset_default : "unspecified");
  @@ -303,7 +303,7 @@
   #endif
           strncasecmp(mime_type, "message/", 8)) {
           if (dc->debug >= DBGLVL_GORY) {
  -            ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                             "mime type is %s; no translation selected",
                             mime_type);
           }
  @@ -311,7 +311,7 @@
       }
   
       if (dc->debug >= DBGLVL_GORY) {
  -        ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                         "charset_source: %s charset_default: %s",
                         dc && dc->charset_source ? dc->charset_source : "(none)",
                         dc && dc->charset_default ? dc->charset_default : "(none)");
  @@ -406,7 +406,7 @@
                                    r->connection);
           }
           else if (dc->debug >= DBGLVL_FLOW) {
  -            ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                             "xlate output filter not added implicitly because %s",
                             !reqinfo->output_ctx ? 
                             "no output configuration available" :
  @@ -418,7 +418,7 @@
                                   r->connection);
           }
           else if (dc->debug >= DBGLVL_FLOW) {
  -            ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                             "xlate input filter not added implicitly because %s",
                             !reqinfo->input_ctx ?
                             "no input configuration available" :
  @@ -548,22 +548,22 @@
       const char *msg;
       char msgbuf[100];
       int cur;
  -    int flags = APLOG_ERR;
   
       switch(ctx->ees) {
       case EES_LIMIT:
  -        flags |= APLOG_NOERRNO;
  +        rv = 0;
           msg = "xlate filter - a built-in restriction was encountered";
           break;
       case EES_BAD_INPUT:
  -        flags |= APLOG_NOERRNO;
  +        rv = 0;
           msg = "xlate filter - an input character was invalid";
           break;
       case EES_BUCKET_READ:
  +        rv = 0;
           msg = "xlate filter - bucket read routine failed";
           break;
       case EES_INCOMPLETE_CHAR:
  -        flags |= APLOG_NOERRNO;
  +        rv = 0;
           strcpy(msgbuf, "xlate filter - incomplete char at end of input - ");
           cur = 0;
           while (cur < ctx->saved) {
  @@ -579,7 +579,7 @@
       default:
           msg = "xlate filter - returning error";
       }
  -    ap_log_rerror(APLOG_MARK, flags, rv, f->r,
  +    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r,
                     "%s", msg);
   }
   
  @@ -655,7 +655,7 @@
                           if (debug >= DBGLVL_PMC) {
                               const char *symbol = output ? "->" : "<-";
   
  -                            ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO,
  +                            ap_log_rerror(APLOG_MARK, APLOG_DEBUG,
                                             0, f->r,
                                             "%s %s - disabling "
                                             "translation %s%s%s; existing "
  @@ -673,7 +673,7 @@
                       else {
                           const char *symbol = output ? "->" : "<-";
   
  -                        ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO,
  +                        ap_log_rerror(APLOG_MARK, APLOG_ERR,
                                         0, f->r,
                                         "chk_filter_chain() - can't disable "
                                         "translation %s%s%s; existing "
  @@ -859,7 +859,7 @@
       }
   
       if (dc->debug >= DBGLVL_GORY) {
  -        ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, f->r,
  +        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r,
                        "xlate_out_filter() - "
                        "charset_source: %s charset_default: %s",
                        dc && dc->charset_source ? dc->charset_source : "(none)",
  @@ -1017,7 +1017,7 @@
       }
   
       if (dc->debug >= DBGLVL_GORY) {
  -        ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, f->r,
  +        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r,
                        "xlate_in_filter() - "
                        "charset_source: %s charset_default: %s",
                        dc && dc->charset_source ? dc->charset_source : "(none)",
  
  
  
  1.33      +5 -5      httpd-2.0/modules/experimental/mod_disk_cache.c
  
  Index: mod_disk_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_disk_cache.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mod_disk_cache.c	3 Apr 2002 21:26:35 -0000	1.32
  +++ mod_disk_cache.c	17 May 2002 11:33:09 -0000	1.33
  @@ -348,7 +348,7 @@
       h->write_headers = &write_headers;
       h->remove_entity = &remove_entity;
   
  -    ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server,
  +    ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
                    "disk_cache: Caching URL %s",  key);
   
       return OK;
  @@ -422,7 +422,7 @@
       h->write_headers = &write_headers;
       h->remove_entity = &remove_entity;
   
  -    ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server,
  +    ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
                    "disk_cache: Serving Cached URL %s",  dobj->name);
       return OK;
   }
  @@ -495,7 +495,7 @@
   
       apr_file_close(dobj->hfd);
   
  -    ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server,
  +    ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
                    "disk_cache: Served headers for URL %s",  dobj->name);
       return APR_SUCCESS;
   }
  @@ -598,7 +598,7 @@
           /* XXX log message */
       }
   
  -    ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server,
  +    ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
                    "disk_cache: Caching headers for URL %s",  dobj->name);
       return APR_SUCCESS;
   }
  @@ -625,7 +625,7 @@
       }
       if (APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(b))) {
           file_cache_el_final(h, r);    /* Link to the perm file, and close the descriptor  */
  -        ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r->server,
  +        ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
                        "disk_cache: Cached body for URL %s",  dobj->name);
       }
   
  
  
  
  1.28      +3 -3      httpd-2.0/modules/experimental/mod_ext_filter.c
  
  Index: mod_ext_filter.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_ext_filter.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_ext_filter.c	25 Apr 2002 18:03:41 -0000	1.27
  +++ mod_ext_filter.c	17 May 2002 11:33:09 -0000	1.28
  @@ -485,7 +485,7 @@
       /* look for the user-defined filter */
       ctx->filter = apr_hash_get(sc->h, f->frec->name, APR_HASH_KEY_STRING);
       if (!ctx->filter) {
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, f->r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
                         "couldn't find definition of filter '%s'",
                         f->frec->name);
           return APR_EINVAL;
  @@ -514,7 +514,7 @@
       }
   
       if (dc->debug >= DBGLVL_SHOWOPTIONS) {
  -        ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, f->r,
  +        ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r,
                         "%sfiltering `%s' through `%s', cfg %s",
                         ctx->noop ? "skipping: " : "",
                         f->r->uri ? f->r->uri : f->r->filename,
  @@ -619,7 +619,7 @@
                    */
                   apr_sleep(100000); /* 100 milliseconds */
                   if (dc->debug >= DBGLVL_GORY) {
  -                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 
  +                    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 
                                     0, f->r, "apr_sleep()");
                   }
   #endif /* APR_FILES_AS_SOCKETS */
  
  
  
  1.59      +1 -1      httpd-2.0/modules/experimental/mod_mem_cache.c
  
  Index: mod_mem_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_mem_cache.c,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- mod_mem_cache.c	16 May 2002 18:42:58 -0000	1.58
  +++ mod_mem_cache.c	17 May 2002 11:33:09 -0000	1.59
  @@ -506,7 +506,7 @@
           sconf->object_cnt--;
           sconf->cache_size -= mobj->m_len;
           obj->cleanup = 1;
  -        ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, NULL, "gcing a cache entry");
  +        ap_log_error(APLOG_MARK, APLOG_INFO, 0, NULL, "gcing a cache entry");
       }
   
       if (sconf->lock) {
  
  
  
  1.5       +2 -2      httpd-2.0/modules/filters/mod_deflate.c
  
  Index: mod_deflate.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_deflate.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_deflate.c	13 May 2002 07:11:01 -0000	1.4
  +++ mod_deflate.c	17 May 2002 11:33:09 -0000	1.5
  @@ -309,7 +309,7 @@
   
           if (zRC != Z_OK) {
               f->ctx = NULL;
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "unable to init Zlib: "
                             "deflateInit2 returned %d: URL %s",
                             zRC, r->uri);
  @@ -388,7 +388,7 @@
   
               b = apr_bucket_pool_create(buf, 8, r->pool, f->c->bucket_alloc);
               APR_BRIGADE_INSERT_TAIL(ctx->bb, b);
  -            ap_log_rerror(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
                             "Zlib: Compressed %ld to %ld : URL %s",
                             ctx->stream.total_in, ctx->stream.total_out, r->uri);
   
  
  
  
  1.222     +38 -38    httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.221
  retrieving revision 1.222
  diff -u -r1.221 -r1.222
  --- mod_include.c	4 May 2002 06:10:59 -0000	1.221
  +++ mod_include.c	17 May 2002 11:33:09 -0000	1.222
  @@ -1075,7 +1075,7 @@
                       start_of_var_name = in;
                       in = ap_strchr_c(in, '}');
                       if (in == NULL) {
  -                        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  +                        ap_log_rerror(APLOG_MARK, APLOG_ERR,
                                         0, r, "Missing '}' on variable \"%s\"",
                                         expansion);
                           *next = '\0';
  @@ -1336,7 +1336,7 @@
                       error_fmt = "unable to include \"%s\" in parsed file %s";
                   }
                   if (error_fmt) {
  -                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|loglevel,
  +                    ap_log_rerror(APLOG_MARK, loglevel,
                                     0, r, error_fmt, tag_val, r->filename);
                       CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, 
                                           *inserted_head);
  @@ -1348,7 +1348,7 @@
                   }
               }
               else {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "unknown parameter \"%s\" to tag include in %s",
                               tag, r->filename);
                   CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
  @@ -1425,7 +1425,7 @@
                   else if (!strcasecmp(tag_val, "url")) encode = E_URL;
                   else if (!strcasecmp(tag_val, "entity")) encode = E_ENTITY;
                   else {
  -                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                              "unknown value \"%s\" to parameter \"encoding\" of "
                              "tag echo in %s", tag_val, r->filename);
                       CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, 
  @@ -1433,7 +1433,7 @@
                   }
               }
               else {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "unknown parameter \"%s\" in tag echo of %s",
                               tag, r->filename);
                   CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
  @@ -1508,7 +1508,7 @@
               else {
                   apr_bucket *tmp_buck;
   
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                 "unknown parameter \"%s\" to tag config in %s",
                                 tag, r->filename);
                   CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
  @@ -1560,7 +1560,7 @@
   
           if (error_fmt) {
               ret = -1;
  -            ap_log_rerror(APLOG_MARK, APLOG_ERR | (rv ? 0 : APLOG_NOERRNO),
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR,
                             rv, r, error_fmt, to_send, r->filename);
           }
   
  @@ -1580,7 +1580,7 @@
               return 0;
           }
           else {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                           "unable to get information about \"%s\" "
                           "in parsed file %s",
                           tag_val, r->filename);
  @@ -1589,7 +1589,7 @@
           }
       }
       else {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                       "unknown parameter \"%s\" to tag %s in %s",
                       tag, directive, r->filename);
           return -1;
  @@ -1726,7 +1726,7 @@
   
       compiled = ap_pregcomp(r->pool, rexp, REG_EXTENDED | REG_NOSUB);
       if (compiled == NULL) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "unable to compile pattern \"%s\"", rexp);
           return -1;
       }
  @@ -1981,7 +1981,7 @@
                   current = current->right = new;
                   break;
               default:
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   *was_error = 1;
  @@ -2010,7 +2010,7 @@
                   current = current->right = new;
                   break;
               default:
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   *was_error = 1;
  @@ -2026,7 +2026,7 @@
               debug_pos += sizeof ("     Token: and/or\n");
   #endif
               if (current == (struct parse_node *) NULL) {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   *was_error = 1;
  @@ -2052,7 +2052,7 @@
                   case token_lbrace:
                       break;
                   default:
  -                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                   "Invalid expression \"%s\" in file %s",
                                   expr, r->filename);
                       *was_error = 1;
  @@ -2099,7 +2099,7 @@
                   case token_lt:
                       break;
                   default:
  -                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                     "Invalid expression \"%s\" in file %s",
                                     expr, r->filename);
                       *was_error = 1;
  @@ -2133,7 +2133,7 @@
               debug_pos += sizeof("     Token: eq/ne/ge/gt/le/lt\n");
   #endif
               if (current == (struct parse_node *) NULL) {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                 "Invalid expression \"%s\" in file %s",
                                 expr, r->filename);
                   *was_error = 1;
  @@ -2159,7 +2159,7 @@
                   case token_le:
                   case token_lt:
                   default:
  -                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                   "Invalid expression \"%s\" in file %s",
                                   expr, r->filename);
                       *was_error = 1;
  @@ -2195,7 +2195,7 @@
                   current = current->parent;
               }
               if (current == (struct parse_node *) NULL) {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "Unmatched ')' in \"%s\" in file %s",
                               expr, r->filename);
                   *was_error = 1;
  @@ -2231,7 +2231,7 @@
                   case token_re:
                   case token_group:
                   default:
  -                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                   "Invalid expression \"%s\" in file %s",
                                   expr, r->filename);
                       *was_error = 1;
  @@ -2276,7 +2276,7 @@
               break;
   
           case token_re:
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "No operator before regex of expr \"%s\" in file %s",
                             expr, r->filename);
               *was_error = 1;
  @@ -2291,7 +2291,7 @@
   #endif
               if (current->left  == (struct parse_node *) NULL ||
                   current->right == (struct parse_node *) NULL) {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                 "Invalid expression \"%s\" in file %s",
                                 expr, r->filename);
                   *was_error = 1;
  @@ -2359,7 +2359,7 @@
                   (current->left->token.type != token_string) ||
                   ((current->right->token.type != token_string) &&
                    (current->right->token.type != token_re))) {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   *was_error = 1;
  @@ -2416,7 +2416,7 @@
                   (current->right == (struct parse_node *) NULL) ||
                   (current->left->token.type != token_string) ||
                   (current->right->token.type != token_string)) {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   *was_error = 1;
  @@ -2499,21 +2499,21 @@
               break;
   
           case token_lbrace:
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                           "Unmatched '(' in \"%s\" in file %s",
                           expr, r->filename);
               *was_error = 1;
               return retval;
   
           case token_rbrace:
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                           "Unmatched ')' in \"%s\" in file %s",
                           expr, r->filename);
               *was_error = 1;
               return retval;
   
           default:
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "bad token type");
               *was_error = 1;
               return retval;
  @@ -2586,7 +2586,7 @@
               ap_ssi_get_tag_and_value(ctx, &tag, &tag_val, 0);
               if (tag == NULL) {
                   if (expr == NULL) {
  -                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                     "missing expr in if statement: %s", 
                                     r->filename);
                       CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, 
  @@ -2635,7 +2635,7 @@
   #endif
               }
               else {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "unknown parameter \"%s\" to tag if in %s", tag, 
                               r->filename);
                   CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
  @@ -2670,7 +2670,7 @@
                       return (0);
                   }
                   if (expr == NULL) {
  -                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                     "missing expr in elif statement: %s", 
                                     r->filename);
                       CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, 
  @@ -2718,7 +2718,7 @@
   #endif
               }
               else {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                  "unknown parameter \"%s\" to tag if in %s", tag, 
                                  r->filename);
                   CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
  @@ -2740,7 +2740,7 @@
       if (!ctx->if_nesting_level) {
           ap_ssi_get_tag_and_value(ctx, &tag, &tag_val, 1);
           if ((tag != NULL) || (tag_val != NULL)) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                           "else directive does not take tags in %s", r->filename);
               if (ctx->flags & FLAG_PRINTING) {
                   CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
  @@ -2774,7 +2774,7 @@
       if (!ctx->if_nesting_level) {
           ap_ssi_get_tag_and_value(ctx, &tag, &tag_val, 1);
           if ((tag != NULL) || (tag_val != NULL)) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                          "endif directive does not take tags in %s", r->filename);
               CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
               return -1;
  @@ -2827,7 +2827,7 @@
               }
               else if (!strcmp(tag, "value")) {
                   if (var == (char *) NULL) {
  -                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                              "variable must precede value in set directive in %s",
                              r->filename);
                       CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, 
  @@ -2840,7 +2840,7 @@
                                  apr_pstrdup(p, parsed_string));
               }
               else {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "Invalid tag for set directive in %s", r->filename);
                   CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
                   return -1;
  @@ -2899,7 +2899,7 @@
               return 0;
           }
           else {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                           "printenv directive does not take tags in %s", 
                           r->filename);
               CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
  @@ -3065,7 +3065,7 @@
                */
               if (get_combined_directive(ctx, r, *bb, tmp_buf,
                                           TMP_BUF_SIZE) != APR_SUCCESS) {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "mod_include: error copying directive in %s",
                               r->filename);
                   CREATE_ERROR_BUCKET(ctx, tmp_bkt, dptr, content_head);
  @@ -3115,7 +3115,7 @@
                   }
               }
               else {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                 "unknown directive \"%s\" in parsed doc %s",
                                 ctx->combined_tag, r->filename);
                   CREATE_ERROR_BUCKET(ctx, tmp_bkt, dptr, content_head);
  @@ -3220,7 +3220,7 @@
       }
       else if (ctx->state == PARSED) {         /* Invalid internal condition... */
           apr_bucket *content_head = NULL, *tmp_bkt;
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Invalid mod_include state during file %s", r->filename);
           CREATE_ERROR_BUCKET(ctx, tmp_bkt, APR_BRIGADE_FIRST(*bb), content_head);
       }
  
  
  
  1.46      +1 -1      httpd-2.0/modules/generators/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_asis.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- mod_asis.c	29 Mar 2002 08:17:22 -0000	1.45
  +++ mod_asis.c	17 May 2002 11:33:09 -0000	1.46
  @@ -84,7 +84,7 @@
       if (r->method_number != M_GET)
   	return DECLINED;
       if (r->finfo.filetype == 0) {
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   		    "File does not exist: %s", r->filename);
   	return HTTP_NOT_FOUND;
       }
  
  
  
  1.107     +1 -1      httpd-2.0/modules/generators/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_autoindex.c,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- mod_autoindex.c	21 Apr 2002 19:10:07 -0000	1.106
  +++ mod_autoindex.c	17 May 2002 11:33:09 -0000	1.107
  @@ -2144,7 +2144,7 @@
           return index_directory(r, d);
       }
       else {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Directory index forbidden by rule: %s", r->filename);
           return HTTP_FORBIDDEN;
       }
  
  
  
  1.135     +6 -6      httpd-2.0/modules/generators/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- mod_cgi.c	22 Apr 2002 08:08:37 -0000	1.134
  +++ mod_cgi.c	17 May 2002 11:33:09 -0000	1.135
  @@ -216,7 +216,7 @@
       apr_file_t *f = NULL;
       apr_finfo_t finfo;
       char time_str[APR_CTIME_LEN];
  -    int log_flags = rv ? APLOG_ERR : APLOG_NOERRNO | APLOG_ERR;
  +    int log_flags = rv ? APLOG_ERR : APLOG_ERR;
   
       ap_log_rerror(APLOG_MARK, log_flags, rv, r, 
                     "%s: %s", error, r->filename);
  @@ -258,7 +258,7 @@
           if (newline) {
               *newline = '\0';
           }
  -        ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r, 
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
                         "%s", argsbuffer);            
       }
   }
  @@ -946,7 +946,7 @@
       *inserted_head = NULL;
       if (ctx->flags & FLAG_PRINTING) {
           if (ctx->flags & FLAG_NO_EXEC) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "exec used but not allowed in %s", r->filename);
               CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
           }
  @@ -964,7 +964,7 @@
                   if (!strcmp(tag, "cmd")) {
                       cgi_pfn_ps(r, ctx, tag_val, parsed_string, sizeof(parsed_string), 1);
                       if (include_cmd(ctx, bb, parsed_string, r, f) == -1) {
  -                        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                       "execution failure for parameter \"%s\" "
                                       "to tag exec in file %s", tag, r->filename);
                           CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
  @@ -980,13 +980,13 @@
                       }
   
                       if (include_cgi(parsed_string, r, f->next, head_ptr, inserted_head) == -1) {
  -                        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                       "invalid CGI ref \"%s\" in %s", tag_val, file);
                           CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
                       }
                   }
                   else {
  -                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                   "unknown parameter \"%s\" to tag exec in %s", tag, file);
                       CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
                   }
  
  
  
  1.129     +6 -6      httpd-2.0/modules/generators/mod_cgid.c
  
  Index: mod_cgid.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- mod_cgid.c	22 Apr 2002 08:08:38 -0000	1.128
  +++ mod_cgid.c	17 May 2002 11:33:09 -0000	1.129
  @@ -584,7 +584,7 @@
           r->pool = ptrans; 
           rc = get_req(sd2, r, &argv0, &env, &req_type); 
           if (rc) {
  -            ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0,
  +            ap_log_error(APLOG_MARK, APLOG_ERR, 0,
                            main_server,
                            "Error reading request on cgid socket");
               close(sd2);
  @@ -796,7 +796,7 @@
       apr_file_t *f = NULL; 
       struct stat finfo; 
       char time_str[APR_CTIME_LEN];
  -    int log_flags = rv ? APLOG_ERR : APLOG_NOERRNO | APLOG_ERR;
  +    int log_flags = rv ? APLOG_ERR : APLOG_ERR;
   
       ap_log_rerror(APLOG_MARK, log_flags, rv, r, 
                   "%s: %s", error, r->filename); 
  @@ -1444,7 +1444,7 @@
       *inserted_head = NULL;
       if (ctx->flags & FLAG_PRINTING) {
           if (ctx->flags & FLAG_NO_EXEC) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "exec used but not allowed in %s", r->filename);
               CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
           }
  @@ -1462,7 +1462,7 @@
                   if (!strcmp(tag, "cmd")) {
                       cgid_pfn_ps(r, ctx, tag_val, parsed_string, sizeof(parsed_string), 1);
                       if (include_cmd(ctx, bb, parsed_string, r, f) == -1) {
  -                        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                       "execution failure for parameter \"%s\" "
                                       "to tag exec in file %s", tag, r->filename);
                           CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
  @@ -1479,13 +1479,13 @@
                       }
   
                       if (include_cgi(parsed_string, r, f->next, head_ptr, inserted_head) == -1) {
  -                        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                       "invalid CGI ref \"%s\" in %s", tag_val, file);
                           CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
                       }
                   }
                   else {
  -                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                                   "unknown parameter \"%s\" to tag exec in %s", tag, file);
                       CREATE_ERROR_BUCKET(ctx, tmp_buck, head_ptr, *inserted_head);
                   }
  
  
  
  1.68      +1 -1      httpd-2.0/modules/generators/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.c,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- mod_status.c	22 Apr 2002 04:48:11 -0000	1.67
  +++ mod_status.c	17 May 2002 11:33:09 -0000	1.68
  @@ -286,7 +286,7 @@
       tu = ts = tcu = tcs = 0;
   
       if (!ap_exists_scoreboard_image()) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "Server status unavailable in inetd mode");
           return HTTP_INTERNAL_SERVER_ERROR;
       }
  
  
  
  1.14      +1 -1      httpd-2.0/modules/generators/mod_suexec.c
  
  Index: mod_suexec.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_suexec.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_suexec.c	25 Apr 2002 07:18:39 -0000	1.13
  +++ mod_suexec.c	17 May 2002 11:33:09 -0000	1.14
  @@ -138,7 +138,7 @@
                             s->process->pool);
   
       if ((reported == NULL) && unixd_config.suexec_enabled) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s,
  +        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
                        "suEXEC mechanism enabled (wrapper: %s)", SUEXEC_BIN);
   
           apr_pool_userdata_setn((void *)1, SUEXEC_POST_CONFIG_USERDATA,
  
  
  
  1.421     +7 -7      httpd-2.0/modules/http/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v
  retrieving revision 1.420
  retrieving revision 1.421
  diff -u -r1.420 -r1.421
  --- http_protocol.c	12 May 2002 21:50:46 -0000	1.420
  +++ http_protocol.c	17 May 2002 11:33:10 -0000	1.421
  @@ -494,7 +494,7 @@
           /* The method registry  has run out of dynamically
            * assignable method numbers. Log this and return M_INVALID.
            */
  -        ap_log_perror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, p,
  +        ap_log_perror(APLOG_MARK, APLOG_ERR, 0, p,
                         "Maximum new request methods %d reached while "
                         "registering method %s.",
                         METHOD_NUMBER_LAST, methname);
  @@ -806,7 +806,7 @@
                * time, stop it here if it is invalid. 
                */ 
               if (ctx->limit && ctx->limit < ctx->remaining) {
  -                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, f->r,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
                             "Requested content-length of %" APR_OFF_T_FMT 
                             " is larger than the configured limit"
                             " of %" APR_OFF_T_FMT, ctx->remaining, ctx->limit);
  @@ -935,7 +935,7 @@
            * really count.  This seems to be up for interpretation.  */
           ctx->limit_used += totalread;
           if (ctx->limit < ctx->limit_used) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, f->r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r,
                             "Read content-length of %" APR_OFF_T_FMT 
                             " is larger than the configured limit"
                             " of %" APR_OFF_T_FMT, ctx->limit_used, ctx->limit);
  @@ -1593,12 +1593,12 @@
   
       if (tenc) {
           if (strcasecmp(tenc, "chunked")) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Unknown Transfer-Encoding %s", tenc);
               return HTTP_NOT_IMPLEMENTED;
           }
           if (r->read_body == REQUEST_CHUNKED_ERROR) {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "chunked Transfer-Encoding forbidden: %s", r->uri);
               return (lenp) ? HTTP_BAD_REQUEST : HTTP_LENGTH_REQUIRED;
           }
  @@ -1612,7 +1612,7 @@
               ++pos;
           }
           if (*pos != '\0') {
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                             "Invalid Content-Length %s", lenp);
               return HTTP_BAD_REQUEST;
           }
  @@ -1622,7 +1622,7 @@
   
       if ((r->read_body == REQUEST_NO_BODY)
           && (r->read_chunked || (r->remaining > 0))) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         "%s with body is not allowed for %s", r->method, r->uri);
           return HTTP_REQUEST_ENTITY_TOO_LARGE;
       }
  
  
  
  1.143     +1 -1      httpd-2.0/modules/http/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_request.c,v
  retrieving revision 1.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- http_request.c	29 Apr 2002 08:05:37 -0000	1.142
  +++ http_request.c	17 May 2002 11:33:10 -0000	1.143
  @@ -197,7 +197,7 @@
                * dying with a recursive server error...
                */
               recursive_error = HTTP_INTERNAL_SERVER_ERROR;
  -            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                           "Invalid error redirection directive: %s",
                           custom_response);
           }
  
  
  
  1.39      +2 -2      httpd-2.0/modules/metadata/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_cern_meta.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_cern_meta.c	20 Mar 2002 17:41:55 -0000	1.38
  +++ mod_cern_meta.c	17 May 2002 11:33:10 -0000	1.39
  @@ -274,7 +274,7 @@
   	/* if we see a bogus header don't ignore it. Shout and scream */
   
   	if (!(l = strchr(w, ':'))) {
  - 	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  + 	    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   			"malformed header in meta file: %s", r->filename);
   	    return HTTP_INTERNAL_SERVER_ERROR;
   	}
  @@ -350,7 +350,7 @@
       }
       else {
   	/* no last slash, buh?! */
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   		    "internal error in mod_cern_meta: %s", r->filename);
   	/* should really barf, but hey, let's be friends... */
   	return DECLINED;
  
  
  
  1.28      +1 -1      httpd-2.0/modules/metadata/mod_env.c
  
  Index: mod_env.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_env.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_env.c	13 Mar 2002 20:47:52 -0000	1.27
  +++ mod_env.c	17 May 2002 11:33:10 -0000	1.28
  @@ -139,7 +139,7 @@
           apr_table_setn(vars, arg, apr_pstrdup(cmd->pool, env_var));
       }
       else {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, cmd->server,
  +        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
                        "PassEnv variable %s was undefined", arg);
       }
   
  
  
  
  1.37      +2 -2      httpd-2.0/modules/metadata/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_expires.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- mod_expires.c	13 Mar 2002 20:47:52 -0000	1.36
  +++ mod_expires.c	17 May 2002 11:33:10 -0000	1.37
  @@ -433,7 +433,7 @@
   
       conf = (expires_dir_config *) ap_get_module_config(r->per_dir_config, &expires_module);
       if (conf == NULL) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                       "internal error: %s", r->filename);
           return HTTP_INTERNAL_SERVER_ERROR;
       }
  @@ -490,7 +490,7 @@
           /* expecting the add_* routines to be case-hardened this 
            * is just a reminder that module is beta
            */
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                       "internal error: bad expires code: %s", r->filename);
           return HTTP_INTERNAL_SERVER_ERROR;
       }
  
  
  
  1.39      +1 -1      httpd-2.0/modules/metadata/mod_headers.c
  
  Index: mod_headers.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_headers.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_headers.c	13 Mar 2002 20:47:52 -0000	1.38
  +++ mod_headers.c	17 May 2002 11:33:10 -0000	1.39
  @@ -560,7 +560,7 @@
       headers_conf *dirconf = ap_get_module_config(f->r->per_dir_config,
                                                    &headers_module);
   
  -    ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, f->r->server,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, f->r->server,
   		 "headers: ap_headers_output_filter()");
   
       /* do the fixup */
  
  
  
  1.57      +45 -45    httpd-2.0/modules/metadata/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_mime_magic.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- mod_mime_magic.c	20 Mar 2002 17:41:55 -0000	1.56
  +++ mod_mime_magic.c	17 May 2002 11:33:10 -0000	1.57
  @@ -590,7 +590,7 @@
   
       /* make sure we have a list to put it in */
       if (!req_dat) {
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, APR_EINVAL, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, APR_EINVAL, r,
   		    MODNAME ": request config should not be NULL");
   	if (!(req_dat = magic_set_config(r))) {
   	    /* failure */
  @@ -692,7 +692,7 @@
       /* clean up and return */
       result[res_pos] = 0;
   #if MIME_MAGIC_DEBUG
  -    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   	     MODNAME ": rsl_strdup() %d chars: %s", res_pos - 1, result);
   #endif
       return result;
  @@ -764,7 +764,7 @@
   		else {
   		    /* should not be possible */
   		    /* abandon malfunctioning module */
  -		    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r,
  +		    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   				MODNAME ": bad state %d (ws)", state);
   		    return DECLINED;
   		}
  @@ -808,7 +808,7 @@
   		else {
   		    /* should not be possible */
   		    /* abandon malfunctioning module */
  -		    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r,
  +		    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   				MODNAME ": bad state %d (ns)", state);
   		    return DECLINED;
   		}
  @@ -848,7 +848,7 @@
       /* detect memory allocation or other errors */
       if (!r->content_type ||
   	(state == rsl_encoding && !r->content_encoding)) {
  -        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                         MODNAME ": unexpected state %d; could be caused by bad "
                         "data in magic file",
                         state);
  @@ -1018,28 +1018,28 @@
       (void) apr_file_close(f);
   
   #if MIME_MAGIC_DEBUG
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, s,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
   		MODNAME ": apprentice conf=%x file=%s m=%s m->next=%s last=%s",
   		conf,
   		conf->magicfile ? conf->magicfile : "NULL",
   		conf->magic ? "set" : "NULL",
   		(conf->magic && conf->magic->next) ? "set" : "NULL",
   		conf->last ? "set" : "NULL");
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, s,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
   		MODNAME ": apprentice read %d lines, %d rules, %d errors",
   		lineno, rule, errs);
   #endif
   
   #if MIME_MAGIC_DEBUG
       prevm = 0;
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, s,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
   		MODNAME ": apprentice test");
       for (m = conf->magic; m; m = m->next) {
   	if (apr_isprint((((unsigned long) m) >> 24) & 255) &&
   	    apr_isprint((((unsigned long) m) >> 16) & 255) &&
   	    apr_isprint((((unsigned long) m) >> 8) & 255) &&
   	    apr_isprint(((unsigned long) m) & 255)) {
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, s,
  +	    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
   			MODNAME ": apprentice: POINTER CLOBBERED! "
   			"m=\"%c%c%c%c\" line=%d",
   			(((unsigned long) m) >> 24) & 255,
  @@ -1086,7 +1086,7 @@
   	case STRING:
   	    break;
   	default:
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, s,
  +	    ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
   			MODNAME ": can't happen: m->type=%d", m->type);
   	    return -1;
   	}
  @@ -1134,7 +1134,7 @@
       /* get offset, then skip over it */
       m->offset = (int) strtol(l, &t, 0);
       if (l == t) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, serv,
  +	ap_log_error(APLOG_MARK, APLOG_ERR, 0, serv,
   		    MODNAME ": offset %s invalid", l);
       }
       l = t;
  @@ -1157,7 +1157,7 @@
   		m->in.type = BYTE;
   		break;
   	    default:
  -		ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, serv,
  +		ap_log_error(APLOG_MARK, APLOG_ERR, 0, serv,
   			MODNAME ": indirect offset type %c invalid", *l);
   		break;
   	    }
  @@ -1174,7 +1174,7 @@
   	else
   	    t = l;
   	if (*t++ != ')') {
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, serv,
  +	    ap_log_error(APLOG_MARK, APLOG_ERR, 0, serv,
   			MODNAME ": missing ')' in indirect offset");
   	}
   	l = t;
  @@ -1248,7 +1248,7 @@
   	l += NLEDATE;
       }
       else {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, serv,
  +	ap_log_error(APLOG_MARK, APLOG_ERR, 0, serv,
   		    MODNAME ": type %s invalid", l);
   	return -1;
       }
  @@ -1311,7 +1311,7 @@
       m->desc[sizeof(m->desc) - 1] = '\0';
   
   #if MIME_MAGIC_DEBUG
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, serv,
  +    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, serv,
   		MODNAME ": parse line=%d m=%x next=%x cont=%d desc=%s",
   		lineno, m, m->next, m->cont_level, m->desc);
   #endif /* MIME_MAGIC_DEBUG */
  @@ -1354,7 +1354,7 @@
   	if (apr_isspace((unsigned char) c))
   	    break;
   	if (p >= pmax) {
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, serv,
  +	    ap_log_error(APLOG_MARK, APLOG_ERR, 0, serv,
   			MODNAME ": string too long: %s", origs);
   	    break;
   	}
  @@ -1500,7 +1500,7 @@
   	/* We used stat(), the only possible reason for this is that the
   	 * symlink is broken.
   	 */
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   		    MODNAME ": broken symlink (%s)", fn);
   	return HTTP_INTERNAL_SERVER_ERROR;
       case APR_SOCK:
  @@ -1509,7 +1509,7 @@
       case APR_REG:
   	break;
       default:
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   		      MODNAME ": invalid file type %d.", r->finfo.filetype);
   	return HTTP_INTERNAL_SERVER_ERROR;
       }
  @@ -1576,7 +1576,7 @@
       struct magic *m;
   
   #if MIME_MAGIC_DEBUG
  -    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		MODNAME ": match conf=%x file=%s m=%s m->next=%s last=%s",
   		conf,
   		conf->magicfile ? conf->magicfile : "NULL",
  @@ -1591,7 +1591,7 @@
   	    apr_isprint((((unsigned long) m) >> 16) & 255) &&
   	    apr_isprint((((unsigned long) m) >> 8) & 255) &&
   	    apr_isprint(((unsigned long) m) & 255)) {
  -	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   			MODNAME ": match: POINTER CLOBBERED! "
   			"m=\"%c%c%c%c\"",
   			(((unsigned long) m) >> 24) & 255,
  @@ -1606,7 +1606,7 @@
       for (m = conf->magic; m; m = m->next) {
   #if MIME_MAGIC_DEBUG
   	rule_counter++;
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		    MODNAME ": line=%d desc=%s", m->lineno, m->desc);
   #endif
   
  @@ -1626,7 +1626,7 @@
   	    while (m_cont && (m_cont->cont_level != 0)) {
   #if MIME_MAGIC_DEBUG
   		rule_counter++;
  -		ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +		ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   			MODNAME ": line=%d mc=%x mc->next=%x cont=%d desc=%s",
   			    m_cont->lineno, m_cont,
   			    m_cont->next, m_cont->cont_level,
  @@ -1645,7 +1645,7 @@
   	/* if we get here, the main entry rule was a match */
   	/* this will be the last run through the loop */
   #if MIME_MAGIC_DEBUG
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		    MODNAME ": rule matched, line=%d type=%d %s",
   		    m->lineno, m->type,
   		    (m->type == STRING) ? m->value.s : "");
  @@ -1669,7 +1669,7 @@
   	m = m->next;
   	while (m && (m->cont_level != 0)) {
   #if MIME_MAGIC_DEBUG
  -	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   			MODNAME ": match line=%d cont=%d type=%d %s",
   			m->lineno, m->cont_level, m->type,
   			(m->type == STRING) ? m->value.s : "");
  @@ -1713,13 +1713,13 @@
   	    m = m->next;
   	}
   #if MIME_MAGIC_DEBUG
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		    MODNAME ": matched after %d rules", rule_counter);
   #endif
   	return 1;		/* all through */
       }
   #if MIME_MAGIC_DEBUG
  -    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		MODNAME ": failed after %d rules", rule_counter);
   #endif
       return 0;			/* no match at all */
  @@ -1765,7 +1765,7 @@
   	(void) magic_rsl_printf(r, m->desc, pp);
   	return;
       default:
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   		    MODNAME ": invalid m->type (%d) in mprint().",
   		    m->type);
   	return;
  @@ -1811,7 +1811,7 @@
   	    ((p->hl[3] << 24) | (p->hl[2] << 16) | (p->hl[1] << 8) | (p->hl[0]));
   	return 1;
       default:
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   		    MODNAME ": invalid type %d in mconvert().", m->type);
   	return 0;
       }
  @@ -1863,7 +1863,7 @@
       int matched;
   
       if ((m->value.s[0] == 'x') && (m->value.s[1] == '\0')) {
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   		    MODNAME ": BOINK");
   	return 1;
       }
  @@ -1908,7 +1908,7 @@
   	break;
       default:
   	/*  bogosity, pretend that it just wasn't a match */
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   		    MODNAME ": invalid type %d in mcheck().", m->type);
   	return 0;
       }
  @@ -1918,7 +1918,7 @@
       switch (m->reln) {
       case 'x':
   #if MIME_MAGIC_DEBUG
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		    "%lu == *any* = 1", v);
   #endif
   	matched = 1;
  @@ -1927,7 +1927,7 @@
       case '!':
   	matched = v != l;
   #if MIME_MAGIC_DEBUG
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		    "%lu != %lu = %d", v, l, matched);
   #endif
   	break;
  @@ -1935,7 +1935,7 @@
       case '=':
   	matched = v == l;
   #if MIME_MAGIC_DEBUG
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		    "%lu == %lu = %d", v, l, matched);
   #endif
   	break;
  @@ -1944,14 +1944,14 @@
   	if (m->flag & UNSIGNED) {
   	    matched = v > l;
   #if MIME_MAGIC_DEBUG
  -	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   			"%lu > %lu = %d", v, l, matched);
   #endif
   	}
   	else {
   	    matched = (long) v > (long) l;
   #if MIME_MAGIC_DEBUG
  -	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   			"%ld > %ld = %d", v, l, matched);
   #endif
   	}
  @@ -1961,14 +1961,14 @@
   	if (m->flag & UNSIGNED) {
   	    matched = v < l;
   #if MIME_MAGIC_DEBUG
  -	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   			"%lu < %lu = %d", v, l, matched);
   #endif
   	}
   	else {
   	    matched = (long) v < (long) l;
   #if MIME_MAGIC_DEBUG
  -	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   			"%ld < %ld = %d", v, l, matched);
   #endif
   	}
  @@ -1977,7 +1977,7 @@
       case '&':
   	matched = (v & l) == l;
   #if MIME_MAGIC_DEBUG
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		    "((%lx & %lx) == %lx) = %d", v, l, l, matched);
   #endif
   	break;
  @@ -1985,7 +1985,7 @@
       case '^':
   	matched = (v & l) != l;
   #if MIME_MAGIC_DEBUG
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		    "((%lx & %lx) != %lx) = %d", v, l, l, matched);
   #endif
   	break;
  @@ -1993,7 +1993,7 @@
       default:
   	/* bogosity, pretend it didn't match */
   	matched = 0;
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
   		    MODNAME ": mcheck: can't happen: invalid relation %d.",
   		    m->reln);
   	break;
  @@ -2343,7 +2343,7 @@
       request_rec *sub;
   
   #if MIME_MAGIC_DEBUG
  -    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		MODNAME ": revision_suffix checking %s", r->filename);
   #endif /* MIME_MAGIC_DEBUG */
   
  @@ -2362,7 +2362,7 @@
       result = 0;
       sub_filename = apr_pstrndup(r->pool, r->filename, suffix_pos);
   #if MIME_MAGIC_DEBUG
  -    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +    ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		MODNAME ": subrequest lookup for %s", sub_filename);
   #endif /* MIME_MAGIC_DEBUG */
       sub = ap_sub_req_lookup_file(sub_filename, r, NULL);
  @@ -2371,7 +2371,7 @@
       if (sub->content_type) {
   	ap_set_content_type(r, apr_pstrdup(r->pool, sub->content_type));
   #if MIME_MAGIC_DEBUG
  -	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, r,
  +	ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
   		    MODNAME ": subrequest %s got %s",
   		    sub_filename, r->content_type);
   #endif /* MIME_MAGIC_DEBUG */
  @@ -2422,14 +2422,14 @@
   		return OK;
   #if MIME_MAGIC_DEBUG
   	    prevm = 0;
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, s,
  +	    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
   			MODNAME ": magic_init 1 test");
   	    for (m = conf->magic; m; m = m->next) {
   		if (apr_isprint((((unsigned long) m) >> 24) & 255) &&
   		    apr_isprint((((unsigned long) m) >> 16) & 255) &&
   		    apr_isprint((((unsigned long) m) >> 8) & 255) &&
   		    apr_isprint(((unsigned long) m) & 255)) {
  -		    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 0, s,
  +		    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
   				MODNAME ": magic_init 1: POINTER CLOBBERED! "
   				"m=\"%c%c%c%c\" line=%d",
   				(((unsigned long) m) >> 24) & 255,
  
  
  
  1.38      +2 -2      httpd-2.0/modules/metadata/mod_unique_id.c
  
  Index: mod_unique_id.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_unique_id.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- mod_unique_id.c	25 Apr 2002 19:57:32 -0000	1.37
  +++ mod_unique_id.c	17 May 2002 11:33:10 -0000	1.38
  @@ -234,7 +234,7 @@
       }
   
       apr_sockaddr_ip_get(&ipaddrstr, sockaddr);
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, 0, main_server,
  +    ap_log_error(APLOG_MARK, APLOG_INFO, 0, main_server,
                   "mod_unique_id: using ip addr %s",
                    ipaddrstr);
   
  @@ -280,7 +280,7 @@
        * global_init ... but oh well.
        */
       if ((pid_t)cur_unique_id.pid != pid) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_CRIT, 0, s,
  +        ap_log_error(APLOG_MARK, APLOG_CRIT, 0, s,
                       "oh no! pids are greater than 32-bits!  I'm broken!");
       }
   
  
  
  
  1.21      +1 -1      httpd-2.0/os/beos/beosd.c
  
  Index: beosd.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/beos/beosd.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- beosd.c	9 Apr 2002 06:47:25 -0000	1.20
  +++ beosd.c	17 May 2002 11:33:10 -0000	1.21
  @@ -124,7 +124,7 @@
           *accepted = csd;
           apr_os_sock_get(&sockdes, csd);
           if (sockdes >= FD_SETSIZE) {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, NULL,
  +            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
                            "new file descriptor %d is too large; you probably need "
                            "to rebuild Apache with a larger FD_SETSIZE "
                            "(currently %d)",
  
  
  
  1.12      +3 -3      httpd-2.0/os/bs2000/bs2login.c
  
  Index: bs2login.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/bs2000/bs2login.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- bs2login.c	13 Mar 2002 20:47:58 -0000	1.11
  +++ bs2login.c	17 May 2002 11:33:10 -0000	1.12
  @@ -142,7 +142,7 @@
   	strcmp(os_version.release, "02.0A") == 0 ||
   	strcmp(os_version.release, "02.1A") == 0)
       {
  -	ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, NULL,
  +	ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
   		     "Error: unsupported OS version. "
   		     "You may encounter problems.");
   	forktype = bs2_FORK;
  @@ -217,7 +217,7 @@
   
   	type = forktype = bs2_noFORK;
   
  -	ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, server,
  +	ap_log_error(APLOG_MARK, APLOG_ERR, 0, server,
   		     "The debug mode of Apache should only "
   		     "be started by an unprivileged user!");
   	return 0;
  @@ -230,7 +230,7 @@
       /* An Account is required for _rini() */
       if (bs2000_account == NULL)
       {
  -	ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, 0, server,
  +	ap_log_error(APLOG_MARK, APLOG_ALERT, 0, server,
   		     "No BS2000Account configured - cannot switch to User %s",
   		     user_name);
   	exit(APEXIT_CHILDFATAL);
  
  
  
  1.52      +5 -5      httpd-2.0/os/unix/unixd.c
  
  Index: unixd.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/unix/unixd.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- unixd.c	8 May 2002 13:19:54 -0000	1.51
  +++ unixd.c	17 May 2002 11:33:10 -0000	1.52
  @@ -276,7 +276,7 @@
           }
       }
       else {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, cmd->server,
  +        ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server,
                        "Invalid parameters for %s", cmd->cmd->name);
           return;
       }
  @@ -289,7 +289,7 @@
       if (geteuid()) {
           limit->rlim_cur = cur;
           if (max) {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, cmd->server,
  +            ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server,
                            "Must be uid 0 to raise maximum %s", cmd->cmd->name);
           }
       }
  @@ -303,7 +303,7 @@
       }
   #else
   
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, cmd->server,
  +    ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server,
                    "Platform does not support rlimit for %s", cmd->cmd->name);
   #endif
   }
  @@ -439,7 +439,7 @@
           *accepted = csd;
           apr_os_sock_get(&sockdes, csd);
           if (sockdes >= FD_SETSIZE) {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, NULL,
  +            ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
                            "new file descriptor %d is too large; you probably need "
                            "to rebuild Apache with a larger FD_SETSIZE "
                            "(currently %d)",
  @@ -549,7 +549,7 @@
               return APR_EGENERAL;
               break;
           default:
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, ap_server_conf,
  +            ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf,
                            "select/accept error (%d)", status);
               return APR_EGENERAL;
   #else
  
  
  

Mime
View raw message