httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pct...@apache.org
Subject svn commit: r619749 - in /httpd/httpd/branches/2.2.x: ./ docs/manual/platform/ modules/ldap/ server/mpm/winnt/
Date Fri, 08 Feb 2008 03:01:22 GMT
Author: pctony
Date: Thu Feb  7 19:01:21 2008
New Revision: 619749

URL: http://svn.apache.org/viewvc?rev=619749&view=rev
Log:
Backporting to 2.2 for PR 41823

Modified:
    httpd/httpd/branches/2.2.x/INSTALL
    httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.html.en
    httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml
    httpd/httpd/branches/2.2.x/docs/manual/platform/windows.html.en
    httpd/httpd/branches/2.2.x/docs/manual/platform/windows.xml
    httpd/httpd/branches/2.2.x/modules/ldap/README.ldap
    httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.c

Modified: httpd/httpd/branches/2.2.x/INSTALL
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/INSTALL?rev=619749&r1=619748&r2=619749&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/INSTALL (original)
+++ httpd/httpd/branches/2.2.x/INSTALL Thu Feb  7 19:01:21 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\Apache -k install
-    bin\Apache -k start
+    bin\httpd -k install
+    bin\httpd -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/docs/manual/platform/win_compiling.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.html.en?rev=619749&r1=619748&r2=619749&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.html.en Thu Feb  7 19:01:21
2008
@@ -374,7 +374,7 @@
     <p>This will install the following:</p>
 
     <ul>
-      <li><code><em>dir</em>\bin\Apache.exe</code> - Apache
+      <li><code><em>dir</em>\bin\httpd.exe</code> - Apache
       executable</li>
 
       <li><code><em>dir</em>\bin\ApacheMonitor.exe</code> -
Service

Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml?rev=619749&r1=619748&r2=619749&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml Thu Feb  7 19:01:21
2008
@@ -375,7 +375,7 @@
     <p>This will install the following:</p>
 
     <ul>
-      <li><code><em>dir</em>\bin\Apache.exe</code> - Apache
+      <li><code><em>dir</em>\bin\httpd.exe</code> - Apache
       executable</li>
 
       <li><code><em>dir</em>\bin\ApacheMonitor.exe</code> -
Service

Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/windows.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/windows.html.en?rev=619749&r1=619748&r2=619749&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/windows.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/windows.html.en Thu Feb  7 19:01:21 2008
@@ -433,7 +433,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>
 
     <div class="note">It is usually a good practice to grant the user the Apache

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=619749&r1=619748&r2=619749&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 Thu Feb  7 19:01:21 2008
@@ -433,7 +433,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

Modified: httpd/httpd/branches/2.2.x/modules/ldap/README.ldap
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ldap/README.ldap?rev=619749&r1=619748&r2=619749&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ldap/README.ldap (original)
+++ httpd/httpd/branches/2.2.x/modules/ldap/README.ldap Thu Feb  7 19:01:21 2008
@@ -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

Modified: httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.c?rev=619749&r1=619748&r2=619749&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.c Thu Feb  7 19:01:21 2008
@@ -634,7 +634,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);



Mime
View raw message