Print a warning when an attempt is made to use line-end comments.

Apparently they are not detected/handled gracefully by all directives.
Also, change one occurrance (Group #-1) to use a quoted string (Group "#-1")

Reviewed by:	Ryan Bloom

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

diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist
index eed273dda04dea8cf94296ff530118921ddaa6ad..ccf3edd8335aa072fabe67b86396aeb5e8aeb7c3 100644 (file)
--- a/conf/httpd.conf-dist
+++ b/conf/httpd.conf-dist
@@ -241,10 +241,10 @@ Port 80
 #    suggested workaround is to create a user www and use that user.
 #  NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET)
 #  when the value of (unsigned)Group is above 60000; 
-#  don't use Group #-1 on these systems!
+#  don't use Group "#-1" on these systems!
 #
 User nobody
-Group #-1
+Group "#-1"
 
 #
 # ServerAdmin: Your address, where problems with the server should be

diff --git a/src/CHANGES b/src/CHANGES
index 336db8636af740c8d6efad898db87a7a5f4c6ec1..612686ee3044d268bac6b567d89f7d61bc5651b8 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 1.3.21
 
+  *) Print a warning when an attempt is made to use line-end comments.
+     Apparently they are not detected/handled gracefully by all directives.
+     [Martin Kraemer]
+
   *) (TPF only) Take advantage of improvements to select(), fork(), and
      exec() in the TPF operating system.  
      [David McCreedy <McCreedy@us.ibm.com>]

diff --git a/src/main/util.c b/src/main/util.c
index b857b0beefcf85c199106adb6bcc4b3ab9c950c6..5b40903bc6b3ef6385e402f1ba641db05395d4fb 100644 (file)
--- a/src/main/util.c
+++ b/src/main/util.c
@@ -811,6 +811,9 @@ API_EXPORT(char *) ap_getword_conf(pool *p, const char **line)
            ++strend;
     }
     else {
+       if (*str == '#')
+           ap_log_error(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, NULL, 
+                        "Apache does not support line-end comments. Consider using quotes around argument: \"%s\"", str);
        strend = str;
        while (*strend && !ap_isspace(*strend))
            ++strend;