diff --git a/language-snippets.ent b/language-snippets.ent
index 6ded749fb2..e3f7c2aafd 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -785,6 +785,10 @@ function instead.'>
+This function is supposed to be used in conjunction with
+ http_send_data, http_send_file &listendand; http_send_stream.'>
+This function may be used in conjunction with
+ http_send_data, http_send_file &listendand; http_send_stream.'>
The &link.http.request.option; encodecookies controls
whether the cookie values should be urlencoded.'>
&http.request.affects.any;'>
diff --git a/reference/http/functions/caching/http-cache-etag.xml b/reference/http/functions/caching/http-cache-etag.xml
index 8809df1e1d..b0326c60fa 100644
--- a/reference/http/functions/caching/http-cache-etag.xml
+++ b/reference/http/functions/caching/http-cache-etag.xml
@@ -1,5 +1,5 @@
-
+
@@ -12,11 +12,10 @@
boolhttp_cache_etagstringetag
-
Attempts to cache the sent entity by its ETag, either supplied or generated
- by the hash algorithm specified by the
- INI setting http.etag.mode.
+ by the hash algorithm specified by the &link.http.configuration;
+ http.etag.mode.
If the clients If-None-Match header matches the supplied/calculated
@@ -24,9 +23,13 @@
a 304 Not Modified status code is issued.
- A log entry is written to the cache log if the
- &link.http.configuration; http.log.cache
- is set and the cache attempt was successful.
+ A log entry is written to the cache log if the &link.http.configuration;
+ http.log.cache is set
+ and the cache attempt was successful.
+
+ ¬e.http.send.API.mayuse;
+
+ If this function is used outside the http_send_*() API, it facilitates the ob_etaghandler.
@@ -37,7 +40,7 @@
etag
- Custom ETag
+ custom ETag
@@ -87,49 +90,32 @@
-->
-
-
diff --git a/reference/http/functions/caching/http-cache-last-modified.xml b/reference/http/functions/caching/http-cache-last-modified.xml
index 9c4ae5e0f9..8715f87291 100644
--- a/reference/http/functions/caching/http-cache-last-modified.xml
+++ b/reference/http/functions/caching/http-cache-last-modified.xml
@@ -1,5 +1,5 @@
-
+
@@ -12,22 +12,21 @@
boolhttp_cache_last_modifiedinttimestamp_or_expires
-
Attempts to cache the sent entity by its last modification date.
If the supplied argument is greater than 0, it is handled as timestamp
and will be sent as date of last modification. If it is 0 or omitted,
- the current time will be sent as Last-Modified date. If it's negative,
- it is handled as expiration time in seconds, which means that if the
- requested last modification date is not between the calculated timespan,
+ the current time will be sent as Last-Modified date.
+ If it's negative, it is handled as expiration time in seconds, which means
+ that if the requested last modification date is not between the calculated timespan,
the Last-Modified header is updated and the actual body will be sent.
- A log entry will be written to the cache log if the
- &link.http.configuration; http.log.cache
- is set and the cache attempt was successful.
+ A log entry will be written to the cache log if the &link.http.configuration;
+ http.log.cache is set
+ and the cache attempt was successful.
@@ -88,49 +87,35 @@
-->
-
-
diff --git a/reference/http/functions/responses/http-redirect.xml b/reference/http/functions/responses/http-redirect.xml
index b20f652299..a0433285d1 100644
--- a/reference/http/functions/responses/http-redirect.xml
+++ b/reference/http/functions/responses/http-redirect.xml
@@ -1,5 +1,5 @@
-
+
@@ -15,36 +15,24 @@
boolsession = FALSEintstatus
-
Redirect to the given url.
- The supplied url will be expanded with http_build_url, the params array will
+ The supplied url will be expanded with http_build_url, the params array will
be treated with http_build_str and the session identification will be appended
- if session is true.
-
-
- The HTTP response code will be set according to status.
-
-
+ if session is true. The HTTP response code will be set according to status.
You can use one of the redirect constants for convenience.
-
-
Please see RFC 2616
- for which redirect response code to use in which situation.
-
-
- By default PHP will decide which response status fits best.
+ for which redirect response code to use in which situation. By default PHP will decide which response status fits best.
To be RFC compliant, "Redirecting to <a>URL</a>." will be displayed,
- if the client doesn't redirect immediately, and the request method was
- another one than HEAD.
+ if the client doesn't redirect immediately, and the request method was another one than HEAD.
A log entry will be written to the redirect log, if the &link.http.configuration;
- http.log.redirect is set and the redirect attempt was successful.
+ http.log.redirect is set and the redirect attempt was successful.
@@ -130,36 +118,32 @@
-->
-
+
@@ -10,16 +10,15 @@
&reftitle.description;
boolhttp_send_content_disposition
- stringfilename
+ stringfilenameboolinline = FALSE
-
Send the Content-Disposition. The Content-Disposition header is very useful
if the data actually sent came from a file or something similar, that should
be "saved" by the client/user (i.e. by browsers "Save as..." popup window).
-
+ ¬e.http.send.API;
&reftitle.parameters;
@@ -37,7 +36,7 @@
inline
- if set to true and the user agent knows how to handle the content type,
+ if set to &true; and the user agent knows how to handle the content type,
it will probably not cause the popup window to be shown
@@ -119,17 +118,16 @@ Use the PEAR Coding Standards
-->
-
diff --git a/reference/http/functions/responses/http-send-content-type.xml b/reference/http/functions/responses/http-send-content-type.xml
index 5f9dfd86ed..789b775b92 100644
--- a/reference/http/functions/responses/http-send-content-type.xml
+++ b/reference/http/functions/responses/http-send-content-type.xml
@@ -1,5 +1,5 @@
-
+
@@ -12,12 +12,10 @@
boolhttp_send_content_typestringcontent_type = 'application/x-octetstream'
-
- Send the Content-Type of the sent entity. This is particularly important
- if you use the http_send API.
+ Send the Content-Type of the sent entity.
-
+ ¬e.http.send.API;
&reftitle.parameters;
@@ -41,14 +39,13 @@
-
-
diff --git a/reference/http/functions/responses/http-send-data.xml b/reference/http/functions/responses/http-send-data.xml
index 78ef25e10a..d5870cf6b1 100644
--- a/reference/http/functions/responses/http-send-data.xml
+++ b/reference/http/functions/responses/http-send-data.xml
@@ -1,5 +1,5 @@
-
+
@@ -12,11 +12,9 @@
boolhttp_send_datastringdata
-
Sends raw data with support for (multiple) range requests.
-
&reftitle.parameters;
@@ -107,17 +105,18 @@ Use the PEAR Coding Standards
-->
-
diff --git a/reference/http/functions/responses/http-send-file.xml b/reference/http/functions/responses/http-send-file.xml
index f4b8c531d9..46b95bec38 100644
--- a/reference/http/functions/responses/http-send-file.xml
+++ b/reference/http/functions/responses/http-send-file.xml
@@ -1,5 +1,5 @@
-
+
@@ -12,11 +12,20 @@
boolhttp_send_filestringfile
-
Sends a file with support for (multiple) range requests.
-
+
+ This functions behaviour and further action is dependent on the following
+ &link.http.configuration;s:
+ http.send.not_found_404
+ &listendand; http.log.not_found.
+
+
+ If the &link.http.configuration; http.send.not_found_404
+ is enabled and the &link.http.configuration; http.log.not_found
+ points to a writable file, a log message is written when the file was not found.
+
&reftitle.parameters;
@@ -75,49 +84,52 @@
-->
-
-
diff --git a/reference/http/functions/responses/http-send-last-modified.xml b/reference/http/functions/responses/http-send-last-modified.xml
index 692af3b52e..762e9080f2 100644
--- a/reference/http/functions/responses/http-send-last-modified.xml
+++ b/reference/http/functions/responses/http-send-last-modified.xml
@@ -1,5 +1,5 @@
-
+
@@ -12,11 +12,10 @@
boolhttp_send_last_modifiedinttimestamp
-
Send a Last-Modified header with a valid HTTP date.
-
+ ¬e.http.send.API.mayuse;
&reftitle.parameters;
@@ -26,7 +25,7 @@
timestamp
- A Unix timestamp, converted it to a valid HTTP date;
+ a Unix timestamp, converted to a valid HTTP date;
if omitted, the current time will be sent
diff --git a/reference/http/functions/responses/http-send-status.xml b/reference/http/functions/responses/http-send-status.xml
index 70d6391c5c..cf33680a63 100644
--- a/reference/http/functions/responses/http-send-status.xml
+++ b/reference/http/functions/responses/http-send-status.xml
@@ -1,10 +1,10 @@
-
+
http_send_status
- Send status
+ Send HTTP response status
&reftitle.description;
@@ -12,11 +12,9 @@
boolhttp_send_statusintstatus
-
Send HTTP status code.
-
&reftitle.parameters;
@@ -26,7 +24,7 @@
status
- HTTP status code
+ HTTP status code (100-599)
diff --git a/reference/http/functions/responses/http-send-stream.xml b/reference/http/functions/responses/http-send-stream.xml
index 5e6f39dc30..e0c3834213 100644
--- a/reference/http/functions/responses/http-send-stream.xml
+++ b/reference/http/functions/responses/http-send-stream.xml
@@ -1,5 +1,5 @@
-
+
@@ -107,17 +107,18 @@ Use the PEAR Coding Standards
-->
-
diff --git a/reference/http/functions/responses/http-throttle.xml b/reference/http/functions/responses/http-throttle.xml
index eeddb83c57..6afb399e29 100644
--- a/reference/http/functions/responses/http-throttle.xml
+++ b/reference/http/functions/responses/http-throttle.xml
@@ -1,5 +1,5 @@
-
+
@@ -10,15 +10,18 @@
&reftitle.description;
voidhttp_throttle
- doublesec
+ floatsecintbytes = 40960
- Sets the throttle delay and send buffer size for use with http_send() API.
- Provides a basic throttling mechanism, which will yield the current process
- resp. thread until the entity has been completely sent, though.
+ Sets the throttle delay and send buffer size.
+
+ Provides a basic throttling mechanism, which will yield the current process
+ resp. thread until the entity has been completely sent.
+
+ ¬e.http.send.API;
@@ -94,7 +97,7 @@
// ~ 20 kbyte/s
# http_throttle(1, 20000);
# http_throttle(0.5, 10000);
-# http_throttle(0.1, 2000);
+http_throttle(0.1, 2000);
http_send_file('document.pdf');
?>
?>
@@ -105,17 +108,16 @@ http_send_file('document.pdf');
-