Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 50696 invoked from network); 7 Dec 2006 17:10:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Dec 2006 17:10:24 -0000 Received: (qmail 71264 invoked by uid 500); 7 Dec 2006 17:10:32 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 71210 invoked by uid 500); 7 Dec 2006 17:10:32 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 71199 invoked by uid 99); 7 Dec 2006 17:10:32 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Dec 2006 09:10:31 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Dec 2006 09:10:23 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id A09EF1A9846; Thu, 7 Dec 2006 09:09:39 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r483553 - in /httpd/httpd/branches/2.2.x: Makefile.win server/mpm/winnt/mpm_winnt.h Date: Thu, 07 Dec 2006 17:09:38 -0000 To: cvs@httpd.apache.org From: wrowe@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061207170939.A09EF1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wrowe Date: Thu Dec 7 09:09:37 2006 New Revision: 483553 URL: http://svn.apache.org/viewvc?view=rev&rev=483553 Log: Fix two flaws that make parallel testing of Apache2 (.0, .2, .x) very difficult, change the default dir for command-line make to \Apache22 on Windows, and change the service name to Apache2.2 by default (this *matches* the windows installer.) Resolves recent bug reports and confusion. Modified: httpd/httpd/branches/2.2.x/Makefile.win httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.h Modified: httpd/httpd/branches/2.2.x/Makefile.win URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Makefile.win?view=diff&rev=483553&r1=483552&r2=483553 ============================================================================== --- httpd/httpd/branches/2.2.x/Makefile.win (original) +++ httpd/httpd/branches/2.2.x/Makefile.win Thu Dec 7 09:09:37 2006 @@ -13,7 +13,7 @@ # The following install defaults may be customized; # # Option Default -# INSTDIR \Apache2 +# INSTDIR \Apache22 # PORT 80 # SSLPORT 443 # SERVERNAME localhost @@ -105,7 +105,7 @@ !ENDIF !IF "$(INSTDIR)" == "" -INSTDIR=\Apache2 +INSTDIR=\Apache22 !ENDIF !IF "$(SERVERNAME)" == "" SERVERNAME=localhost Modified: httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.h URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.h?view=diff&rev=483553&r1=483552&r2=483553 ============================================================================== --- httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.h (original) +++ httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.h Thu Dec 7 09:09:37 2006 @@ -32,7 +32,7 @@ #define SERVICE_APACHE_RESTART 128 #ifndef AP_DEFAULT_SERVICE_NAME -#define AP_DEFAULT_SERVICE_NAME "Apache2" +#define AP_DEFAULT_SERVICE_NAME "Apache2.2" #endif #define SERVICECONFIG9X "Software\\Microsoft\\Windows\\CurrentVersion\\RunServices"