httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apache-1.3/src/os/win32 mod_isapi.c
Date Thu, 06 Aug 1998 17:31:35 GMT
dgaudet     98/08/06 10:31:34

  Modified:    src      CHANGES
               src/include http_config.h http_core.h http_log.h
               src/main http_config.c http_core.c http_log.c http_main.c
                        http_protocol.c http_request.c util_script.c
               src/modules/proxy mod_proxy.c proxy_cache.c proxy_connect.c
                        proxy_ftp.c proxy_http.c proxy_util.c
               src/modules/standard mod_access.c mod_actions.c mod_asis.c
                        mod_auth.c mod_auth_anon.c mod_auth_db.c
                        mod_auth_dbm.c mod_autoindex.c mod_cern_meta.c
                        mod_cgi.c mod_digest.c mod_expires.c mod_imap.c
                        mod_include.c mod_info.c mod_mime_magic.c
                        mod_negotiation.c mod_rewrite.c mod_speling.c
                        mod_status.c
               src/os/win32 mod_isapi.c
  Log:
  Correct the error_log mess in a uniform manner.  Add ap_log_rerror() which
  includes the client ip address in the log message (it takes a request_rec *
  instead of a server_rec *).
  
  PR:		2661
  
  Revision  Changes    Path
  1.1004    +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1003
  retrieving revision 1.1004
  diff -u -r1.1003 -r1.1004
  --- CHANGES	1998/08/06 00:10:36	1.1003
  +++ CHANGES	1998/08/06 17:30:18	1.1004
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.2
   
  +  *) Restore the client IP address to the error log messages, this
  +     was lost during the transition from 1.2 to 1.3.  Add a new
  +     function ap_log_rerror() which takes a request_rec * and
  +     formats it appropriately.  [Dean Gaudet] PR#2661
  +
     *) Cure ap_cfg_getline() of its nasty habit of compressing internal
        whitespace in input lines -- including within quoted strings.
        [Ken Coar]
  
  
  
  1.91      +1 -1      apache-1.3/src/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/http_config.h,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- http_config.h	1998/07/13 11:32:35	1.90
  +++ http_config.h	1998/08/06 17:30:23	1.91
  @@ -275,7 +275,7 @@
    * handle it back-compatibly, or at least signal an error).
    */
   
  -#define MODULE_MAGIC_NUMBER 19980713
  +#define MODULE_MAGIC_NUMBER 19980806
   #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL, NULL
   
   /* Generic accessors for other modules to get at their own module-specific
  
  
  
  1.45      +19 -0     apache-1.3/src/include/http_core.h
  
  Index: http_core.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- http_core.h	1998/07/01 21:19:51	1.44
  +++ http_core.h	1998/08/06 17:30:24	1.45
  @@ -86,9 +86,28 @@
   #define OPT_ALL (OPT_INDEXES|OPT_INCLUDES|OPT_SYM_LINKS|OPT_EXECCGI)
   
   /* options for get_remote_host() */
  +/* REMOTE_HOST returns the hostname, or NULL if the hostname
  + * lookup fails.  It will force a DNS lookup according to the
  + * HostnameLookups setting.
  + */
   #define REMOTE_HOST (0)
  +
  +/* REMOTE_NAME returns the hostname, or the dotted quad if the
  + * hostname lookup fails.  It will force a DNS lookup according
  + * to the HostnameLookups setting.
  + */
   #define REMOTE_NAME (1)
  +
  +/* REMOTE_NOLOOKUP is like REMOTE_NAME except that a DNS lookup is
  + * never forced.
  + */
   #define REMOTE_NOLOOKUP (2)
  +
  +/* REMOTE_DOUBLE_REV will always force a DNS lookup, and also force
  + * a double reverse lookup, regardless of the HostnameLookups
  + * setting.  The result is the (double reverse checked) hostname,
  + * or NULL if any of the lookups fail.
  + */
   #define REMOTE_DOUBLE_REV (3)
   
   #define SATISFY_ALL 0
  
  
  
  1.31      +6 -0      apache-1.3/src/include/http_log.h
  
  Index: http_log.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/http_log.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- http_log.h	1998/05/03 17:31:08	1.30
  +++ http_log.h	1998/08/06 17:30:24	1.31
  @@ -108,9 +108,15 @@
   API_EXPORT(void) ap_log_error(const char *file, int line, int level,
   			     const server_rec *s, const char *fmt, ...)
   			    __attribute__((format(printf,5,6)));
  +API_EXPORT(void) ap_log_rerror(const char *file, int line, int level,
  +			     const request_rec *s, const char *fmt, ...)
  +			    __attribute__((format(printf,5,6)));
   API_EXPORT(void) ap_error_log2stderr (server_rec *);     
   
   void ap_log_pid (pool *p, char *fname);
  +/* These are for legacy code, new code should use ap_log_error,
  + * or ap_log_rerror.
  + */
   API_EXPORT(void) ap_log_error_old(const char *err, server_rec *s);
   API_EXPORT(void) ap_log_unixerr(const char *routine, const char *file,
   			     const char *msg, server_rec *s);
  
  
  
  1.119     +3 -3      apache-1.3/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_config.c,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -u -r1.118 -r1.119
  --- http_config.c	1998/07/07 04:06:20	1.118
  +++ http_config.c	1998/08/06 17:30:27	1.119
  @@ -510,7 +510,7 @@
       }
   
       if (result == NOT_IMPLEMENTED && r->handler) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
               "handler \"%s\" not found for: %s", r->handler, r->filename);
       }
   
  @@ -1243,7 +1243,7 @@
   	ap_cfg_closefile(f);
   
   	if (errmsg) {
  -	    ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r->server, "%s: %s",
  +	    ap_log_rerror(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, r, "%s: %s",
                           filename, errmsg);
               return HTTP_INTERNAL_SERVER_ERROR;
   	}
  @@ -1254,7 +1254,7 @@
   	if (errno == ENOENT || errno == ENOTDIR)
   	    dc = NULL;
   	else {
  -	    ap_log_error(APLOG_MARK, APLOG_CRIT, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
   			"%s pcfg_openfile: unable to check htaccess file, ensure it is readable",
   			filename);
   	    return HTTP_FORBIDDEN;
  
  
  
  1.216     +5 -5      apache-1.3/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
  retrieving revision 1.215
  retrieving revision 1.216
  diff -u -r1.215 -r1.216
  --- http_core.c	1998/08/05 18:52:50	1.215
  +++ http_core.c	1998/08/06 17:30:28	1.216
  @@ -2506,7 +2506,7 @@
           return HTTP_FORBIDDEN;
       }
       if ((r->uri[0] != '/') && strcmp(r->uri, "*")) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		     "Invalid URI in request %s", r->the_request);
   	return BAD_REQUEST;
       }
  @@ -2571,7 +2571,7 @@
       r->allowed |= (1 << M_GET) | (1 << M_OPTIONS);
   
       if (r->method_number == M_INVALID) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "Invalid method in request %s", r->the_request);
   	return NOT_IMPLEMENTED;
       }
  @@ -2583,7 +2583,7 @@
       }
   
       if (r->finfo.st_mode == 0 || (r->path_info && *r->path_info)) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r->server, 
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, 
                       "File does not exist: %s", 
   		     r->path_info 
   		         ? ap_pstrcat(r->pool, r->filename, r->path_info, NULL)
  @@ -2602,7 +2602,7 @@
   #endif
   
       if (f == NULL) {
  -        ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		     "file permissions deny server access: %s", r->filename);
           return FORBIDDEN;
       }
  @@ -2625,7 +2625,7 @@
   	mm = mmap(NULL, r->finfo.st_size, PROT_READ, MAP_PRIVATE,
   		  fileno(f), 0);
   	if (mm == (caddr_t)-1) {
  -	    ap_log_error(APLOG_MARK, APLOG_CRIT, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
   			 "default_handler: mmap failed: %s", r->filename);
   	}
       }
  
  
  
  1.63      +31 -5     apache-1.3/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_log.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- http_log.c	1998/08/03 09:14:53	1.62
  +++ http_log.c	1998/08/06 17:30:29	1.63
  @@ -275,10 +275,10 @@
           dup2(fileno(s->error_log),STDERR_FILENO);
   }
   
  -API_EXPORT(void) ap_log_error (const char *file, int line, int level,
  -			      const server_rec *s, const char *fmt, ...)
  +static void log_error_core (const char *file, int line, int level,
  +			   const server_rec *s, const request_rec *r,
  +			   const char *fmt, va_list args)
   {
  -    va_list args;
       char errstr[MAX_STRING_LEN];
       size_t len;
       int save_errno = errno;
  @@ -346,6 +346,15 @@
   	len += ap_snprintf(errstr + len, sizeof(errstr) - len,
   		"%s(%d): ", file, line);
       }
  +    if (r) {
  +	/* XXX: TODO: add a method of selecting whether logged client
  +	 * addresses are in dotted quad or resolved form... dotted
  +	 * quad is the most secure, which is why I'm implementing it
  +	 * first. -djg
  +	 */
  +	len += ap_snprintf(errstr + len, sizeof(errstr) - len,
  +		"(client %s): ", r->connection->remote_ip);
  +    }
       if (!(level & APLOG_NOERRNO)
   	&& (save_errno != 0)
   #ifdef WIN32
  @@ -399,9 +408,7 @@
       }
   #endif
   
  -    va_start(args, fmt);
       len += ap_vsnprintf(errstr + len, sizeof(errstr) - len, fmt, args);
  -    va_end(args);
   
       /* NULL if we are logging to syslog */
       if (logf) {
  @@ -416,6 +423,25 @@
   #endif
   }
       
  +API_EXPORT(void) ap_log_error (const char *file, int line, int level,
  +			      const server_rec *s, const char *fmt, ...)
  +{
  +    va_list args;
  +
  +    va_start(args, fmt);
  +    log_error_core(file, line, level, s, NULL, fmt, args);
  +    va_end(args);
  +}
  +
  +API_EXPORT(void) ap_log_rerror (const char *file, int line, int level,
  +			      const request_rec *r, const char *fmt, ...)
  +{
  +    va_list args;
  +
  +    va_start(args, fmt);
  +    log_error_core(file, line, level, r->server, r, fmt, args);
  +    va_end(args);
  +}
   
   void ap_log_pid (pool *p, char *fname)
   {
  
  
  
  1.379     +5 -5      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.378
  retrieving revision 1.379
  diff -u -r1.378 -r1.379
  --- http_main.c	1998/08/03 09:14:54	1.378
  +++ http_main.c	1998/08/06 17:30:29	1.379
  @@ -999,16 +999,16 @@
   	if (sig == SIGPIPE) {
   	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
   			current_conn->server,
  -			"%s client stopped connection before %s completed",
  -			ap_get_remote_host(current_conn, dirconf, REMOTE_NAME),
  +			"(client %s) stopped connection before %s completed",
  +			current_conn->remote_ip,
   			timeout_name ? timeout_name : "request");
   	}
   	else {
   	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO,
   			current_conn->server,
  -			"%s timed out for %s",
  -			timeout_name ? timeout_name : "request",
  -			ap_get_remote_host(current_conn, dirconf, REMOTE_NAME));
  +			"(client %s) %s timed out",
  +			current_conn->remote_ip,
  +			timeout_name ? timeout_name : "request");
   	}
       }
   
  
  
  
  1.229     +17 -30    apache-1.3/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
  retrieving revision 1.228
  retrieving revision 1.229
  diff -u -r1.228 -r1.229
  --- http_protocol.c	1998/08/03 09:14:58	1.228
  +++ http_protocol.c	1998/08/06 17:30:30	1.229
  @@ -796,10 +796,8 @@
           ap_kill_timeout(r);
           if (r->status == HTTP_REQUEST_URI_TOO_LARGE) {
   
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  -                         "request failed for %s, reason: URI too long",
  -                         ap_get_remote_host(r->connection, r->per_dir_config,
  -                                            REMOTE_NAME));
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
  +                         "request failed: URI too long");
               ap_send_error_response(r, 0);
               ap_bflush(r->connection->client);
               ap_log_transaction(r);
  @@ -812,10 +810,8 @@
           get_mime_headers(r);
           ap_kill_timeout(r);
           if (r->status != HTTP_REQUEST_TIME_OUT) {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  -                         "request failed for %s: error reading the headers",
  -                         ap_get_remote_host(r->connection, r->per_dir_config, 
  -                                            REMOTE_NAME));
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
  +                         "request failed: error reading the headers");
               ap_send_error_response(r, 0);
               ap_bflush(r->connection->client);
               ap_log_transaction(r);
  @@ -926,8 +922,8 @@
           return DECLINED;
   
       if (!ap_auth_name(r)) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  -		    r->server, "need AuthName: %s", r->uri);
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  +		    r, "need AuthName: %s", r->uri);
           return SERVER_ERROR;
       }
   
  @@ -938,7 +934,7 @@
   
       if (strcasecmp(ap_getword(r->pool, &auth_line, ' '), "Basic")) {
           /* Client tried to authenticate using wrong auth scheme */
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "client used wrong authentication scheme: %s", r->uri);
           ap_note_basic_auth_failure(r);
           return AUTH_REQUIRED;
  @@ -1367,12 +1363,12 @@
   
       if (tenc) {
           if (strcasecmp(tenc, "chunked")) {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "Unknown Transfer-Encoding %s", tenc);
               return HTTP_NOT_IMPLEMENTED;
           }
           if (r->read_body == REQUEST_CHUNKED_ERROR) {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "chunked Transfer-Encoding forbidden: %s", r->uri);
               return (lenp) ? HTTP_BAD_REQUEST : HTTP_LENGTH_REQUIRED;
           }
  @@ -1385,7 +1381,7 @@
           while (ap_isdigit(*pos) || ap_isspace(*pos))
               ++pos;
           if (*pos != '\0') {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "Invalid Content-Length %s", lenp);
               return HTTP_BAD_REQUEST;
           }
  @@ -1395,7 +1391,7 @@
   
       if ((r->read_body == REQUEST_NO_BODY) &&
           (r->read_chunked || (r->remaining > 0))) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "%s with body is not allowed for %s", r->method, r->uri);
           return HTTP_REQUEST_ENTITY_TOO_LARGE;
       }
  @@ -1669,11 +1665,8 @@
                   else if (errno == EAGAIN)
                       continue;
                   else {
  -                    ap_log_error(APLOG_MARK, APLOG_INFO, r->server,
  -                     "%s client stopped connection before send body completed",
  -                                ap_get_remote_host(r->connection,
  -                                                r->per_dir_config,
  -                                                REMOTE_NAME));
  +                    ap_log_rerror(APLOG_MARK, APLOG_INFO, r,
  +                     "client stopped connection before send body completed");
                       ap_bsetflag(r->connection->client, B_EOUT, 1);
                       r->connection->aborted = 1;
                       break;
  @@ -1786,11 +1779,8 @@
                   else if (errno == EAGAIN)
                       continue;
                   else {
  -                    ap_log_error(APLOG_MARK, APLOG_INFO, r->server,
  -                     "%s client stopped connection before send body completed",
  -                                ap_get_remote_host(r->connection,
  -                                                r->per_dir_config,
  -                                                REMOTE_NAME));
  +                    ap_log_rerror(APLOG_MARK, APLOG_INFO, r,
  +                     "client stopped connection before send body completed");
                       ap_bsetflag(r->connection->client, B_EOUT, 1);
                       r->connection->aborted = 1;
                       break;
  @@ -1854,11 +1844,8 @@
                   else if (errno == EAGAIN)
                       continue;
                   else {
  -                    ap_log_error(APLOG_MARK, APLOG_INFO, r->server,
  -                     "%s client stopped connection before send mmap completed",
  -                                ap_get_remote_host(r->connection,
  -                                                r->per_dir_config,
  -                                                REMOTE_NAME));
  +                    ap_log_rerror(APLOG_MARK, APLOG_INFO, r,
  +                     "client stopped connection before send mmap completed");
                       ap_bsetflag(r->connection->client, B_EOUT, 1);
                       r->connection->aborted = 1;
                       break;
  
  
  
  1.127     +10 -12    apache-1.3/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_request.c,v
  retrieving revision 1.126
  retrieving revision 1.127
  diff -u -r1.126 -r1.127
  --- http_request.c	1998/08/03 09:14:59	1.126
  +++ http_request.c	1998/08/06 17:30:31	1.127
  @@ -103,7 +103,7 @@
           || S_ISLNK(r->finfo.st_mode)) {
           return OK;
       }
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                   "object is not a file, directory or symlink: %s",
                   r->filename);
       return HTTP_FORBIDDEN;
  @@ -246,10 +246,8 @@
   #if defined(EACCES)
               if (errno != EACCES)
   #endif
  -                ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  -                            "access to %s failed for %s", r->uri,
  -                            ap_get_remote_host(r->connection, r->per_dir_config,
  -                                            REMOTE_NOLOOKUP));
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
  +                            "access to %s failed", r->uri);
               return HTTP_FORBIDDEN;
           }
   #else
  @@ -408,7 +406,7 @@
            */
   
           if ((res = check_symlinks(test_dirname, core_dir->opts))) {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "Symbolic link not allowed: %s", test_dirname);
               return res;
           }
  @@ -503,7 +501,7 @@
        */
       if (!S_ISDIR(r->finfo.st_mode)
           && (res = check_symlinks(r->filename, ap_allow_options(r)))) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "Symbolic link not allowed: %s", r->filename);
           return res;
       }
  @@ -797,7 +795,7 @@
           }
           else {
               if ((res = check_symlinks(rnew->filename, ap_allow_options(rnew)))) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, rnew->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, rnew,
                               "Symbolic link not allowed: %s", rnew->filename);
                   rnew->status = res;
                   return rnew;
  @@ -971,7 +969,7 @@
                * dying with a recursive server error...
                */
               recursive_error = SERVER_ERROR;
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "Invalid error redirection directive: %s",
                           custom_response);
           }
  @@ -982,7 +980,7 @@
   static void decl_die(int status, char *phase, request_rec *r)
   {
       if (status == DECLINED) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_CRIT, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_CRIT, r,
                       "configuration error:  couldn't %s: %s", phase, r->uri);
           ap_die(SERVER_ERROR, r);
       }
  @@ -1025,7 +1023,7 @@
            * headers!  Have to dink things even to make sure the error message
            * comes through...
            */
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "client sent illegal HTTP/0.9 request: %s", r->uri);
           r->header_only = 0;
           ap_die(BAD_REQUEST, r);
  @@ -1041,7 +1039,7 @@
   	 * HTTP/1.1 mentions twice (S9, S14.23) that a request MUST contain
   	 * a Host: header, and the server MUST respond with 400 if it doesn't.
            */
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                  "client sent HTTP/1.1 request without hostname (see RFC2068 section 9, and 14.23): %s", r->uri);
           ap_die(BAD_REQUEST, r);
           return;
  
  
  
  1.126     +9 -9      apache-1.3/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/util_script.c,v
  retrieving revision 1.125
  retrieving revision 1.126
  diff -u -r1.125 -r1.126
  --- util_script.c	1998/08/06 02:03:38	1.125
  +++ util_script.c	1998/08/06 17:30:32	1.126
  @@ -430,7 +430,7 @@
   
   	if ((*getsfunc) (w, MAX_STRING_LEN - 1, getsfunc_data) == 0) {
   	    ap_kill_timeout(r);
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			 "Premature end of script headers: %s", r->filename);
   	    return SERVER_ERROR;
   	}
  @@ -486,7 +486,7 @@
   	    }
   
   	    ap_kill_timeout(r);
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			 "%s: %s", malformed, r->filename);
   	    return SERVER_ERROR;
   	}
  @@ -704,7 +704,7 @@
   
   	program = fopen(r->filename, "rt");
   	if (!program) {
  -	    ap_log_error(APLOG_MARK, APLOG_ERR, r->server, "fopen(%s) failed",
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, r, "fopen(%s) failed",
   			 r->filename);
   	    return (pid);
   	}
  @@ -819,13 +819,13 @@
               if (!is_exe) {
                   program = fopen(r->filename, "rb");
                   if (!program) {
  -                    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                                    "fopen(%s) failed", r->filename);
                       return (pid);
                   }
                   sz = fread(interpreter, 1, sizeof(interpreter) - 1, program);
                   if (sz < 0) {
  -                    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                                    "fread of %s failed", r->filename);
                       fclose(program);
                       return (pid);
  @@ -857,7 +857,7 @@
                * file this is by now..
                */
               if (!is_exe && !is_script && !is_binary) {
  -                ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
                                "%s is not executable; ensure interpreted scripts have "
                                "\"#!\" first line", 
                                r->filename);
  @@ -1058,7 +1058,7 @@
   	    }
   
   	    if ((pw = getpwnam(username)) == NULL) {
  -		ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +		ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			     "getpwnam: invalid username %s", username);
   		return (pid);
   	    }
  @@ -1079,7 +1079,7 @@
   	}
   	else {
   	    if ((pw = getpwuid(r->server->server_uid)) == NULL) {
  -		ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +		ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			     "getpwuid: invalid userid %ld",
   			     (long) r->server->server_uid);
   		return (pid);
  @@ -1087,7 +1087,7 @@
   	    execuser = ap_pstrdup(r->pool, pw->pw_name);
   
   	    if ((gr = getgrgid(r->server->server_gid)) == NULL) {
  -		ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +		ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			     "getgrgid: invalid groupid %ld",
   			     (long) r->server->server_gid);
   		return (pid);
  
  
  
  1.58      +2 -2      apache-1.3/src/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_proxy.c	1998/08/03 09:30:56	1.57
  +++ mod_proxy.c	1998/08/06 17:30:40	1.58
  @@ -271,7 +271,7 @@
   				  UNP_REVEALPASSWORD);
   
       ap_table_set(r->headers_out, "Location", nuri);
  -    ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, r->server,
  +    ap_log_rerror(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, r,
   		"Domain missing: %s sent to %s%s%s", r->uri,
   		ap_unparse_uri_components(r->pool, &r->parsed_uri,
   		      UNP_OMITUSERINFO),
  @@ -350,7 +350,7 @@
   	    direct_connect = list[ii].matcher(&list[ii], r);
   	}
   #if DEBUGGING
  -	ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, r,
   		     (direct_connect) ? "NoProxy for %s" : "UseProxy for %s",
   		     r->uri);
   #endif
  
  
  
  1.49      +9 -9      apache-1.3/src/modules/proxy/proxy_cache.c
  
  Index: proxy_cache.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- proxy_cache.c	1998/08/03 09:15:07	1.48
  +++ proxy_cache.c	1998/08/06 17:30:41	1.49
  @@ -670,7 +670,7 @@
   	    ap_bpushfd(cachefp, cfd, cfd);
   	}
   	else if (errno != ENOENT)
  -	    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			 "proxy: error opening cache file %s",
   			 c->filename);
   #ifdef EXPLAIN
  @@ -682,11 +682,11 @@
       if (cachefp != NULL) {
   	i = rdcache(r->pool, cachefp, c);
   	if (i == -1)
  -	    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			 "proxy: error reading cache file %s", 
   			 c->filename);
   	else if (i == 0)
  -	    ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
   			 "proxy: bad (short?) cache file: %s", c->filename);
   	if (i != 1) {
   	    ap_pclosef(r->pool, cachefp->fd);
  @@ -941,11 +941,11 @@
   	    if (lmod != c->lmod || expc != c->expire || date != c->date) {
   		off_t curpos = lseek(c->fp->fd, 0, SEEK_SET);
   		if (curpos == -1)
  -		    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +		    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   				 "proxy: error seeking on cache file %s",
   				 c->filename);
   		else if (write(c->fp->fd, buff, 35) == -1)
  -		    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +		    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   				 "proxy: error updating cache file %s",
   				 c->filename);
   	    }
  @@ -974,11 +974,11 @@
   		off_t curpos = lseek(c->fp->fd, 0, SEEK_SET);
   
   		if (curpos == -1)
  -		    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +		    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   				 "proxy: error seeking on cache file %s",
   				 c->filename);
   		else if (write(c->fp->fd, buff, 35) == -1)
  -		    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +		    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   				 "proxy: error updating cache file %s",
   				 c->filename);
   	    }
  @@ -1011,7 +1011,7 @@
   
       i = open(c->tempfile, O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0622);
       if (i == -1) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		     "proxy: error creating cache file %s",
   		     c->tempfile);
   	return DECLINED;
  @@ -1021,7 +1021,7 @@
       ap_bpushfd(c->fp, -1, i);
   
       if (ap_bvputs(c->fp, buff, "X-URL: ", c->url, "\n", NULL) == -1) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		     "proxy: error writing cache file(%s)", c->tempfile);
   	ap_pclosef(r->pool, c->fp->fd);
   	unlink(c->tempfile);
  
  
  
  1.30      +1 -1      apache-1.3/src/modules/proxy/proxy_connect.c
  
  Index: proxy_connect.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_connect.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- proxy_connect.c	1998/06/08 14:23:50	1.29
  +++ proxy_connect.c	1998/08/06 17:30:42	1.30
  @@ -160,7 +160,7 @@
   
       sock = ap_psocket(r->pool, PF_INET, SOCK_STREAM, IPPROTO_TCP);
       if (sock == -1) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "proxy: error creating socket");
   	return HTTP_INTERNAL_SERVER_ERROR;
       }
  
  
  
  1.65      +11 -11    apache-1.3/src/modules/proxy/proxy_ftp.c
  
  Index: proxy_ftp.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- proxy_ftp.c	1998/07/09 19:45:56	1.64
  +++ proxy_ftp.c	1998/08/06 17:30:43	1.65
  @@ -570,7 +570,7 @@
   
       sock = ap_psocket(p, PF_INET, SOCK_STREAM, IPPROTO_TCP);
       if (sock == -1) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		     "proxy: error creating socket");
   	return HTTP_INTERNAL_SERVER_ERROR;
       }
  @@ -579,7 +579,7 @@
   	if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF,
   		       (const char *) &conf->recv_buffer_size, sizeof(int))
   	    == -1) {
  -	    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			 "setsockopt(SO_RCVBUF): Failed to set ProxyReceiveBufferSize, using default");
   	}
       }
  @@ -587,7 +587,7 @@
       if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &one,
   		   sizeof(one)) == -1) {
   #ifndef _OSD_POSIX /* BS2000 has this option "always on" */
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		     "proxy: error setting reuseaddr option: setsockopt(SO_REUSEADDR)");
   	ap_pclosesocket(p, sock);
   	return HTTP_INTERNAL_SERVER_ERROR;
  @@ -771,7 +771,7 @@
   /* try to set up PASV data connection first */
       dsock = ap_psocket(p, PF_INET, SOCK_STREAM, IPPROTO_TCP);
       if (dsock == -1) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		     "proxy: error creating PASV socket");
   	ap_bclose(f);
   	ap_kill_timeout(r);
  @@ -781,7 +781,7 @@
       if (conf->recv_buffer_size) {
   	if (setsockopt(dsock, SOL_SOCKET, SO_RCVBUF,
   	       (const char *) &conf->recv_buffer_size, sizeof(int)) == -1) {
  -	    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			 "setsockopt(SO_RCVBUF): Failed to set ProxyReceiveBufferSize, using default");
   	}
       }
  @@ -793,7 +793,7 @@
       i = ap_bgets(pasv, sizeof(pasv), f);
   
       if (i == -1) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
   		     "PASV: control connection is toast");
   	ap_pclosesocket(p, dsock);
   	ap_bclose(f);
  @@ -848,7 +848,7 @@
       if (!pasvmode) {		/* set up data connection */
   	clen = sizeof(struct sockaddr_in);
   	if (getsockname(sock, (struct sockaddr *) &server, &clen) < 0) {
  -	    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			 "proxy: error getting socket address");
   	    ap_bclose(f);
   	    ap_kill_timeout(r);
  @@ -857,7 +857,7 @@
   
   	dsock = ap_psocket(p, PF_INET, SOCK_STREAM, IPPROTO_TCP);
   	if (dsock == -1) {
  -	    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			 "proxy: error creating socket");
   	    ap_bclose(f);
   	    ap_kill_timeout(r);
  @@ -867,7 +867,7 @@
   	if (setsockopt(dsock, SOL_SOCKET, SO_REUSEADDR, (void *) &one,
   		       sizeof(one)) == -1) {
   #ifndef _OSD_POSIX /* BS2000 has this option "always on" */
  -	    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			 "proxy: error setting reuseaddr option");
   	    ap_pclosesocket(p, dsock);
   	    ap_bclose(f);
  @@ -881,7 +881,7 @@
   	    char buff[22];
   
   	    ap_snprintf(buff, sizeof(buff), "%s:%d", inet_ntoa(server.sin_addr), server.sin_port);
  -	    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			 "proxy: error binding to ftp data socket %s", buff);
   	    ap_bclose(f);
   	    ap_pclosesocket(p, dsock);
  @@ -1048,7 +1048,7 @@
   	    csd = accept(dsock, (struct sockaddr *) &server, &clen);
   	while (csd == -1 && errno == EINTR);
   	if (csd == -1) {
  -	    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			 "proxy: failed to accept data connection");
   	    ap_pclosesocket(p, dsock);
   	    ap_bclose(f);
  
  
  
  1.54      +2 -2      apache-1.3/src/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_http.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- proxy_http.c	1998/07/09 19:45:56	1.53
  +++ proxy_http.c	1998/08/06 17:30:43	1.54
  @@ -248,7 +248,7 @@
   
       sock = ap_psocket(p, PF_INET, SOCK_STREAM, IPPROTO_TCP);
       if (sock == -1) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "proxy: error creating socket");
   	return HTTP_INTERNAL_SERVER_ERROR;
       }
  @@ -257,7 +257,7 @@
   	if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF,
   		       (const char *) &conf->recv_buffer_size, sizeof(int))
   	    == -1) {
  -	    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			 "setsockopt(SO_RCVBUF): Failed to set ProxyReceiveBufferSize, using default");
   	}
       }
  
  
  
  1.66      +3 -3      apache-1.3/src/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- proxy_util.c	1998/07/09 19:45:57	1.65
  +++ proxy_util.c	1998/08/06 17:30:44	1.66
  @@ -830,7 +830,7 @@
   BUFF *
        ap_proxy_cache_error(struct cache_req *c)
   {
  -    ap_log_error(APLOG_MARK, APLOG_ERR, c->req->server,
  +    ap_log_rerror(APLOG_MARK, APLOG_ERR, c->req,
   		 "proxy: error writing to cache file %s", c->tempfile);
       ap_pclosef(c->req->pool, c->fp->fd);
       c->fp = NULL;
  @@ -908,7 +908,7 @@
       err = ap_proxy_canon_netloc(r->pool, &url, &user, &password, &host, &port);
   
       if (err != NULL)
  -	ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
   		     "%s", err);
   
       r->hostname = host;
  @@ -1243,7 +1243,7 @@
   #endif /* WIN32 */
       } while (i == -1 && errno == EINTR);
       if (i == -1) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		     "proxy connect to %s port %d failed",
   		     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
       }
  
  
  
  1.37      +3 -3      apache-1.3/src/modules/standard/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_access.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- mod_access.c	1998/07/08 17:47:12	1.36
  +++ mod_access.c	1998/08/06 17:30:52	1.37
  @@ -376,9 +376,9 @@
   
       if (ret == FORBIDDEN
   	&& (ap_satisfies(r) != SATISFY_ANY || !ap_some_auth_required(r))) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  -		  "client %pI denied by server configuration: %s",
  -		  &r->connection->remote_addr, r->filename);
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
  +		  "client denied by server configuration: %s",
  +		  r->filename);
       }
   
       return ret;
  
  
  
  1.28      +1 -1      apache-1.3/src/modules/standard/mod_actions.c
  
  Index: mod_actions.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_actions.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_actions.c	1998/06/13 15:23:04	1.27
  +++ mod_actions.c	1998/08/06 17:30:53	1.28
  @@ -191,7 +191,7 @@
   		       action ? action : ap_default_type(r)))) {
   	script = t;
   	if (r->finfo.st_mode == 0) {
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			"File does not exist: %s", r->filename);
   	    return NOT_FOUND;
   	}
  
  
  
  1.29      +2 -2      apache-1.3/src/modules/standard/mod_asis.c
  
  Index: mod_asis.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_asis.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- mod_asis.c	1998/06/13 15:23:05	1.28
  +++ mod_asis.c	1998/08/06 17:30:53	1.29
  @@ -72,7 +72,7 @@
       if (r->method_number != M_GET)
   	return DECLINED;
       if (r->finfo.st_mode == 0) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "File does not exist: %s", r->filename);
   	return NOT_FOUND;
       }
  @@ -80,7 +80,7 @@
       f = ap_pfopen(r->pool, r->filename, "r");
   
       if (f == NULL) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "file permissions deny server access: %s", r->filename);
   	return FORBIDDEN;
       }
  
  
  
  1.39      +6 -8      apache-1.3/src/modules/standard/mod_auth.c
  
  Index: mod_auth.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_auth.c	1998/07/10 06:33:24	1.38
  +++ mod_auth.c	1998/08/06 17:30:54	1.39
  @@ -126,7 +126,7 @@
       const char *rpw, *w;
   
       if (!(f = ap_pcfg_openfile(r->pool, auth_pwfile))) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "Could not open password file: %s", auth_pwfile);
   	return NULL;
       }
  @@ -214,14 +214,14 @@
       if (!(real_pw = get_pw(r, c->user, sec->auth_pwfile))) {
   	if (!(sec->auth_authoritative))
   	    return DECLINED;
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "user %s not found: %s", c->user, r->uri);
   	ap_note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
       }
       /* anyone know where the prototype for crypt is? */
       if (strcmp(real_pw, (char *) crypt(sent_pw, real_pw))) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "user %s: password mismatch: %s", c->user, r->uri);
   	ap_note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
  @@ -292,11 +292,9 @@
       if (!(sec->auth_authoritative))
   	return DECLINED;
   
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  -	"access to %s failed for %s, reason: user %s not allowed access",
  -	r->uri,
  -	ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME),
  -	user);
  +    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
  +	"access to %s failed, reason: user %s not allowed access",
  +	r->uri, user);
   	
       ap_note_basic_auth_failure(r);
       return AUTH_REQUIRED;
  
  
  
  1.35      +2 -2      apache-1.3/src/modules/standard/mod_auth_anon.c
  
  Index: mod_auth_anon.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_anon.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- mod_auth_anon.c	1998/07/03 22:08:49	1.34
  +++ mod_auth_anon.c	1998/08/06 17:30:54	1.35
  @@ -252,7 +252,7 @@
   	       || ((strpbrk("@", sent_pw) != NULL)
   		   && (strpbrk(".", sent_pw) != NULL)))) {
   	if (sec->auth_anon_logemail && ap_is_initial_req(r)) {
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, r,
   			"Anonymous: Passwd <%s> Accepted",
   			sent_pw ? sent_pw : "\'none\'");
   	}
  @@ -260,7 +260,7 @@
       }
       else {
   	if (sec->auth_anon_authoritative) {
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			"Anonymous: Authoritative, Passwd <%s> not accepted",
   			sent_pw ? sent_pw : "\'none\'");
   	    return AUTH_REQUIRED;
  
  
  
  1.32      +5 -5      apache-1.3/src/modules/standard/mod_auth_db.c
  
  Index: mod_auth_db.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_db.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- mod_auth_db.c	1998/07/03 22:08:50	1.31
  +++ mod_auth_db.c	1998/08/06 17:30:55	1.32
  @@ -155,7 +155,7 @@
       q.size = strlen(q.data);
   
       if (!(f = dbopen(auth_dbpwfile, O_RDONLY, 0664, DB_HASH, NULL))) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "could not open db auth file: %s", auth_dbpwfile);
   	return NULL;
       }
  @@ -218,7 +218,7 @@
       if (!(real_pw = get_db_pw(r, c->user, sec->auth_dbpwfile))) {
   	if (!(sec->auth_dbauthoritative))
   	    return DECLINED;
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "DB user %s not found: %s", c->user, r->filename);
   	ap_note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
  @@ -229,7 +229,7 @@
   	*colon_pw = '\0';
       /* anyone know where the prototype for crypt is? */
       if (strcmp(real_pw, (char *) crypt(sent_pw, real_pw))) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "DB user %s: password mismatch: %s", c->user, r->uri);
   	ap_note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
  @@ -274,7 +274,7 @@
   	    if (!(groups = get_db_grp(r, user, sec->auth_dbgrpfile))) {
   		if (!(sec->auth_dbauthoritative))
   		    return DECLINED;
  -		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			    "user %s not in DB group file %s: %s",
   			    user, sec->auth_dbgrpfile, r->filename);
   		ap_note_basic_auth_failure(r);
  @@ -290,7 +290,7 @@
   			return OK;
   		}
   	    }
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			"user %s not in right group: %s", user, r->filename);
   	    ap_note_basic_auth_failure(r);
   	    return AUTH_REQUIRED;
  
  
  
  1.39      +5 -5      apache-1.3/src/modules/standard/mod_auth_dbm.c
  
  Index: mod_auth_dbm.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_dbm.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_auth_dbm.c	1998/07/03 22:08:50	1.38
  +++ mod_auth_dbm.c	1998/08/06 17:30:55	1.39
  @@ -154,7 +154,7 @@
   
   
       if (!(f = dbm_open(auth_dbmpwfile, O_RDONLY, 0664))) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "could not open dbm auth file: %s", auth_dbmpwfile);
   	return NULL;
       }
  @@ -219,7 +219,7 @@
       if (!(real_pw = get_dbm_pw(r, c->user, sec->auth_dbmpwfile))) {
   	if (!(sec->auth_dbmauthoritative))
   	    return DECLINED;
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "DBM user %s not found: %s", c->user, r->filename);
   	ap_note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
  @@ -230,7 +230,7 @@
   	*colon_pw = '\0';
       /* anyone know where the prototype for crypt is? */
       if (strcmp(real_pw, (char *) crypt(sent_pw, real_pw))) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "user %s: password mismatch: %s", c->user, r->uri);
   	ap_note_basic_auth_failure(r);
   	return AUTH_REQUIRED;
  @@ -275,7 +275,7 @@
   	    if (!(groups = get_dbm_grp(r, user, sec->auth_dbmgrpfile))) {
   		if (!(sec->auth_dbmauthoritative))
   		    return DECLINED;
  -		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			    "user %s not in DBM group file %s: %s",
   			    user, sec->auth_dbmgrpfile, r->filename);
   		ap_note_basic_auth_failure(r);
  @@ -291,7 +291,7 @@
   			return OK;
   		}
   	    }
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			"user %s not in right group: %s",
   			user, r->filename);
   	    ap_note_basic_auth_failure(r);
  
  
  
  1.87      +2 -2      apache-1.3/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- mod_autoindex.c	1998/07/08 17:47:14	1.86
  +++ mod_autoindex.c	1998/08/06 17:30:56	1.87
  @@ -1089,7 +1089,7 @@
       char direction;
   
       if (!(d = ap_popendir(r->pool, name))) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "Can't open directory for index: %s", r->filename);
   	return HTTP_FORBIDDEN;
       }
  @@ -1223,7 +1223,7 @@
   	return index_directory(r, d);
       }
       else {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		     "Directory index forbidden by rule: %s", r->filename);
   	return HTTP_FORBIDDEN;
       }
  
  
  
  1.33      +3 -3      apache-1.3/src/modules/standard/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_cern_meta.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mod_cern_meta.c	1998/07/08 17:47:14	1.32
  +++ mod_cern_meta.c	1998/08/06 17:30:56	1.33
  @@ -251,7 +251,7 @@
   	/* if we see a bogus header don't ignore it. Shout and scream */
   
   	if (!(l = strchr(w, ':'))) {
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			"malformed header in meta file: %s", r->filename);
   	    return SERVER_ERROR;
   	}
  @@ -324,7 +324,7 @@
       }
       else {
   	/* no last slash, buh?! */
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "internal error in mod_cern_meta: %s", r->filename);
   	/* should really barf, but hey, let's be friends... */
   	return DECLINED;
  @@ -353,7 +353,7 @@
   	if (errno == ENOENT) {
   	    return DECLINED;
   	}
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   	      "meta file permissions deny server access: %s", metafilename);
   	return FORBIDDEN;
       };
  
  
  
  1.84      +2 -2      apache-1.3/src/modules/standard/mod_cgi.c
  
  Index: mod_cgi.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_cgi.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- mod_cgi.c	1998/08/03 09:15:10	1.83
  +++ mod_cgi.c	1998/08/06 17:30:57	1.84
  @@ -169,7 +169,7 @@
       FILE *f;
       struct stat finfo;
   
  -    ap_log_error(APLOG_MARK, show_errno|APLOG_ERR, r->server, 
  +    ap_log_rerror(APLOG_MARK, show_errno|APLOG_ERR, r, 
   		"%s: %s", error, r->filename);
   
       if (!conf->logname ||
  @@ -431,7 +431,7 @@
       if (!ap_bspawn_child(r->main ? r->main->pool : r->pool, cgi_child,
   			 (void *) &cld, kill_after_timeout,
   			 &script_out, &script_in, &script_err)) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "couldn't spawn child process: %s", r->filename);
   	return SERVER_ERROR;
       }
  
  
  
  1.37      +5 -5      apache-1.3/src/modules/standard/mod_digest.c
  
  Index: mod_digest.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_digest.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- mod_digest.c	1998/07/08 17:47:14	1.36
  +++ mod_digest.c	1998/08/06 17:30:57	1.37
  @@ -112,7 +112,7 @@
       char *w, *x;
   
       if (!(f = ap_pcfg_openfile(r->pool, auth_pwfile))) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "Could not open password file: %s", auth_pwfile);
   	return NULL;
       }
  @@ -148,7 +148,7 @@
   	return DECLINED;
   
       if (!ap_auth_name(r)) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "need AuthName: %s", r->uri);
   	return SERVER_ERROR;
       }
  @@ -160,7 +160,7 @@
   
       if (strcasecmp(ap_getword(r->pool, &auth_line, ' '), "Digest")) {
   	/* Client tried to authenticate using wrong auth scheme */
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "client used wrong authentication scheme: %s", r->uri);
   	ap_note_digest_auth_failure(r);
   	return AUTH_REQUIRED;
  @@ -297,13 +297,13 @@
   	return DECLINED;
   
       if (!(a1 = get_hash(r, c->user, sec->pwfile))) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "user %s not found: %s", c->user, r->uri);
   	ap_note_digest_auth_failure(r);
   	return AUTH_REQUIRED;
       }
       if (strcmp(response->digest, find_digest(r, response, a1))) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "user %s: password mismatch: %s", c->user, r->uri);
   	ap_note_digest_auth_failure(r);
   	return AUTH_REQUIRED;
  
  
  
  1.29      +2 -2      apache-1.3/src/modules/standard/mod_expires.c
  
  Index: mod_expires.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_expires.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- mod_expires.c	1998/07/08 17:47:15	1.28
  +++ mod_expires.c	1998/08/06 17:30:57	1.29
  @@ -418,7 +418,7 @@
   
       conf = (expires_dir_config *) ap_get_module_config(r->per_dir_config, &expires_module);
       if (conf == NULL) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "internal error: %s", r->filename);
           return SERVER_ERROR;
       };
  @@ -468,7 +468,7 @@
           /* expecting the add_* routines to be case-hardened this 
            * is just a reminder that module is beta
            */
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "internal error: bad expires code: %s", r->filename);
           return SERVER_ERROR;
       };
  
  
  
  1.48      +3 -3      apache-1.3/src/modules/standard/mod_imap.c
  
  Index: mod_imap.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_imap.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- mod_imap.c	1998/07/08 17:47:15	1.47
  +++ mod_imap.c	1998/08/06 17:30:58	1.48
  @@ -406,7 +406,7 @@
       /* must be a relative URL to be combined with base */
       if (strchr(base, '/') == NULL && (!strncmp(value, "../", 3)
           || !strcmp(value, ".."))) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "invalid base directive in map file: %s", r->uri);
           return NULL;
       }
  @@ -466,7 +466,7 @@
                                      value */
           }
           else if (directory) {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "invalid directory name in map file: %s", r->uri);
               return NULL;
           }
  @@ -867,7 +867,7 @@
                                                    we failed. They lose! */
   
   need_2_fields:
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		"map file %s, line %d syntax error: requires at "
                   "least two fields", r->uri, imap->line_number);
       /* fall through */
  
  
  
  1.101     +47 -47    apache-1.3/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- mod_include.c	1998/08/03 09:15:11	1.100
  +++ mod_include.c	1998/08/06 17:30:58	1.101
  @@ -513,8 +513,8 @@
   		    start_of_var_name = in;
   		    in = strchr(in, '}');
   		    if (in == NULL) {
  -                        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  -				    r->server, "Missing '}' on variable \"%s\"",
  +                        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  +				    r, "Missing '}' on variable \"%s\"",
   				    expansion);
                           *next = '\0';
                           return;
  @@ -711,8 +711,8 @@
               ap_chdir_file(r->filename);
   #endif
               if (error_fmt) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  -			    r->server, error_fmt, tag_val, r->filename);
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  +			    r, error_fmt, tag_val, r->filename);
                   ap_rputs(error, r);
               }
   
  @@ -727,7 +727,7 @@
               return 0;
           }
           else {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "unknown parameter \"%s\" to tag include in %s",
                           tag, r->filename);
               ap_rputs(error, r);
  @@ -823,7 +823,7 @@
   
       if (!ap_bspawn_child(r->pool, include_cmd_child, &arg,
   			 kill_after_timeout, NULL, &script_in, NULL)) {
  -        ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		     "couldn't spawn include command");
           return -1;
       }
  @@ -847,7 +847,7 @@
           if (!strcmp(tag, "cmd")) {
               parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 1);
               if (include_cmd(parsed_string, r) == -1) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "execution failure for parameter \"%s\" "
                               "to tag exec in file %s",
                               tag, r->filename);
  @@ -861,7 +861,7 @@
           else if (!strcmp(tag, "cgi")) {
               parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
               if (include_cgi(parsed_string, r) == -1) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "invalid CGI ref \"%s\" in %s", tag_val, file);
                   ap_rputs(error, r);
               }
  @@ -874,7 +874,7 @@
               return 0;
           }
           else {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "unknown parameter \"%s\" to tag exec in %s",
                           tag, file);
               ap_rputs(error, r);
  @@ -906,7 +906,7 @@
               return 0;
           }
           else {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "unknown parameter \"%s\" to tag echo in %s",
                           tag, r->filename);
               ap_rputs(error, r);
  @@ -924,7 +924,7 @@
       AV *av = newAV();
   
       if (!(ap_allow_options(r) & OPT_INCLUDES)) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "httpd: #perl SSI disallowed by IncludesNoExec in %s",
                       r->filename);
           return DECLINED;
  @@ -991,7 +991,7 @@
               return 0;
           }
           else {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "unknown parameter \"%s\" to tag config in %s",
                           tag, r->filename);
               ap_rputs(error, r);
  @@ -1015,7 +1015,7 @@
           if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
               to_send = rr->filename;
               if ((ret = stat(to_send, finfo)) == -1) {
  -                ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                               "unable to get information about \"%s\" "
                               "in parsed file %s",
                               to_send, r->filename);
  @@ -1024,7 +1024,7 @@
           }
           else {
               ret = -1;
  -            ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                           "unable to lookup information about \"%s\" "
                           "in parsed file %s",
                           tag_val, r->filename);
  @@ -1045,7 +1045,7 @@
               return 0;
           }
           else {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "unable to get information about \"%s\" "
                           "in parsed file %s",
                           tag_val, r->filename);
  @@ -1055,7 +1055,7 @@
           }
       }
       else {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "unknown parameter \"%s\" to tag %s in %s",
                       tag, directive, r->filename);
           ap_rputs(error, r);
  @@ -1135,7 +1135,7 @@
   
       compiled = ap_pregcomp(r->pool, rexp, REG_EXTENDED | REG_NOSUB);
       if (compiled == NULL) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "unable to compile pattern \"%s\"", rexp);
           return -1;
       }
  @@ -1380,7 +1380,7 @@
                   current = current->right = new;
                   break;
               default:
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   ap_rputs(error, r);
  @@ -1394,7 +1394,7 @@
               ap_rputs("     Token: and/or\n", r);
   #endif
               if (current == (struct parse_node *) NULL) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   ap_rputs(error, r);
  @@ -1419,7 +1419,7 @@
                   case token_lbrace:
                       break;
                   default:
  -                    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                                   "Invalid expression \"%s\" in file %s",
                                   expr, r->filename);
                       ap_rputs(error, r);
  @@ -1464,7 +1464,7 @@
                   case token_lt:
                       break;
                   default:
  -                    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                                   "Invalid expression \"%s\" in file %s",
                                   expr, r->filename);
                       ap_rputs(error, r);
  @@ -1496,7 +1496,7 @@
               ap_rputs("     Token: eq/ne/ge/gt/le/lt\n", r);
   #endif
               if (current == (struct parse_node *) NULL) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   ap_rputs(error, r);
  @@ -1521,7 +1521,7 @@
                   case token_le:
                   case token_lt:
                   default:
  -                    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                                   "Invalid expression \"%s\" in file %s",
                                   expr, r->filename);
                       ap_rputs(error, r);
  @@ -1555,7 +1555,7 @@
                   current = current->parent;
               }
               if (current == (struct parse_node *) NULL) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "Unmatched ')' in \"%s\" in file %s",
   			    expr, r->filename);
                   ap_rputs(error, r);
  @@ -1588,7 +1588,7 @@
                   case token_string:
                   case token_group:
                   default:
  -                    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                                   "Invalid expression \"%s\" in file %s",
                                   expr, r->filename);
                       ap_rputs(error, r);
  @@ -1636,7 +1636,7 @@
   #endif
               if (current->left == (struct parse_node *) NULL ||
                   current->right == (struct parse_node *) NULL) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   ap_rputs(error, r);
  @@ -1701,7 +1701,7 @@
                   (current->right == (struct parse_node *) NULL) ||
                   (current->left->token.type != token_string) ||
                   (current->right->token.type != token_string)) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   ap_rputs(error, r);
  @@ -1722,7 +1722,7 @@
                       current->right->token.value[len - 1] = '\0';
                   }
                   else {
  -                    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                                   "Invalid rexp \"%s\" in file %s",
                                   current->right->token.value, r->filename);
                       ap_rputs(error, r);
  @@ -1766,7 +1766,7 @@
                   (current->right == (struct parse_node *) NULL) ||
                   (current->left->token.type != token_string) ||
                   (current->right->token.type != token_string)) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "Invalid expression \"%s\" in file %s",
                               expr, r->filename);
                   ap_rputs(error, r);
  @@ -1849,21 +1849,21 @@
               break;
   
           case token_lbrace:
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "Unmatched '(' in \"%s\" in file %s",
                           expr, r->filename);
               ap_rputs(error, r);
               goto RETURN;
   
           case token_rbrace:
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "Unmatched ')' in \"%s\" in file %s",
                           expr, r->filename);
               ap_rputs(error, r);
               goto RETURN;
   
           default:
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			"bad token type");
               ap_rputs(error, r);
               goto RETURN;
  @@ -1891,7 +1891,7 @@
           }
           else if (!strcmp(tag, "done")) {
   	    if (expr == NULL) {
  -		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			    "missing expr in if statement: %s",
   			    r->filename);
   		ap_rputs(error, r);
  @@ -1911,7 +1911,7 @@
   #endif
           }
           else {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "unknown parameter \"%s\" to tag if in %s",
                           tag, r->filename);
               ap_rputs(error, r);
  @@ -1942,7 +1942,7 @@
                   return (0);
               }
   	    if (expr == NULL) {
  -		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			    "missing expr in elif statement: %s",
   			    r->filename);
   		ap_rputs(error, r);
  @@ -1962,7 +1962,7 @@
   #endif
           }
           else {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "unknown parameter \"%s\" to tag if in %s",
                           tag, r->filename);
               ap_rputs(error, r);
  @@ -1988,7 +1988,7 @@
           return 0;
       }
       else {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "else directive does not take tags in %s",
   		    r->filename);
           if (*printing) {
  @@ -2016,7 +2016,7 @@
           return 0;
       }
       else {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "endif directive does not take tags in %s",
   		    r->filename);
           ap_rputs(error, r);
  @@ -2044,7 +2044,7 @@
           }
           else if (!strcmp(tag, "value")) {
               if (var == (char *) NULL) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "variable must precede value in set directive in %s",
   			    r->filename);
                   ap_rputs(error, r);
  @@ -2054,7 +2054,7 @@
               ap_table_setn(r->subprocess_env, var, ap_pstrdup(r->pool, parsed_string));
           }
           else {
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                           "Invalid tag for set directive in %s", r->filename);
               ap_rputs(error, r);
               return -1;
  @@ -2080,7 +2080,7 @@
           return 0;
       }
       else {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "printenv directive does not take tags in %s",
   		    r->filename);
           ap_rputs(error, r);
  @@ -2127,7 +2127,7 @@
       while (1) {
           if (!find_string(f, STARTING_SEQUENCE, r, printing)) {
               if (get_directive(f, directive, sizeof(directive), r->pool)) {
  -		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +		ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   			    "mod_include: error reading directive in %s",
   			    r->filename);
   		ap_rputs(error, r);
  @@ -2173,7 +2173,7 @@
               }
               if (!strcmp(directive, "exec")) {
                   if (noexec) {
  -                    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                                   "httpd: exec used but not allowed in %s",
                                   r->filename);
                       if (printing) {
  @@ -2212,7 +2212,7 @@
               }
   #endif
               else {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "httpd: unknown directive \"%s\" "
                               "in parsed doc %s",
                               directive, r->filename);
  @@ -2222,7 +2222,7 @@
                   ret = find_string(f, ENDING_SEQUENCE, r, 0);
               }
               if (ret) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                               "httpd: premature EOF in parsed file %s",
                               r->filename);
                   return;
  @@ -2294,7 +2294,7 @@
           return DECLINED;
       }
       if (r->finfo.st_mode == 0) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "File does not exist: %s",
                       (r->path_info
                        ? ap_pstrcat(r->pool, r->filename, r->path_info, NULL)
  @@ -2303,7 +2303,7 @@
       }
   
       if (!(f = ap_pfopen(r->pool, r->filename, "r"))) {
  -        ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                       "file permissions deny server access: %s", r->filename);
           return HTTP_FORBIDDEN;
       }
  
  
  
  1.41      +1 -1      apache-1.3/src/modules/standard/mod_info.c
  
  Index: mod_info.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_info.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- mod_info.c	1998/04/11 12:00:48	1.40
  +++ mod_info.c	1998/08/06 17:30:59	1.41
  @@ -171,7 +171,7 @@
   
       fp = ap_pcfg_openfile(p, filename);
       if (!fp) {
  -        ap_log_error(APLOG_MARK, APLOG_WARNING, r->server, 
  +        ap_log_rerror(APLOG_MARK, APLOG_WARNING, r, 
   		    "mod_info: couldn't open config file %s",
   		    filename);
           return NULL;
  
  
  
  1.37      +37 -37    apache-1.3/src/modules/standard/mod_mime_magic.c
  
  Index: mod_mime_magic.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_mime_magic.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- mod_mime_magic.c	1998/07/08 17:47:17	1.36
  +++ mod_mime_magic.c	1998/08/06 17:31:00	1.37
  @@ -575,7 +575,7 @@
   
       /* make sure we have a list to put it in */
       if (!req_dat) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
   		    MODNAME ": request config should not be NULL");
   	if (!(req_dat = magic_set_config(r))) {
   	    /* failure */
  @@ -677,7 +677,7 @@
       /* clean up and return */
       result[res_pos] = 0;
   #if MIME_MAGIC_DEBUG
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   	     MODNAME ": rsl_strdup() %d chars: %s", res_pos - 1, result);
   #endif
       return result;
  @@ -749,7 +749,7 @@
   		else {
   		    /* should not be possible */
   		    /* abandon malfunctioning module */
  -		    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r->server,
  +		    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
   				MODNAME ": bad state %d (ws)", state);
   		    return DECLINED;
   		}
  @@ -793,7 +793,7 @@
   		else {
   		    /* should not be possible */
   		    /* abandon malfunctioning module */
  -		    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r->server,
  +		    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
   				MODNAME ": bad state %d (ns)", state);
   		    return DECLINED;
   		}
  @@ -868,7 +868,7 @@
   
       if ((fd = ap_popenf(r->pool, r->filename, O_RDONLY, 0)) < 0) {
   	/* We can't open it, but we were able to stat it. */
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    MODNAME ": can't read `%s'", r->filename);
   	/* let some other handler decide what the problem is */
   	return DECLINED;
  @@ -878,7 +878,7 @@
        * try looking at the first HOWMANY bytes
        */
       if ((nbytes = read(fd, (char *) buf, sizeof(buf) - 1)) == -1) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    MODNAME ": read failed: %s", r->filename);
   	return HTTP_INTERNAL_SERVER_ERROR;
       }
  @@ -1479,7 +1479,7 @@
   	/* We used stat(), the only possible reason for this is that the
   	 * symlink is broken.
   	 */
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
   		    MODNAME ": broken symlink (%s)", fn);
   	return HTTP_INTERNAL_SERVER_ERROR;
   #endif
  @@ -1493,7 +1493,7 @@
       case S_IFREG:
   	break;
       default:
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
   		    MODNAME ": invalid mode 0%o.", (unsigned int)r->finfo.st_mode);
   	return HTTP_INTERNAL_SERVER_ERROR;
       }
  @@ -1560,7 +1560,7 @@
       struct magic *m;
   
   #if MIME_MAGIC_DEBUG
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		MODNAME ": match conf=%x file=%s m=%s m->next=%s last=%s",
   		conf,
   		conf->magicfile ? conf->magicfile : "NULL",
  @@ -1575,7 +1575,7 @@
   	    ap_isprint((((unsigned long) m) >> 16) & 255) &&
   	    ap_isprint((((unsigned long) m) >> 8) & 255) &&
   	    ap_isprint(((unsigned long) m) & 255)) {
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   			MODNAME ": match: POINTER CLOBBERED! "
   			"m=\"%c%c%c%c\"",
   			(((unsigned long) m) >> 24) & 255,
  @@ -1590,7 +1590,7 @@
       for (m = conf->magic; m; m = m->next) {
   #if MIME_MAGIC_DEBUG
   	rule_counter++;
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		    MODNAME ": line=%d desc=%s", m->lineno, m->desc);
   #endif
   
  @@ -1610,7 +1610,7 @@
   	    while (m_cont && (m_cont->cont_level != 0)) {
   #if MIME_MAGIC_DEBUG
   		rule_counter++;
  -		ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +		ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, 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,
  @@ -1629,7 +1629,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_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		    MODNAME ": rule matched, line=%d type=%d %s",
   		    m->lineno, m->type,
   		    (m->type == STRING) ? m->value.s : "");
  @@ -1653,7 +1653,7 @@
   	m = m->next;
   	while (m && (m->cont_level != 0)) {
   #if MIME_MAGIC_DEBUG
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   			MODNAME ": match line=%d cont=%d type=%d %s",
   			m->lineno, m->cont_level, m->type,
   			(m->type == STRING) ? m->value.s : "");
  @@ -1697,13 +1697,13 @@
   	    m = m->next;
   	}
   #if MIME_MAGIC_DEBUG
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		    MODNAME ": matched after %d rules", rule_counter);
   #endif
   	return 1;		/* all through */
       }
   #if MIME_MAGIC_DEBUG
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		MODNAME ": failed after %d rules", rule_counter);
   #endif
       return 0;			/* no match at all */
  @@ -1750,7 +1750,7 @@
   	(void) magic_rsl_printf(r, m->desc, pp);
   	return;
       default:
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
   		    MODNAME ": invalid m->type (%d) in mprint().",
   		    m->type);
   	return;
  @@ -1796,7 +1796,7 @@
   	    ((p->hl[3] << 24) | (p->hl[2] << 16) | (p->hl[1] << 8) | (p->hl[0]));
   	return 1;
       default:
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
   		    MODNAME ": invalid type %d in mconvert().", m->type);
   	return 0;
       }
  @@ -1848,7 +1848,7 @@
       int matched;
   
       if ((m->value.s[0] == 'x') && (m->value.s[1] == '\0')) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
   		    MODNAME ": BOINK");
   	return 1;
       }
  @@ -1893,7 +1893,7 @@
   	break;
       default:
   	/*  bogosity, pretend that it just wasn't a match */
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
   		    MODNAME ": invalid type %d in mcheck().", m->type);
   	return 0;
       }
  @@ -1903,7 +1903,7 @@
       switch (m->reln) {
       case 'x':
   #if MIME_MAGIC_DEBUG
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		    "%lu == *any* = 1", v);
   #endif
   	matched = 1;
  @@ -1912,7 +1912,7 @@
       case '!':
   	matched = v != l;
   #if MIME_MAGIC_DEBUG
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		    "%lu != %lu = %d", v, l, matched);
   #endif
   	break;
  @@ -1920,7 +1920,7 @@
       case '=':
   	matched = v == l;
   #if MIME_MAGIC_DEBUG
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		    "%lu == %lu = %d", v, l, matched);
   #endif
   	break;
  @@ -1929,14 +1929,14 @@
   	if (m->flag & UNSIGNED) {
   	    matched = v > l;
   #if MIME_MAGIC_DEBUG
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   			"%lu > %lu = %d", v, l, matched);
   #endif
   	}
   	else {
   	    matched = (long) v > (long) l;
   #if MIME_MAGIC_DEBUG
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   			"%ld > %ld = %d", v, l, matched);
   #endif
   	}
  @@ -1946,14 +1946,14 @@
   	if (m->flag & UNSIGNED) {
   	    matched = v < l;
   #if MIME_MAGIC_DEBUG
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   			"%lu < %lu = %d", v, l, matched);
   #endif
   	}
   	else {
   	    matched = (long) v < (long) l;
   #if MIME_MAGIC_DEBUG
  -	    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   			"%ld < %ld = %d", v, l, matched);
   #endif
   	}
  @@ -1962,7 +1962,7 @@
       case '&':
   	matched = (v & l) == l;
   #if MIME_MAGIC_DEBUG
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		    "((%lx & %lx) == %lx) = %d", v, l, l, matched);
   #endif
   	break;
  @@ -1970,7 +1970,7 @@
       case '^':
   	matched = (v & l) != l;
   #if MIME_MAGIC_DEBUG
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		    "((%lx & %lx) != %lx) = %d", v, l, l, matched);
   #endif
   	break;
  @@ -1978,7 +1978,7 @@
       default:
   	/* bogosity, pretend it didn't match */
   	matched = 0;
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, r,
   		    MODNAME ": mcheck: can't happen: invalid relation %d.",
   		    m->reln);
   	break;
  @@ -2153,7 +2153,7 @@
       return (child_pid);
   #else
       execvp(compr[parm->method].argv[0], compr[parm->method].argv);
  -    ap_log_error(APLOG_MARK, APLOG_ERR, parm->r->server,
  +    ap_log_rerror(APLOG_MARK, APLOG_ERR, parm->r,
   		MODNAME ": could not execute `%s'.",
   		compr[parm->method].argv[0]);
       return -1;
  @@ -2179,14 +2179,14 @@
   
       if (!ap_bspawn_child(sub_pool, uncompress_child, &parm, kill_always,
   			 &bin, &bout, NULL)) {
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    MODNAME ": couldn't spawn uncompress process: %s", r->uri);
   	return -1;
       }
   
       if (ap_bwrite(bin, old, n) != n) {
   	ap_destroy_pool(sub_pool);
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    MODNAME ": write failed.");
   	return -1;
       }
  @@ -2194,7 +2194,7 @@
       *newch = (unsigned char *) ap_palloc(r->pool, n);
       if ((n = ap_bread(bout, *newch, n)) <= 0) {
   	ap_destroy_pool(sub_pool);
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   	    MODNAME ": read failed %s", r->filename);
   	return -1;
       }
  @@ -2301,7 +2301,7 @@
       request_rec *sub;
   
   #if MIME_MAGIC_DEBUG
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		MODNAME ": revision_suffix checking %s", r->filename);
   #endif /* MIME_MAGIC_DEBUG */
   
  @@ -2320,7 +2320,7 @@
       result = 0;
       sub_filename = ap_pstrndup(r->pool, r->filename, suffix_pos);
   #if MIME_MAGIC_DEBUG
  -    ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		MODNAME ": subrequest lookup for %s", sub_filename);
   #endif /* MIME_MAGIC_DEBUG */
       sub = ap_sub_req_lookup_file(sub_filename, r);
  @@ -2329,7 +2329,7 @@
       if (sub->content_type) {
   	r->content_type = ap_pstrdup(r->pool, sub->content_type);
   #if MIME_MAGIC_DEBUG
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_DEBUG, r,
   		    MODNAME ": subrequest %s got %s",
   		    sub_filename, r->content_type);
   #endif /* MIME_MAGIC_DEBUG */
  
  
  
  1.84      +6 -6      apache-1.3/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- mod_negotiation.c	1998/07/08 17:47:18	1.83
  +++ mod_negotiation.c	1998/08/06 17:31:00	1.84
  @@ -681,7 +681,7 @@
       }
   
       if (!*cp) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "Syntax error in type map --- no ':': %s", r->filename);
           return NULL;
       }
  @@ -691,7 +691,7 @@
       } while (*cp && ap_isspace(*cp));
   
       if (!*cp) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "Syntax error in type map --- no header body: %s",
                       r->filename);
           return NULL;
  @@ -713,7 +713,7 @@
   
       map = ap_pfopen(neg->pool, rr->filename, "r");
       if (map == NULL) {
  -        ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                       "cannot access type map file: %s", rr->filename);
           return HTTP_FORBIDDEN;
       }
  @@ -805,7 +805,7 @@
       dirp = ap_popendir(neg->pool, neg->dir_name);
   
       if (dirp == NULL) {
  -        ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                       "cannot read directory for multi: %s", neg->dir_name);
           return HTTP_FORBIDDEN;
       }
  @@ -2052,7 +2052,7 @@
       }
   
       if (!best) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "no acceptable variant: %s", r->filename);
   
           set_neg_headers(r, neg, na_result);
  @@ -2139,7 +2139,7 @@
       }
   
       if (!best) {
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                       "no acceptable variant: %s", r->filename);
   
           set_neg_headers(r, neg, na_result);
  
  
  
  1.128     +13 -13    apache-1.3/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- mod_rewrite.c	1998/08/03 09:15:14	1.127
  +++ mod_rewrite.c	1998/08/06 17:31:05	1.128
  @@ -1097,7 +1097,7 @@
                * we can actually use it!
                */
               if (!proxy_available) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                                "attempt to make remote request from mod_rewrite "
                                "without proxy enabled: %s", r->filename);
                   return FORBIDDEN;
  @@ -1334,7 +1334,7 @@
        */
       if (!(ap_allow_options(r) & (OPT_SYM_LINKS | OPT_SYM_OWNER))) {
           /* FollowSymLinks is mandatory! */
  -        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
                        "Options FollowSymLinks or SymLinksIfOwnerMatch is off "
                        "which implies that RewriteRule directive is forbidden: "
                        "%s", r->filename);
  @@ -2614,8 +2614,8 @@
               if (cpT != NULL) {
                   n = strlen(cpT);
                   if (cpO + n >= newuri + sizeof(newuri)) {
  -                    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  -                                 r->server, "insufficient space in "
  +                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR,
  +                                 r, "insufficient space in "
                                    "expand_map_lookups, aborting");
                       return;
                   }
  @@ -2625,8 +2625,8 @@
               else {
                   n = strlen(defaultvalue);
                   if (cpO + n >= newuri + sizeof(newuri)) {
  -                    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 
  -                                 r->server, "insufficient space in "
  +                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 
  +                                 r, "insufficient space in "
                                    "expand_map_lookups, aborting");
                       return;
                   }
  @@ -2640,8 +2640,8 @@
                   cpT = cpI+strlen(cpI);
               n = cpT-cpI;
               if (cpO + n >= newuri + sizeof(newuri)) {
  -                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 
  -                             r->server, "insufficient space in "
  +                ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 
  +                             r, "insufficient space in "
                                "expand_map_lookups, aborting");
                   return;
               }
  @@ -2691,7 +2691,7 @@
           if (strcmp(s->name, name) == 0) {
               if (s->type == MAPTYPE_TXT) {
                   if (stat(s->checkfile, &st) == -1) {
  -                    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                                    "mod_rewrite: can't access text RewriteMap "
                                    "file %s", s->checkfile);
                       rewritelog(r, 1, "can't open RewriteMap file, "
  @@ -2726,7 +2726,7 @@
               else if (s->type == MAPTYPE_DBM) {
   #ifndef NO_DBM_REWRITEMAP
                   if (stat(s->checkfile, &st) == -1) {
  -                    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                                    "mod_rewrite: can't access DBM RewriteMap "
                                    "file %s", s->checkfile);
                       rewritelog(r, 1, "can't open DBM RewriteMap file, "
  @@ -2786,7 +2786,7 @@
               }
               else if (s->type == MAPTYPE_RND) {
                   if (stat(s->checkfile, &st) == -1) {
  -                    ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +                    ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                                    "mod_rewrite: can't access text RewriteMap "
                                    "file %s", s->checkfile);
                       rewritelog(r, 1, "can't open RewriteMap file, "
  @@ -4092,7 +4092,7 @@
   #endif
   
       if (rc < 0) {
  -        ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                        "mod_rewrite: failed to lock file descriptor");
           exit(1);
       }
  @@ -4122,7 +4122,7 @@
   #endif
   
       if (rc < 0) {
  -        ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +        ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                        "mod_rewrite: failed to unlock file descriptor");
           exit(1);
       }
  
  
  
  1.23      +2 -2      apache-1.3/src/modules/standard/mod_speling.c
  
  Index: mod_speling.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_speling.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_speling.c	1998/08/06 02:38:10	1.22
  +++ mod_speling.c	1998/08/06 17:31:11	1.23
  @@ -382,7 +382,7 @@
               ap_table_setn(r->headers_out, "Location",
   			  ap_construct_url(r->pool, nuri, r));
   
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_INFO, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_INFO, r,
   			 ref ? "Fixed spelling: %s to %s from %s"
   			     : "Fixed spelling: %s to %s",
   			 r->uri, nuri, ref);
  @@ -465,7 +465,7 @@
               /* Pass our table to http_protocol.c (see mod_negotiation): */
               ap_table_setn(notes, "variant-list", t);
   
  -            ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_INFO, r->server,
  +            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO | APLOG_INFO, r,
   			 ref ? "Spelling fix: %s: %d candidates from %s"
   			     : "Spelling fix: %s: %d candidates",
   			 r->uri, candidates->nelts, ref);
  
  
  
  1.91      +1 -1      apache-1.3/src/modules/standard/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- mod_status.c	1998/08/03 09:15:14	1.90
  +++ mod_status.c	1998/08/06 17:31:14	1.91
  @@ -246,7 +246,7 @@
       tu = ts = tcu = tcs = 0;
   
       if (!ap_exists_scoreboard_image()) {
  -	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r,
   		    "Server status unavailable in inetd mode");
   	return HTTP_INTERNAL_SERVER_ERROR;
       }
  
  
  
  1.14      +10 -10    apache-1.3/src/os/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/os/win32/mod_isapi.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_isapi.c	1998/07/08 17:47:24	1.13
  +++ mod_isapi.c	1998/08/06 17:31:34	1.14
  @@ -147,14 +147,14 @@
   
       if (!(isapi_handle = LoadLibraryEx(r->filename, NULL,
   				       LOAD_WITH_ALTERED_SEARCH_PATH))) {
  -	ap_log_error(APLOG_MARK, APLOG_ALERT, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ALERT, r,
   		    "Could not load DLL: %s", r->filename);
   	return SERVER_ERROR;
       }
   
       if (!(isapi_version =
   	  (void *)(GetProcAddress(isapi_handle, "GetExtensionVersion")))) {
  -	ap_log_error(APLOG_MARK, APLOG_ALERT, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ALERT, r,
   		    "DLL could not load GetExtensionVersion(): %s", r->filename);
   	FreeLibrary(isapi_handle);
   	return SERVER_ERROR;
  @@ -162,7 +162,7 @@
   
       if (!(isapi_entry =
   	  (void *)(GetProcAddress(isapi_handle, "HttpExtensionProc")))) {
  -	ap_log_error(APLOG_MARK, APLOG_ALERT, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ALERT, r,
   		    "DLL could not load HttpExtensionProc(): %s", r->filename);
   	FreeLibrary(isapi_handle);
   	return SERVER_ERROR;
  @@ -173,7 +173,7 @@
       /* Run GetExtensionVersion() */
   
       if ((*isapi_version)(pVer) != TRUE) {
  -	ap_log_error(APLOG_MARK, APLOG_ALERT, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ALERT, r,
   		    "ISAPI GetExtensionVersion() failed: %s", r->filename);
   	FreeLibrary(isapi_handle);
   	return SERVER_ERROR;
  @@ -264,7 +264,7 @@
   
       /* Check for a log message - and log it */
       if (ecb->lpszLogData && strcmp(ecb->lpszLogData, ""))
  -	ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   		    "%s: %s", ecb->lpszLogData, r->filename);
   
       /* All done with the DLL... get rid of it */
  @@ -283,7 +283,7 @@
   
   	return OK;
       case HSE_STATUS_PENDING:	/* We don't support this */
  -	ap_log_error(APLOG_MARK, APLOG_WARNING, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_WARNING, r,
   		    "ISAPI asynchronous I/O not supported: %s", r->filename);
       case HSE_STATUS_ERROR:
       default:
  @@ -345,7 +345,7 @@
   
       /* We only support synchronous writing */
       if (dwReserved && dwReserved != HSE_IO_SYNC) {
  -	ap_log_error(APLOG_MARK, APLOG_WARNING, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_WARNING, r,
   		    "ISAPI asynchronous I/O not supported: %s", r->filename);
   	SetLastError(ERROR_INVALID_PARAMETER);
   	return FALSE;
  @@ -430,7 +430,7 @@
   		*lf = '\0';
   #else
   	    if (!lf) { /* Huh? Invalid data, I think */
  -		ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +		ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			    "ISA sent invalid headers: %s", r->filename);
   		SetLastError(ERROR);	/* XXX: Find right error */
   		return FALSE;
  @@ -453,7 +453,7 @@
   
   	    if (!(value = strchr(data, ':'))) {
   		SetLastError(ERROR);	/* XXX: Find right error */
  -		ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
  +		ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
   			    "ISA sent invalid headers", r->filename);
   		return FALSE;
   	    }
  @@ -536,7 +536,7 @@
       /* We don't support all this async I/O, Microsoft-specific stuff */
       case HSE_REQ_IO_COMPLETION:
       case HSE_REQ_TRANSMIT_FILE:
  -	ap_log_error(APLOG_MARK, APLOG_WARNING, r->server,
  +	ap_log_rerror(APLOG_MARK, APLOG_WARNING, r,
   		    "ISAPI asynchronous I/O not supported: %s", r->filename);
       default:
   	SetLastError(ERROR_INVALID_PARAMETER);
  
  
  

Mime
View raw message