svn: /phpdoc/en/trunk/reference/fileinfo/ constants.xml functions/finfo-buffer.xml functions/finfo-file.xml functions/finfo-open.xml
| From: | Scott MacVicar | Date: | Mon, 27 Jul 2009 03:16:32 +0000 |
| Subject: | svn: /phpdoc/en/trunk/reference/fileinfo/ constants.xml functions/finfo-buffer.xml functions/finfo-file.xml functions/finfo-open.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-4516@lists.php.net to get a copy of this message | ||
scottmac Mon, 27 Jul 2009 03:16:32 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286383
Log:
Update documentation to reflect change with the internal libmagic updates. See bug #48885
Bug: http://bugs.php.net/48885 (To be documented) finfo
returns mime type + charset when FILEINFO_MIME is used
Changed paths:
U phpdoc/en/trunk/reference/fileinfo/constants.xml
U phpdoc/en/trunk/reference/fileinfo/functions/finfo-buffer.xml
U phpdoc/en/trunk/reference/fileinfo/functions/finfo-file.xml
U phpdoc/en/trunk/reference/fileinfo/functions/finfo-open.xml
Modified: phpdoc/en/trunk/reference/fileinfo/constants.xml
===================================================================
--- phpdoc/en/trunk/reference/fileinfo/constants.xml 2009-07-27 00:57:18 UTC (rev 286382)
+++ phpdoc/en/trunk/reference/fileinfo/constants.xml 2009-07-27 03:16:32 UTC (rev 286383)
@@ -29,12 +29,40 @@
</varlistentry>
<varlistentry>
<term>
+ <constant>FILEINFO_MIME_TYPE</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Return the mime type.
+ </simpara>
+ <simpara>
+ Available since PHP 5.3.0.
+ </simpara>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
+ <constant>FILEINFO_MIME_ENCODING</constant>
+ (<type>integer</type>)
+ </term>
+ <listitem>
+ <simpara>
+ Return the mime encoding of the file.
+ </simpara>
+ <simpara>
+ Available since PHP 5.3.0.
+ </simpara>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>
<constant>FILEINFO_MIME</constant>
(<type>integer</type>)
</term>
<listitem>
<simpara>
- Return a mime string, instead of a textual description.
+ Return the mime type and mime encoding as defined by RFC 2045.
</simpara>
</listitem>
</varlistentry>
@@ -47,6 +75,9 @@
<simpara>
Decompress compressed files.
</simpara>
+ <simpara>
+ Disabled since PHP 5.3.0 due to thread safety issues.
+ </simpara>
</listitem>
</varlistentry>
<varlistentry>
Modified: phpdoc/en/trunk/reference/fileinfo/functions/finfo-buffer.xml
===================================================================
--- phpdoc/en/trunk/reference/fileinfo/functions/finfo-buffer.xml 2009-07-27 00:57:18 UTC (rev
286382)
+++ phpdoc/en/trunk/reference/fileinfo/functions/finfo-buffer.xml 2009-07-27 03:16:32 UTC (rev
286383)
@@ -93,7 +93,7 @@
&example.outputs.similar;
<screen>
<![CDATA[
-application/x-sh
+application/x-sh; charset=us-ascii
]]>
</screen>
</example>
Modified: phpdoc/en/trunk/reference/fileinfo/functions/finfo-file.xml
===================================================================
--- phpdoc/en/trunk/reference/fileinfo/functions/finfo-file.xml 2009-07-27 00:57:18 UTC (rev 286382)
+++ phpdoc/en/trunk/reference/fileinfo/functions/finfo-file.xml 2009-07-27 03:16:32 UTC (rev 286383)
@@ -87,7 +87,7 @@
<programlisting role="php">
<![CDATA[
<?php
-$finfo = finfo_open(FILEINFO_MIME); // return mime type ala mimetype extension
+$finfo = finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension
foreach (glob("*") as $filename) {
echo finfo_file($finfo, $filename) . "\n";
}
Modified: phpdoc/en/trunk/reference/fileinfo/functions/finfo-open.xml
===================================================================
--- phpdoc/en/trunk/reference/fileinfo/functions/finfo-open.xml 2009-07-27 00:57:18 UTC (rev 286382)
+++ phpdoc/en/trunk/reference/fileinfo/functions/finfo-open.xml 2009-07-27 03:16:32 UTC (rev 286383)
@@ -113,7 +113,7 @@
&example.outputs;
<screen>
<![CDATA[
-text/plain
+text/plain; charset=us-ascii
]]>
</screen>
</refsect1>