cvs: phpdoc /en/reference/openssl configure.xml /entities global.ent
| From: | Daniel Convissor | Date: | Tue, 24 Jun 2008 17:54:48 +0000 |
| Subject: | cvs: phpdoc /en/reference/openssl configure.xml /entities global.ent | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-1794@lists.php.net to get a copy of this message | ||
danielc Tue Jun 24 17:54:48 2008 UTC
Modified files:
/phpdoc/en/reference/openssl configure.xml
/phpdoc/entities global.ent
Log:
* Clarify openssl.cnf locations.
* Use para rather than simpara to improve separation from prior paragraph.
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/openssl/configure.xml?r1=1.8&r2=1.9&diff_format=u
Index: phpdoc/en/reference/openssl/configure.xml
diff -u phpdoc/en/reference/openssl/configure.xml:1.8 phpdoc/en/reference/openssl/configure.xml:1.9
--- phpdoc/en/reference/openssl/configure.xml:1.8 Wed Jun 20 22:25:08 2007
+++ phpdoc/en/reference/openssl/configure.xml Tue Jun 24 17:54:47 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<section xml:id="openssl.installation" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
&reftitle.install;
<para>
@@ -12,17 +12,22 @@
&ext.windows.path.dll;
<filename>libeay32.dll</filename>
</para>
- <simpara>
+ <para>
Additionally, if you are planning to use the key generation and certificate
- signing functions, you will need to install a valid <filename>openssl.cnf
- </filename> on your system. As of PHP 4.3.0, we include a sample
- configuration file in the <filename class="directory">openssl</filename>
- folder of our win32 binary distribution. If you are using PHP 4.2.0 or
- later and are missing the file, you can obtain it from
- <link xlink:href="&url.openssl;">the OpenSSL home page</link> or by
- downloading the PHP 4.3.0 release and using the configuration file from
- there.
- </simpara>
+ signing functions, you will need to install a valid
+ <filename>openssl.cnf</filename> file on your system.
+ As of PHP 4.3.0, we include a sample configuration file
+ in our win32 binary distributions.
+ PHP 4.3.x and 4.4.x has the file in the
+ <filename class="directory">openssl</filename> directory.
+ PHP 5.x and 6.x has the file in the
+ <filename class="directory">extras/openssl</filename> directory.
+ If you are either using PHP 4.2.x or missing the file, you can obtain it from
+ <link xlink:href="&url.openssl.binaries;">the OpenSSL binaries
page</link>
+ or by downloading a recent PHP release.
+ Be aware that Windows Explorer hides the <filename>.cnf</filename> extension
+ by default and says the file Type is <literal>SpeedDial</literal>.
+ </para>
<para>
PHP will search for the <filename>openssl.cnf</filename> using the
following logic:
http://cvs.php.net/viewvc.cgi/phpdoc/entities/global.ent?r1=1.327&r2=1.328&diff_format=u
Index: phpdoc/entities/global.ent
diff -u phpdoc/entities/global.ent:1.327 phpdoc/entities/global.ent:1.328
--- phpdoc/entities/global.ent:1.327 Thu Jun 12 11:34:40 2008
+++ phpdoc/entities/global.ent Tue Jun 24 17:54:48 2008
@@ -1,6 +1,6 @@
<!-- -*- SGML -*-
- $Id: global.ent,v 1.327 2008/06/12 11:34:40 bjori Exp $
+ $Id: global.ent,v 1.328 2008/06/24 17:54:48 danielc Exp $
Contains global "macros" for all the XML documents.
@@ -276,6 +276,7 @@
<!ENTITY url.openbsd.ports "http://www.openbsd.org/ports.html">
<!ENTITY url.openlink "http://www.openlinksw.com/">
<!ENTITY url.openssl "http://www.openssl.org/">
+<!ENTITY url.openssl.binaries "http://www.openssl.org/related/binaries.html">
<!ENTITY url.openssl.ciphers "http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT">
<!ENTITY url.opl "http://www.opencontent.org/openpub/">
<!ENTITY url.oracle "http://www.oracle.com/">