com php-src: Merge branch 'PHP-5.6': win32/install.txt
| From: | Christoph Michael Becker | Date: | Tue, 18 Aug 2015 19:26:09 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': win32/install.txt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88653@lists.php.net to get a copy of this message | ||
Commit: 3d8214a021d2233964c4f2d5f41c29a42366b7da
Author: Christoph M. Becker <cmb@php.net> Tue, 18 Aug 2015 21:26:09 +0200
Parents: 6a201b3651b4885f0b5d79f8b7fe06a9c604cf2e c12aa3c7ce01067be35aecd15c5622945e8651e0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3d8214a021d2233964c4f2d5f41c29a42366b7da
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix #67604: The built windows documention refers to nonexistent dll
Bugs:
https://bugs.php.net/67604
Changed paths:
MM win32/install.txt
Diff:
diff --cc win32/install.txt
index d6940b9,025d5ab..be87921
--- 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