From: Christoph M. Becker <cmb@php.net>
Date: Tue, 18 Aug 2015 19:26:09 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0RC2~2^2~115
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d8214a021d2233964c4f2d5f41c29a42366b7da;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #67604: The built windows documention refers to nonexistent dll
---

3d8214a021d2233964c4f2d5f41c29a42366b7da
diff --cc win32/install.txt
index d6940b9354,025d5ab512..be87921dc0
--- a/win32/install.txt
+++ b/win32/install.txt
@@@ -211,9 -211,7 +211,7 @@@ c:\ph
     |
     |-php5activescript.dll
     |
-    |-php5apache.dll
-    |
-    |-php5apache2.dll
 -   |-php5apache2_4.dll
++   |-php7apache2_4.dll
     |
     |-..
     |
@@@ -234,14 -232,7 +232,7 @@@
  
     Here is a list of server modules shipped with PHP 5:
  
-      * sapi/php5apache2_2.dll - Apache 2.2.x module.
-      * sapi/php5apache.dll (php5apache.dll) - Apache 1.x module
-      * sapi/php5apache2.dll (php5apache2.dll) -  - Apache 2.0.x module.
-      * sapi/php5isapi.dll - ISAPI Module for ISAPI compliant web servers 
-        like IIS 5.0 or newer. However the FCGI SAPI is recommended with 
-        IIS
-      * sapi/php5nsapi.dll (php5nsapi.dll) - Sun/iPlanet/Netscape server
-        module.
 -     * php5apache2_4.dll - Apache 2.4.x module.
++     * php7apache2_4.dll - Apache 2.4.x module.
  
     Server modules provide significantly better performance and additional
     functionality compared to the CGI binary. The FastCGI is significantly