irchtml Tue Feb 17 21:51:09 2004 EDT
Modified files:
/phpdoc/en language-snippets.ent
/phpdoc/en/reference/exec/functions exec.xml passthru.xml
system.xml
Log:
added entities for system/passthru (bug #27076)
moved common notes to language-snippets.ent
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.75&r2=1.76&ty=u
Index: phpdoc/en/language-snippets.ent
diff -u phpdoc/en/language-snippets.ent:1.75 phpdoc/en/language-snippets.ent:1.76
--- phpdoc/en/language-snippets.ent:1.75 Tue Feb 17 13:49:39 2004
+++ phpdoc/en/language-snippets.ent Tue Feb 17 21:51:08 2004
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.75 $ -->
+<!-- $Revision: 1.76 $ -->
<!ENTITY warn.experimental '<warning><simpara>This extension is
<emphasis>EXPERIMENTAL</emphasis>. The behaviour of this extension --
@@ -128,6 +128,17 @@
array containing an object reference and a method name can also be
supplied.</simpara></note>'>
+<!ENTITY warn.escapeshell '<warning><para>If you are going to allow data coming
+from user input to be passed to this function, then you should be using
+<function>escapeshellarg</function> or <function>escapeshellcmd</function>
+to make sure that users cannot trick the system into executing arbitrary
+commands.</para></warning>'>
+
+<!ENTITY note.exec-bg '<note><para>If you start a program using this function
+and want to leave it running in the background, you have to make sure that the
+output of that program is redirected to a file or some other output stream or
+else PHP will hang until the execution of the program ends.</para></note>'>
+
<!-- Notes for safe-mode limited functions: -->
<!ENTITY note.sm.disabled '<note><simpara>&sm.disabled;</simpara></note>'>
@@ -157,6 +168,12 @@
all words following the initial command string are treated as a single argument.
Thus,
<literal>echo y | echo x</literal> becomes <literal>echo "y | echo
x"</literal>.</simpara></warning>'>
+<!ENTITY note.exec-path '<note><simpara>When
+<link linkend="features.safe-mode">safe mode</link> is enabled, you can only
+execute executables within the <link
linkend="ini.safe-mode-exec-dir">safe_mode_exec_dir</link>.
+For practical reasons it is currently not allowed to have <literal>..</literal>
+components in the path to the executable. </simpara></note>'>
+
<!ENTITY sm.uidcheck.dir 'Checks whether the directory in which
you are about to operate has the same UID (owner) as the script that is being
executed.'>
http://cvs.php.net/diff.php/phpdoc/en/reference/exec/functions/exec.xml?r1=1.9&r2=1.10&ty=u
Index: phpdoc/en/reference/exec/functions/exec.xml
diff -u phpdoc/en/reference/exec/functions/exec.xml:1.9
phpdoc/en/reference/exec/functions/exec.xml:1.10
--- phpdoc/en/reference/exec/functions/exec.xml:1.9 Tue Feb 17 13:55:55 2004
+++ phpdoc/en/reference/exec/functions/exec.xml Tue Feb 17 21:51:09 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- splitted from ./en/functions/exec.xml, last change in rev 1.2 -->
<refentry id="function.exec">
<refnamediv>
@@ -39,32 +39,9 @@
return status of the executed command will be written to this
variable.
</para>
- <warning>
- <para>
- If you are going to allow data coming from user input to be passed to
- this function, then you should be using
- <function>escapeshellarg</function> or
- <function>escapeshellcmd</function> to make sure that users cannot trick
- the system into executing arbitrary commands.
- </para>
- </warning>
- <note>
- <para>
- If you start a program using this function and want to leave it running
- in the background, you have to make sure that the output of that program
- is redirected to a file or some other output stream or else PHP will
- hang until the execution of the program ends.
- </para>
- </note>
- <note>
- <simpara>
- When <link linkend="features.safe-mode">safe mode</link> is enabled, you
- can only execute executables within the <link
- linkend="ini.safe-mode-exec-dir">safe_mode_exec_dir</link>. For
- practical reasons it's currently not allowed to have
- <literal>..</literal> components in the path to the executable.
- </simpara>
- </note>
+ &warn.escapeshell;
+ ¬e.exec-bg;
+ ¬e.exec-path;
&warn.sm.exec;
<para>
See also <function>system</function>,
http://cvs.php.net/diff.php/phpdoc/en/reference/exec/functions/passthru.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/reference/exec/functions/passthru.xml
diff -u phpdoc/en/reference/exec/functions/passthru.xml:1.3
phpdoc/en/reference/exec/functions/passthru.xml:1.4
--- phpdoc/en/reference/exec/functions/passthru.xml:1.3 Wed Dec 31 05:39:42 2003
+++ phpdoc/en/reference/exec/functions/passthru.xml Tue Feb 17 21:51:09 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./en/functions/exec.xml, last change in rev 1.2 -->
<refentry id="function.passthru">
<refnamediv>
@@ -30,32 +30,10 @@
then calling a pbmplus program to output a gif, you can create
PHP scripts that output images directly.
</para>
- <warning>
- <para>
- If you are going to allow data coming from user input to be passed to
- this function, then you should be using
- <function>escapeshellarg</function> or
- <function>escapeshellcmd</function> to make sure that users cannot trick
- the system into executing arbitrary commands.
- </para>
- </warning>
- <note>
- <para>
- If you start a program using this function and want to leave it running
- in the background, you have to make sure that the output of that program
- is redirected to a file or some other output stream or else PHP will
- hang until the execution of the program ends.
- </para>
- </note>
- <note>
- <simpara>
- When <link linkend="features.safe-mode">safe mode</link> is enabled, you
- can only execute executables within the <link
- linkend="ini.safe-mode-exec-dir">safe_mode_exec_dir</link>. For
- practical reasons it's currently not allowed to have
- <literal>..</literal> components in the path to the executable.
- </simpara>
- </note>
+ &warn.escapeshell;
+ ¬e.exec-bg;
+ ¬e.exec-path;
+ &warn.sm.exec;
<para>
See also <function>exec</function>, <function>system</function>,
<function>popen</function>, <function>escapeshellcmd</function>,
http://cvs.php.net/diff.php/phpdoc/en/reference/exec/functions/system.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/reference/exec/functions/system.xml
diff -u phpdoc/en/reference/exec/functions/system.xml:1.7
phpdoc/en/reference/exec/functions/system.xml:1.8
--- phpdoc/en/reference/exec/functions/system.xml:1.7 Tue Feb 17 13:55:55 2004
+++ phpdoc/en/reference/exec/functions/system.xml Tue Feb 17 21:51:09 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/exec.xml, last change in rev 1.24 -->
<refentry id="function.system">
<refnamediv>
@@ -21,23 +21,8 @@
status code of the executed command will be written to this
variable.
</para>
- <warning>
- <para>
- If you are going to allow data coming from user input to be passed to
- this function, then you should be using
- <function>escapeshellarg</function> or
- <function>escapeshellcmd</function> to make sure that users cannot trick
- the system into executing arbitrary commands.
- </para>
- </warning>
- <note>
- <para>
- If you start a program using this function and want to leave it running
- in the background, you have to make sure that the output of that program
- is redirected to a file or some other output stream or else PHP will
- hang until the execution of the program ends.
- </para>
- </note>
+ &warn.escapeshell;
+ ¬e.exec-bg;
<para>
The <function>system</function> call also tries to automatically
flush the web server's output buffer after each line of output if
@@ -75,15 +60,7 @@
</programlisting>
</example>
</para>
- <note>
- <simpara>
- When <link linkend="features.safe-mode">safe mode</link> is enabled, you
- can only execute executables within the <link
- linkend="ini.safe-mode-exec-dir">safe_mode_exec_dir</link>. For
- practical reasons it's currently not allowed to have
- <literal>..</literal> components in the path to the executable.
- </simpara>
- </note>
+ ¬e.exec-path;
&warn.sm.exec;
<para>
See also <function>exec</function>,
