sander Wed Nov 6 13:34:40 2002 EDT
Modified files:
/phpdoc/en/reference/http reference.xml
/phpdoc/en/reference/http/functions header.xml headers-sent.xml
setcookie.xml
Log:
Revert.
Index: phpdoc/en/reference/http/reference.xml
diff -u phpdoc/en/reference/http/reference.xml:1.5
phpdoc/en/reference/http/reference.xml:1.6
--- phpdoc/en/reference/http/reference.xml:1.5 Wed Nov 6 11:21:38 2002
+++ phpdoc/en/reference/http/reference.xml Wed Nov 6 13:34:39 2002
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<reference id="ref.http">
- <title>HTTP ��غ���</title>
+ <title>HTTP functions</title>
<titleabbrev>HTTP</titleabbrev>
<partintro>
<section id="http.intro">
&reftitle.intro;
<para>
- ��Щ���������������� HTTP ��Э����ͻ������������ͷ����Ϣ��
+ These functions let you manipulate the output sent back to the
+ remote browser right down to the HTTP protocol level.
</para>
</section>
Index: phpdoc/en/reference/http/functions/header.xml
diff -u phpdoc/en/reference/http/functions/header.xml:1.7
phpdoc/en/reference/http/functions/header.xml:1.8
--- phpdoc/en/reference/http/functions/header.xml:1.7 Wed Nov 6 11:21:40 2002
+++ phpdoc/en/reference/http/functions/header.xml Wed Nov 6 13:34:39 2002
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/http.xml, last change in rev 1.2 -->
<refentry id="function.header">
<refnamediv>
<refname>header</refname>
- <refpurpose>�����������һ�� HTTP ͷ����Ϣ</refpurpose>
+ <refpurpose>Send a raw HTTP header</refpurpose>
</refnamediv>
<refsect1>
- <title>����</title>
+ <title>Description</title>
<methodsynopsis>
<type>int</type><methodname>header</methodname>
<methodparam><type>string</type><parameter>string</parameter></methodparam>
@@ -15,14 +15,17 @@
<methodparam
choice="opt"><type>int</type><parameter>http_reponse_code</parameter></methodparam>
</methodsynopsis>
<para>
- <function>header</function> ������������һ�� <acronym>HTTP</acronym>
- ͷ����Ϣ���ͻ��˵���������й� <acronym>HTTP</acronym>
ͷ����Ϣ�ĸ������ݲμ��ٷ��ĵ�
- <ulink url="&spec.http1.1;">HTTP/1.1 specification</ulink>��
+ <function>header</function> is used to send raw
+ <acronym>HTTP</acronym> headers. See the <ulink
+ url="&spec.http1.1;">HTTP/1.1 specification</ulink> for more
+ information on <acronym>HTTP</acronym> headers.
</para>
<para>
- ��ѡ���� <parameter>replace</parameter>
-
������ʾ�������������Ƶ�ͷ����Ϣʱ�����滻ǰһ����ͬ��ͷ����Ϣ��������һ����ͬ��ͷ����Ϣ��Ĭ��Ϊ�滻������㽫����Ϊ
- &false; ����Զ�η�����ͬ��ͷ����Ϣ������:
+ The optional <parameter>replace</parameter> parameter indicates
+ whether the header should replace a previous similar header, or
+ add a second header of the same type. By default it will replace,
+ but if you pass in &false; as the second argument you can force
+ multiple headers of the same type. For example:
<informalexample>
<programlisting role="php">
<![CDATA[
@@ -35,12 +38,15 @@
</informalexample>
</para>
<para>
- �ڶ�����ѡ���� <parameter>http_response_code</parameter> ��ʾ HTTP
- ��ͷ����Ϣ�Ĵ��롣(�˲�����PHP 4.3.0 �����롣)
+ The second optional <parameter>http_response_code</parameter> force the
+ HTTP response code to the specified value. (This parameter is available
+ in PHP 4.3.0 and higher.)
</para>
<para>
- ͷ����Ϣ�ĸ�ʽ��������ʽ��һ����������ַ� ��<literal>HTTP/</literal>��
(�����ִ�Сд)��ͷ�ģ�which will be used to figure out the HTTP status
- code to send������,�����if you have configured Apache to
+ There are two special-case header calls. The first is a header
+ that starts with the string "<literal>HTTP/</literal>" (case is not
+ significant), which will be used to figure out the HTTP status
+ code to send. For example, if you have configured Apache to
use a PHP script to handle requests for missing files (using
the <literal>ErrorDocument</literal> directive), you may want to
make sure that your script generates the proper status code.
@@ -55,7 +61,6 @@
</informalexample>
<note>
<para>
- HTTP ͷ����Ϣ�������ȱ����͵��ͻ��ˣ�
The HTTP status header line will always be the first sent
to the client, regardless of the actual <function>header</function>
call beeing the first or not. The status may be overridden
@@ -65,8 +70,9 @@
</note>
<note>
<para>
- �� PHP 3 �У��˺���ֻ�� PHP �� Apache ��ģ�黯���е�ʱ����Ч�������ʹ��
<literal>Status</literal>
- ���ﵽ��ͬ��Ч����
+ In PHP 3, this only works when PHP is compiled as an Apache
+ module. You can achieve the same effect using the
+ <literal>Status</literal> header.
<informalexample>
<programlisting role="php">
<![CDATA[
@@ -80,7 +86,7 @@
</note>
</para>
<para>
- �ڶ�������������� "Location:" ��ͷ����Ϣ��Not only does
+ The second special case is the "Location:" header. Not only does
it send this header back to the browser, but it also returns a
<literal>REDIRECT</literal> (302) status code to the browser unless
some <literal>3xx</literal> status code has already been set.
@@ -98,11 +104,13 @@
</para>
<note>
<para>
- HTTP/1.1 ����Ҫһ�����Ե�ַ�� <acronym>URI</acronym> ��Ϊ
+ HTTP/1.1 requires an absolute <acronym>URI</acronym> as argument to
<ulink url="&spec.http1.1;-sec14.html#sec14.30">Location:</ulink>
- �IJ���, ����һЩ�ͻ���֧�������·������ͨ������ʹ��
-
<literal>$_SERVER['HTTP_HOST']</literal>��<literal>$_SERVER['PHP_SELF']</literal>
- �� <function>dirname</function> �������Լ���ȡ����Ҫ�ľ���·��:
+ including the scheme, hostname and absolute path, but
+ some clients accept relative URIs. You can usually use
+ <literal>$_SERVER['HTTP_HOST']</literal>,
+<literal>$_SERVER['PHP_SELF']</literal>
+ and <function>dirname</function> to make an absolute URI from a
+ relative one yourself:
<informalexample>
<programlisting>
<