Re: cvs: phpdoc /en/appendices ini.xml /en/reference/info/functions memory-get-peak-usage.xml memory-get-usage.xml

On 2/27/07, Philip Olson <philip@php.net> wrote:

philip          Tue Feb 27 09:32:36 2007 UTC

Modified files:

    /phpdoc/en/appendices       ini.xml
    /phpdoc/en/reference/info/functions memory-get-usage.xml
                                        memory-get-peak-usage.xml

Log: Document ini.memory_limit related changes for PHP 5.2.1 http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/ini.xml?r1=1.49&r2=1.50&diff_format=u Index: phpdoc/en/appendices/ini.xml diff -u phpdoc/en/appendices/ini.xml:1.49 phpdoc/en/appendices/ini.xml:1.50 --- phpdoc/en/appendices/ini.xml:1.49 Sat Feb 24 20:42:20 2007

+++ phpdoc/en/appendices/ini.xml        Tue Feb 27 09:32:36 2007

@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.49 $ --> +<!-- $Revision: 1.50 $ --> <appendix id="ini"> <title>&php.ini; directives</title> @@ -2812,9 +2812,9 @@

       <tbody>
        <row>
         <entry>memory_limit</entry>
-        <entry>"8M"</entry>
+        <entry>"128M"</entry>
         <entry>PHP_INI_ALL</entry>
-        <entry></entry>
+        <entry>"8M" before PHP 5.2.1</entry>

It was 16M in 5.2.0... not sure if its worth mentioning? -Hannes

        </row>
       </tbody>
      </tgroup>

@@ -2834,15 +2834,16 @@

        <para>
         This sets the maximum amount of memory in bytes that a script
         is allowed to allocate.  This helps prevent poorly written
-        scripts for eating up all available memory on a server. Prior to
-        PHP 5.2.1, in order to use this directive you must have enabled
-        it at compile time.  So, your configure line would have included:
-        <option role="configure">--enable-memory-limit</option>. Note that
-        you have to set it to -1 if you don't want any limit for your memory.
+        scripts for eating up all available memory on a server. Note that
+        to have no memory limit, set this directive to <literal>-1</literal>.
        </para>
        <para>
-        As of PHP 4.3.2, and when memory_limit is enabled, the PHP function
-        <function>memory_get_usage</function> is made available.
+        Prior to PHP 5.2.1, in order to use this directive it had to
+        be enabled at compile time by using
+        <option role="configure">--enable-memory-limit</option> in the
+        configure line. This was also required to define the functions
+        <function>memory_get_usage</function> and
+        <function>memory_get_peak_usage</function>.
        </para>

        &ini.shorthandbytes;

http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/info/functions/memory-get-usage.xml?r1=1.6&r2=1.7&diff_format=u Index: phpdoc/en/reference/info/functions/memory-get-usage.xml diff -u phpdoc/en/reference/info/functions/memory-get-usage.xml:1.6 phpdoc/en/reference/info/functions/memory-get-usage.xml:1.7 --- phpdoc/en/reference/info/functions/memory-get-usage.xml:1.6 Sun Feb 4 22:42:43 2007

+++ phpdoc/en/reference/info/functions/memory-get-usage.xml     Tue Feb 27 09:32:36 2007

@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <refentry id="function.memory-get-usage"> <refnamediv> <refname>memory_get_usage</refname> @@ -16,11 +16,6 @@

    Returns the amount of memory, in bytes, that's currently being
    allocated to your PHP script.

</para> - <para> - <function>memory_get_usage</function> will only be defined if your PHP - is compiled with the <literal>--enable-memory-limit</literal> - configuration option. - </para> </refsect1> <refsect1 role="parameters"> @@ -61,6 +56,13 @@

      </thead>
      <tbody>
       <row>
+       <entry>5.2.1</entry>
+       <entry>
+        Compiling with <link linkend="ini.memory-limit">--enable-memory-limit</link>
+        is no longer required for this function to exist.
+       </entry>
+      </row>
+      <row>
        <entry>5.2.0</entry>
        <entry>
         <parameter>real_usage</parameter> was added.

http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/info/functions/memory-get-peak-usage.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/info/functions/memory-get-peak-usage.xml diff -u phpdoc/en/reference/info/functions/memory-get-peak-usage.xml:1.5 phpdoc/en/reference/info/functions/memory-get-peak-usage.xml:1.6

--- phpdoc/en/reference/info/functions/memory-get-peak-usage.xml:1.5    Sun Feb  4 22:42:43 2007
+++ phpdoc/en/reference/info/functions/memory-get-peak-usage.xml        Tue Feb 27 09:32:36 2007

@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <refentry id="function.memory-get-peak-usage"> <refnamediv> <refname>memory_get_peak_usage</refname> @@ -16,11 +16,6 @@

    Returns the peak of memory, in bytes, that's been allocated to your PHP
    script.

</para> - <para> - <function>memory_get_peak_usage</function> will only be defined if your PHP - is compiled with the <literal>--enable-memory-limit</literal> - configuration option. - </para> </refsect1> <refsect1 role="parameters"> @@ -61,6 +56,13 @@

      </thead>
      <tbody>
       <row>
+       <entry>5.2.1</entry>
+       <entry>
+        Compiling with <link linkend="ini.memory-limit">--enable-memory-limit</link>
+        is no longer required for this function to exist.
+       </entry>
+      </row>
+      <row>
        <entry>5.2.0</entry>
        <entry>
         <parameter>real_usage</parameter> was added.