rse 98/05/29 01:18:53
Modified: src/main http_main.c
src/modules/standard mod_include.c mod_log_agent.c
mod_log_config.c mod_log_referer.c mod_mime.c
Log:
It's incorrect to use trailing newline characters in the string to
ap_log_error() because ap_log_error() adds itself a newline when logging to
files and wants to add nothing when logging to syslog.
Revision Changes Path
1.357 +4 -4 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.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- http_main.c 1998/05/29 00:15:59 1.356
+++ http_main.c 1998/05/29 08:18:49 1.357
@@ -792,7 +792,7 @@
lock_fd = ap_popenf(p, ap_lock_fname, O_WRONLY, 0600);
if (lock_fd == -1) {
ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
- "Child cannot open lock file: %s\n", ap_lock_fname);
+ "Child cannot open lock file: %s", ap_lock_fname);
clean_child_exit(APEXIT_CHILDINIT);
}
}
@@ -808,7 +808,7 @@
lock_fd = ap_popenf(p, ap_lock_fname, O_CREAT | O_WRONLY | O_EXCL, 0600);
if (lock_fd == -1) {
ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
- "Parent cannot open lock file: %s\n", ap_lock_fname);
+ "Parent cannot open lock file: %s", ap_lock_fname);
exit(APEXIT_INIT);
}
ap_register_cleanup(p, NULL, accept_mutex_cleanup, ap_null_cleanup);
@@ -1662,7 +1662,7 @@
if (errno == ENOSYS) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, server_conf,
"httpd: Your kernel was built without CONFIG_SYSVIPC\n"
- "httpd: please consult the Apache FAQ for details\n");
+ "httpd: please consult the Apache FAQ for details");
}
#endif
ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
@@ -3728,7 +3728,7 @@
PROCESSOR_CLASS_ANY);
if (status != OK) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, server_conf,
- "processor unbind failed %d\n", status);
+ "processor unbind failed %d", status);
}
#endif
RAISE_SIGSTOP(MAKE_CHILD);
1.94 +1 -1 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.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- mod_include.c 1998/05/28 22:09:56 1.93
+++ mod_include.c 1998/05/29 08:18:51 1.94
@@ -1838,7 +1838,7 @@
case token_rbrace:
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
- "Unmatched ')' in \"%s\" in file %s\n",
+ "Unmatched ')' in \"%s\" in file %s",
expr, r->filename);
ap_rputs(error, r);
goto RETURN;
1.28 +1 -1 apache-1.3/src/modules/standard/mod_log_agent.c
Index: mod_log_agent.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_agent.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_log_agent.c 1998/05/29 01:09:03 1.27
+++ mod_log_agent.c 1998/05/29 08:18:51 1.28
@@ -126,7 +126,7 @@
else if (*cls->fname != '\0') {
if ((cls->agent_fd = ap_popenf(p, fname, xfer_flags, xfer_mode)) <
0) {
ap_log_error(APLOG_MARK, APLOG_ERR, s,
- "httpd: could not open agent log file %s.\n",
fname);
+ "httpd: could not open agent log file %s.", fname);
exit(1);
}
}
1.59 +1 -1 apache-1.3/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_config.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mod_log_config.c 1998/05/29 01:09:04 1.58
+++ mod_log_config.c 1998/05/29 08:18:51 1.59
@@ -917,7 +917,7 @@
char *fname = ap_server_root_relative(p, cls->fname);
if ((cls->log_fd = ap_popenf(p, fname, xfer_flags, xfer_mode)) < 0) {
ap_log_error(APLOG_MARK, APLOG_ERR, s,
- "httpd: could not open transfer log file %s.\n",
fname);
+ "httpd: could not open transfer log file %s.",
fname);
exit(1);
}
}
1.31 +1 -1 apache-1.3/src/modules/standard/mod_log_referer.c
Index: mod_log_referer.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_log_referer.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mod_log_referer.c 1998/05/29 01:09:04 1.30
+++ mod_log_referer.c 1998/05/29 08:18:51 1.31
@@ -143,7 +143,7 @@
else if (*cls->fname != '\0') {
if ((cls->referer_fd = ap_popenf(p, fname, xfer_flags, xfer_mode)) <
0) {
ap_log_error(APLOG_MARK, APLOG_ERR, s,
- "httpd: could not open referer log file %s.\n",
fname);
+ "httpd: could not open referer log file %s.", fname);
exit(1);
}
}
1.41 +1 -1 apache-1.3/src/modules/standard/mod_mime.c
Index: mod_mime.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_mime.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- mod_mime.c 1998/05/29 01:09:04 1.40
+++ mod_mime.c 1998/05/29 08:18:52 1.41
@@ -217,7 +217,7 @@
if (!(f = ap_pcfg_openfile(p, types_confname))) {
ap_log_error(APLOG_MARK, APLOG_ERR, s,
- "httpd: could not open mime types log file %s.\n",
types_confname);
+ "httpd: could not open mime types log file %s.",
types_confname);
exit(1);
}
