Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Errors-To: <wrowe@rowe-clan.net>
Message-Id: <5.1.0.14.2.20020605000030.02b7c2e0@pop3.rowe-clan.net>
Date: Wed, 05 Jun 2002 00:17:45 -0500
To: dev@httpd.apache.org
From: "William A. Rowe, Jr." <wrowe@rowe-clan.net>
Subject: 1.3.25 green light again.
In-Reply-To: <20020605045315.94606.qmail@icarus.apache.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; format=flowed

The transposed getopt list containing fF: was the culprit, of course.

1.3.25 rides again.  Pipelining to our 1.3.25 proxy appears to work.

Bill

>wrowe      2002/06/04 21:53:15
>
>   Modified:    src/main http_main.c
>   Log:
>     First, checking for typos like fF: instead of Ff: in the getopt list
>     would have been goodness.  But this simply doesn't apply to win32,
>     we don't DETACH in the Unix-ish way of the world.
>
>     I don't even believe this applies to ANY user of the MULTITHREADed
>     code path [only Netware and Win32 use it, correct?]  But I'll leave
>     the code in, and exclude only Win32 (where it was a noop anyways.)
>
>   Revision  Changes    Path
>   1.586     +6 -2      apache-1.3/src/main/http_main.c
>
>   Index: http_main.c
>   ===================================================================
>   RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
>   retrieving revision 1.585
>   retrieving revision 1.586
>   diff -u -r1.585 -r1.586
>   --- http_main.c       3 Jun 2002 12:28:27 -0000       1.585
>   +++ http_main.c       5 Jun 2002 04:53:15 -0000       1.586
>   @@ -1351,7 +1351,7 @@
>    #ifdef WIN32
>        fprintf(stderr, "Usage: %s [-D name] [-d directory] [-f file] [-n 
> service]\n", bin);
>        fprintf(stderr, "       %s [-C \"directive\"] [-c \"directive\"] 
> [-k signal]\n", pad);
>   -    fprintf(stderr, "       %s [-v] [-V] [-h] [-l] [-L] [-S] [-t] [-T] 
> [-F]\n", pad);
>   +    fprintf(stderr, "       %s [-v] [-V] [-h] [-l] [-L] [-S] [-t] 
> [-T]\n", pad);
>    #else /* !WIN32 */
>    #ifdef SHARED_CORE
>        fprintf(stderr, "Usage: %s [-R directory] [-D name] [-d directory] 
> [-f file]\n", bin);
>   @@ -1382,7 +1382,9 @@
>    #endif
>        fprintf(stderr, "  -t               : run syntax check for config 
> files (with docroot check)\n");
>        fprintf(stderr, "  -T               : run syntax check for config 
> files (without docroot check)\n");
>   +#ifndef WIN32
>        fprintf(stderr, "  -F               : run main process in 
> foreground, for process supervisors\n");
>   +#endif
>    #ifdef WIN32
>        fprintf(stderr, "  -n name          : name the Apache service for 
> -k options below;\n");
>        fprintf(stderr, "  -k stop|shutdown : tell running Apache to 
> shutdown\n");
>   @@ -7256,7 +7258,7 @@
>            reparsed = 1;
>        }
>
>   -    while ((c = getopt(argc, argv, 
> "D:C:c:Xd:fF:vVlLz:Z:wiuStThk:n:W:")) != -1) {
>   +    while ((c = getopt(argc, argv, 
> "D:C:c:Xd:f:vVlLz:Z:wiuStThk:n:W:")) != -1) {
>    #else /* !WIN32 */
>        while ((c = getopt(argc, argv, "D:C:c:Xd:fF:vVlLesStTh")) != -1) {
>    #endif
>   @@ -7380,9 +7382,11 @@
>                        && ap_server_root[strlen(ap_server_root) - 1] == '/')
>                    ap_server_root[strlen(ap_server_root) - 1] = '\0';
>             break;
>   +#ifndef WIN32
>         case 'F':
>             do_detach = 0;
>             break;
>   +#endif
>         case 'f':
>                ap_cpystrn(ap_server_confname,
>                           ap_os_canonical_filename(pcommands, optarg),
>
>
>