backport this from 2.1-dev:

  Don't include newlines in strings passed to ap_log_error.

Reviewed by: geoff, nd

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

diff --git a/STATUS b/STATUS
index c3399f4a6dede3eafaca1da9e2a9980021a67aa2..2356a30705c0dfc856666a319effc4892f676fd7 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/03/30 20:49:07 $]
+Last modified at [$Date: 2004/03/30 20:53:05 $]
 
 Release:
 
@@ -295,10 +295,6 @@ PATCHES TO BACKPORT FROM 2.1
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/support/logresolve.c?r1=1.22&r2=1.23
       +1: trawick, stoddard, nd
 
-    * Don't include newlines in strings passed to ap_log_error.
-      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/main.c?r1=1.155&r2=1.156
-      +1: trawick, geoff, nd
-
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,

diff --git a/server/main.c b/server/main.c
index b029b1f60a37adca1602b2436b6aef14cc13d746..8b9adf9bf44ad514b811dded6227b6635017ced2 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -531,7 +531,7 @@ int main(int argc, const char * const argv[])
     server_conf = ap_read_config(process, ptemp, confname, &ap_conftree);
     if (ap_run_pre_config(pconf, plog, ptemp) != OK) {
         ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR, 0,
-                     NULL, "Pre-configuration failed\n");
+                     NULL, "Pre-configuration failed");
         destroy_and_exit_process(process, 1);
     }
 
@@ -588,7 +588,7 @@ int main(int argc, const char * const argv[])
         server_conf = ap_read_config(process, ptemp, confname, &ap_conftree);
         if (ap_run_pre_config(pconf, plog, ptemp) != OK) {
             ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR,
-                         0, NULL, "Pre-configuration failed\n");
+                         0, NULL, "Pre-configuration failed");
             destroy_and_exit_process(process, 1);
         }