Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 89391 invoked from network); 13 Feb 2008 12:47:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Feb 2008 12:47:56 -0000 Received: (qmail 64669 invoked by uid 500); 13 Feb 2008 12:47:49 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 64620 invoked by uid 500); 13 Feb 2008 12:47:49 -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 64609 invoked by uid 99); 13 Feb 2008 12:47:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Feb 2008 04:47:49 -0800 X-ASF-Spam-Status: No, hits=-1999.1 required=10.0 tests=ALL_TRUSTED,NORMAL_HTTP_TO_IP,URIBL_RHS_DOB 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; Wed, 13 Feb 2008 12:47:05 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4EC541A9838; Wed, 13 Feb 2008 04:47:25 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r627385 - in /httpd/httpd/branches/2.2.x: INSTALL build/installwinconf.awk docs/manual/platform/windows.xml Date: Wed, 13 Feb 2008 12:47:23 -0000 To: cvs@httpd.apache.org From: erikabele@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080213124725.4EC541A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: erikabele Date: Wed Feb 13 04:47:17 2008 New Revision: 627385 URL: http://svn.apache.org/viewvc?rev=627385&view=rev Log: A more complete solution for PR 41823, see also r619749 (BACKPORT). Modified: httpd/httpd/branches/2.2.x/INSTALL httpd/httpd/branches/2.2.x/build/installwinconf.awk httpd/httpd/branches/2.2.x/docs/manual/platform/windows.xml Modified: httpd/httpd/branches/2.2.x/INSTALL URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/INSTALL?rev=627385&r1=627384&r2=627385&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/INSTALL (original) +++ httpd/httpd/branches/2.2.x/INSTALL Wed Feb 13 04:47:17 2008 @@ -67,8 +67,8 @@ the text "@@" to discover what you must edit. To install and start the service after you have corrected the httpd.conf file, use the command - bin\httpd -k install - bin\httpd -k start + bin\httpd.exe -k install + bin\httpd.exe -k start The .msi package configures the httpd.conf file, and installs and starts the Apache2 service for you. It also installs plenty of useful shortcuts Modified: httpd/httpd/branches/2.2.x/build/installwinconf.awk URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/build/installwinconf.awk?rev=627385&r1=627384&r2=627385&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/build/installwinconf.awk (original) +++ httpd/httpd/branches/2.2.x/build/installwinconf.awk Wed Feb 13 04:47:17 2008 @@ -85,7 +85,7 @@ print "#" > dstfl; print "# NOTE: Where filenames are specified, you must use forward slashes" > dstfl; print "# instead of backslashes (e.g., \"c:/apache\" instead of \"c:\\apache\")." > dstfl; - print "# If a drive letter is omitted, the drive on which Apache.exe is located" > dstfl; + print "# If a drive letter is omitted, the drive on which httpd.exe is located" > dstfl; print "# will be used by default. It is recommended that you always supply" > dstfl; print "# an explicit drive letter in absolute paths to avoid confusion." > dstfl; bswarning = 0; Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/windows.xml URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/windows.xml?rev=627385&r1=627384&r2=627385&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/docs/manual/platform/windows.xml (original) +++ httpd/httpd/branches/2.2.x/docs/manual/platform/windows.xml Wed Feb 13 04:47:17 2008 @@ -250,7 +250,7 @@

  • Apache for Windows contains the ability to load modules at runtime, without recompiling the server. If Apache is compiled normally, it will install a number of optional modules in the - \Apache2\modules directory. To activate these or + \Apache2.2\modules directory. To activate these or other modules, the new LoadModule directive must be used. For example, to activate the status module, use the following (in addition to the status-activating @@ -320,7 +320,7 @@ the command prompt at the Apache bin subdirectory:

    - httpd -k install + httpd.exe -k install

    If you need to specify the name of the service you want to @@ -329,14 +329,14 @@ computer.

    - httpd -k install -n "MyServiceName" + httpd.exe -k install -n "MyServiceName"

    If you need to have specifically named configuration files for different services, you must use this:

    - httpd -k install -n "MyServiceName" -f "c:\files\my.conf" + httpd.exe -k install -n "MyServiceName" -f "c:\files\my.conf"

    If you use the first command without any special parameters except @@ -347,13 +347,13 @@

    Removing an Apache service is easy. Just use:

    - httpd -k uninstall + httpd.exe -k uninstall

    The specific Apache service to be uninstalled can be specified by using:

    - httpd -k uninstall -n "MyServiceName" + httpd.exe -k uninstall -n "MyServiceName"

    Normal starting, restarting and shutting down of an Apache @@ -364,34 +364,34 @@ service's configuration file by using:

    - httpd -n "MyServiceName" -t + httpd.exe -n "MyServiceName" -t

    You can control an Apache service by its command line switches, too. To start an installed Apache service you'll use this:

    - httpd -k start + httpd.exe -k start

    To stop an Apache service via the command line switches, use this:

    - httpd -k stop + httpd.exe -k stop

    or

    - httpd -k shutdown + httpd.exe -k shutdown

    You can also restart a running service and force it to reread its configuration file by using:

    - httpd -k restart + httpd.exe -k restart

    By default, all Apache services are registered to run as the @@ -483,7 +483,7 @@ in the background. If you run the command

    - httpd -n "MyServiceName" -k start + httpd.exe -n "MyServiceName" -k start

    via a shortcut on your desktop, for example, then if the @@ -531,7 +531,7 @@ use the following command:

    - apache + httpd.exe

    Apache will execute, and will remain running until it is stopped @@ -552,7 +552,7 @@ window and entering:

    - httpd -k shutdown + httpd.exe -k shutdown

    This should be preferred over pressing Control-C because this @@ -563,7 +563,7 @@ complete without interruption. To restart Apache, use:

    - httpd -k restart + httpd.exe -k restart Note for people familiar with the Unix version of Apache: @@ -575,7 +575,7 @@

    If the Apache console window closes immediately or unexpectedly after startup, open the Command Prompt from the Start Menu --> Programs. Change to the folder to which you installed Apache, type - the command httpd, and read the error message. Then + the command httpd.exe, and read the error message. Then change to the logs folder, and review the error.log file for configuration mistakes. If you accepted the defaults when you installed Apache, the commands would be:

    @@ -583,7 +583,7 @@ c:
    cd "\Program Files\Apache Software Foundation\Apache2.2\bin"
    - httpd + httpd.exe

    Then wait for Apache to stop, or press Control-C. Then enter the @@ -603,20 +603,20 @@ a particular configuration file:

    - httpd -f "c:\my server files\anotherconfig.conf" + httpd.exe -f "c:\my server files\anotherconfig.conf"

    or

    - httpd -f files\anotherconfig.conf + httpd.exe -f files\anotherconfig.conf

  • -n specifies the installed Apache service whose configuration file is to be used:

    - httpd -n "MyServiceName" + httpd.exe -n "MyServiceName"
    • @@ -633,7 +633,7 @@ invoking Apache with the -V switch, like this:

    - httpd -V + httpd.exe -V

    Apache will then try to determine its The server root compiled into the server. This is /apache by default, you can verify it by using - httpd -V and looking for a value labelled as + httpd.exe -V and looking for a value labelled as HTTPD_ROOT. @@ -729,9 +729,9 @@

    If you happen to be running Apache on an alternate port, you need to explicitly put that in the URL:

    - + - http://127.0.0.1:8080/ + http://127.0.0.1:8080/

    Once your basic installation is working, you should configure it