martin      01/07/04 05:09:55

  Modified:    conf     httpd.conf-dist
               src/main util.c
               src      CHANGES
  Log:
  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
  
  Revision  Changes    Path
  1.72      +2 -2      apache-1.3/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===================================================================
  RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -u -r1.71 -r1.72
  --- httpd.conf-dist	2001/05/13 17:59:49	1.71
  +++ httpd.conf-dist	2001/07/04 12:09:42	1.72
  @@ -241,10 +241,10 @@
   #    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
  
  
  
  1.198     +3 -0      apache-1.3/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/util.c,v
  retrieving revision 1.197
  retrieving revision 1.198
  diff -u -u -r1.197 -r1.198
  --- util.c	2001/03/30 17:37:54	1.197
  +++ util.c	2001/07/04 12:09:47	1.198
  @@ -811,6 +811,9 @@
   	    ++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;
  
  
  
  1.1691    +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1690
  retrieving revision 1.1691
  diff -u -u -r1.1690 -r1.1691
  --- CHANGES	2001/06/22 12:43:55	1.1690
  +++ CHANGES	2001/07/04 12:09:51	1.1691
  @@ -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>]