Attachment 21184 Details for Bug 41823 – against trunk

[patch] against trunk

apache.exe.patch (text/plain), 3.52 KB, created by Takashi Sato on 2007-11-24 23:27:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Sato

Created: 2007-11-24 23:27:46 UTC

Size: 3.52 KB

patch

obsolete

>Index: docs/conf/httpd-win.conf
>===================================================================
>--- docs/conf/httpd-win.conf	(revision 597959)
>+++ docs/conf/httpd-win.conf	(working copy)
>@@ -19,7 +19,7 @@
> #
> # NOTE: Where filenames are specified, you must use forward slashes
> # instead of backslashes (e.g., "c:/apache" instead of "c:\apache").
>-# If a drive letter is omitted, the drive on which Apache.exe is located
>+# If a drive letter is omitted, the drive on which httpd.exe is located
> # will be used by default. It is recommended that you always supply
> # an explicit drive letter in absolute paths, however, to avoid
> # confusion.
>Index: docs/manual/platform/win_compiling.xml
>===================================================================
>--- docs/manual/platform/win_compiling.xml	(revision 597959)
>+++ docs/manual/platform/win_compiling.xml	(working copy)
>@@ -375,7 +375,7 @@
> This will install the following:
> 
> <ul>
>- <li><code>dir\bin\Apache.exe</code> - Apache
>+ <li><code>dir\bin\httpd.exe</code> - Apache
> executable</li>
> 
> <li><code>dir\bin\ApacheMonitor.exe</code> - Service
>Index: docs/manual/platform/windows.xml
>===================================================================
>--- docs/manual/platform/windows.xml	(revision 597959)
>+++ docs/manual/platform/windows.xml	(working copy)
>@@ -432,7 +432,7 @@
> Apache <code>logs</code> directory.</li>
> 
> <li>Grant the account read and execute (RX) rights to the
>- <code>Apache.exe</code> binary executable.</li>
>+ <code>httpd.exe</code> binary executable.</li>
> </ol>
> 
> <note>It is usually a good practice to grant the user the Apache
>Index: INSTALL
>===================================================================
>--- INSTALL	(revision 597959)
>+++ INSTALL	(working copy)
>@@ -77,8 +77,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\Apache -k install
>- bin\Apache -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
>Index: modules/ldap/README.ldap
>===================================================================
>--- modules/ldap/README.ldap	(revision 597959)
>+++ modules/ldap/README.ldap	(working copy)
>@@ -38,7 +38,7 @@
> 3. Compile the two modules util_ldap and mod_authnz_ldap using the dsp files
> 4. You get a mod_authnz_ldap.so and a mod_ldap.so module
> 5. Put them in the modules directory, don't forget to copy the
>- nsldap32v50.dll somewhere where apache.exe will find it
>+ nsldap32v50.dll somewhere where httpd.exe will find it
> 6. Load the two modules in your httpd.conf, like below:
> LoadModule ldap_module modules/mod_ldap.so
> LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
>Index: server/mpm/winnt/mpm_winnt.c
>===================================================================
>--- server/mpm/winnt/mpm_winnt.c	(revision 597959)
>+++ server/mpm/winnt/mpm_winnt.c	(working copy)
>@@ -586,7 +586,7 @@
> apr_pool_create_ex(&ptemp, p, NULL, NULL);
> 
> /* Build the command line. Should look something like this:
>- * C:/apache/bin/apache.exe -f ap_server_confname
>+ * C:/apache/bin/httpd.exe -f ap_server_confname
> * First, get the path to the executable...
> */
> apr_procattr_create(&attr, ptemp);

Actions: View | Diff

Attachments on bug 41823: 21184 | 21185