dams Thu May 20 18:40:43 2004 EDT
Modified files:
/phpdoc/en/features connection-handling.xml cookies.xml
file-upload.xml http-auth.xml remote-files.xml
Log:
cosmetic changes
http://cvs.php.net/diff.php/phpdoc/en/features/connection-handling.xml?r1=1.14&r2=1.15&ty=u
Index: phpdoc/en/features/connection-handling.xml
diff -u phpdoc/en/features/connection-handling.xml:1.14
phpdoc/en/features/connection-handling.xml:1.15
--- phpdoc/en/features/connection-handling.xml:1.14 Sat Mar 30 15:52:19 2002
+++ phpdoc/en/features/connection-handling.xml Thu May 20 18:40:42 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
<chapter id="features.connection-handling">
<title>Connection handling</title>
@@ -49,8 +49,8 @@
<simpara>
Your script can also be terminated by the built-in script timer.
The default timeout is 30 seconds. It can be changed using
- the max_execution_time &php.ini; directive or the corresponding
- "php_value max_execution_time" Apache .conf directive as well as with
+ the <option>max_execution_time</option> &php.ini; directive or the corresponding
+ <literal>php_value max_execution_time</literal> Apache .conf directive as well as
with
the <function>set_time_limit</function> function. When the timer
expires the script will be aborted and as with the above client
disconnect case, if a shutdown function has been registered it will
http://cvs.php.net/diff.php/phpdoc/en/features/cookies.xml?r1=1.16&r2=1.17&ty=u
Index: phpdoc/en/features/cookies.xml
diff -u phpdoc/en/features/cookies.xml:1.16 phpdoc/en/features/cookies.xml:1.17
--- phpdoc/en/features/cookies.xml:1.16 Sat Feb 7 13:56:33 2004
+++ phpdoc/en/features/cookies.xml Thu May 20 18:40:42 2004
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
<chapter id="features.cookies">
<title>Cookies</title>
<para>
- PHP transparently supports HTTP cookies. Cookies are a mechanism for
+ PHP transparently supports <acronym>HTTP</acronym> cookies. Cookies are a
mechanism for
storing data in the remote browser and thus tracking or identifying return
users. You can set cookies using the <function>setcookie</function> or
<function>setrawcookie</function>
http://cvs.php.net/diff.php/phpdoc/en/features/file-upload.xml?r1=1.73&r2=1.74&ty=u
Index: phpdoc/en/features/file-upload.xml
diff -u phpdoc/en/features/file-upload.xml:1.73 phpdoc/en/features/file-upload.xml:1.74
--- phpdoc/en/features/file-upload.xml:1.73 Sat Apr 3 12:54:20 2004
+++ phpdoc/en/features/file-upload.xml Thu May 20 18:40:42 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.73 $ -->
+<!-- $Revision: 1.74 $ -->
<chapter id="features.file-upload">
<title>Handling file uploads</title>
@@ -8,8 +8,9 @@
<simpara>
PHP is capable of receiving file uploads from any RFC-1867
- compliant browser (which includes Netscape Navigator 3 or later,
- Microsoft Internet Explorer 3 with a patch from Microsoft, or
+ compliant browser (which includes <productname>Netscape Navigator 3</productname>
+ or later, <productname>Microsoft Internet Explorer 3</productname>
+ with a patch from Microsoft, or
later without a patch). This feature lets people upload both text
and binary files. With PHP's authentication and file manipulation
functions, you have full control over who is allowed to upload and
@@ -27,7 +28,8 @@
</note>
<para>
Note that PHP also supports PUT-method file uploads as used by
- Netscape Composer and W3C's Amaya clients. See the <link
+ <productname>Netscape Composer</productname> and W3C's
+ <productname>Amaya</productname> clients. See the <link
linkend="features.file-upload.put-method">PUT Method
Support</link> for more details.
</para>
@@ -452,7 +454,8 @@
</note>
<para>
PHP provides support for the HTTP PUT method used by clients such
- as Netscape Composer and W3C Amaya. PUT requests are much simpler
+ as <productname>Netscape Composer</productname> and W3C
<productname>Amaya</productname>.
+ PUT requests are much simpler
than a file upload and they look something like this:
<informalexample>
<programlisting>
http://cvs.php.net/diff.php/phpdoc/en/features/http-auth.xml?r1=1.38&r2=1.39&ty=u
Index: phpdoc/en/features/http-auth.xml
diff -u phpdoc/en/features/http-auth.xml:1.38 phpdoc/en/features/http-auth.xml:1.39
--- phpdoc/en/features/http-auth.xml:1.38 Fri Mar 5 21:40:17 2004
+++ phpdoc/en/features/http-auth.xml Thu May 20 18:40:42 2004
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.38 $ -->
+<!-- $Revision: 1.39 $ -->
<chapter id="features.http-auth">
<title>HTTP authentication with PHP</title>
<simpara>
- The HTTP Authentication hooks in PHP are only available when it is
+ The <acronym>HTTP</acronym> Authentication hooks in PHP are only available when it
is
running as an Apache module and is hence not available in the CGI version.
In an Apache module PHP script, it is possible to use the
<function>header</function> function to send an "Authentication Required"
@@ -12,8 +12,8 @@
input window. Once the user has filled in a username and a password,
the URL containing the PHP script will be called again with the
<link linkend="reserved.variables">predefined variables</link>
- <varname>PHP_AUTH_USER</varname>, <varname>PHP_AUTH_PW</varname>,
- and <varname>AUTH_TYPE</varname> set to the user name, password and
+ <varname>$PHP_AUTH_USER</varname>, <varname>$PHP_AUTH_PW</varname>,
+ and <varname>$AUTH_TYPE</varname> set to the user name, password and
authentication type respectively. These predefined variables are found
in the <link linkend="reserved.variables.server">$_SERVER</link> and
<varname>$HTTP_SERVER_VARS</varname> arrays. Only "Basic" authentication
@@ -68,8 +68,8 @@
</note>
<para>
- Instead of simply printing out <varname>PHP_AUTH_USER</varname>
- and <varname>PHP_AUTH_PW</varname>, as done in the above example,
+ Instead of simply printing out <varname>$PHP_AUTH_USER</varname>
+ and <varname>$PHP_AUTH_PW</varname>, as done in the above example,
you may want to check the username and password for validity.
Perhaps by sending a query to a database, or by looking up the
user in a dbm file.
http://cvs.php.net/diff.php/phpdoc/en/features/remote-files.xml?r1=1.23&r2=1.24&ty=u
Index: phpdoc/en/features/remote-files.xml
diff -u phpdoc/en/features/remote-files.xml:1.23
phpdoc/en/features/remote-files.xml:1.24
--- phpdoc/en/features/remote-files.xml:1.23 Thu Apr 1 01:31:12 2004
+++ phpdoc/en/features/remote-files.xml Thu May 20 18:40:42 2004
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.23 $ -->
+<!-- $Revision: 1.24 $ -->
<chapter id="features.remote-files">
<title>Using remote files</title>
<para>
- As long as <parameter>allow_url_fopen</parameter> is enabled in
- &php.ini;, you can use HTTP and FTP URLs with most of the functions
+ As long as <option>allow_url_fopen</option> is enabled in
+ &php.ini;, you can use <acronym>HTTP</acronym> and <acronym>FTP</acronym>
+ URLs with most of the functions
that take a filename as a parameter. In addition, URLs can be
used with the <function>include</function>,
<function>include_once</function>, <function>require</function> and
