X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=631de1456cdfd75c7502f4b3f0f573befb58da9a;hp=ced4e81b5f18490062cc04c17b075463ba8bccb6;hb=39feb7a7e30bb4b393a6f76aa2f35d4e9275523e;hpb=0d925a2820b9d75b8e32c451fd400863e51e22fe
diff --git a/http_functions.c b/http_functions.c
index ced4e81..631de14 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -20,6 +20,8 @@
#endif
#include "php.h"
+#include "zend_operators.h"
+
#include "SAPI.h"
#include "php_ini.h"
#include "ext/standard/info.h"
@@ -31,9 +33,9 @@
#include "php_http.h"
#include "php_http_std_defs.h"
#include "php_http_api.h"
-#include "php_http_auth_api.h"
#include "php_http_request_api.h"
#include "php_http_cache_api.h"
+#include "php_http_request_method_api.h"
#include "php_http_request_api.h"
#include "php_http_date_api.h"
#include "php_http_headers_api.h"
@@ -47,9 +49,12 @@ ZEND_EXTERN_MODULE_GLOBALS(http)
/* {{{ proto string http_date([int timestamp])
*
- * This function returns a valid HTTP date regarding RFC 822/1123
+ * Compose a valid HTTP date regarding RFC 822/1123
* looking like: "Wed, 22 Dec 2004 11:34:47 GMT"
*
+ * Takes an optional unix timestamp as parameter.
+ *
+ * Returns the HTTP date as string.
*/
PHP_FUNCTION(http_date)
{
@@ -67,24 +72,28 @@ PHP_FUNCTION(http_date)
}
/* }}} */
-/* {{{ proto string http_absolute_uri(string url[, string proto[, string host[, int port]]])
+/* {{{ proto string http_build_uri(string url[, string proto[, string host[, int port]]])
*
- * This function returns an absolute URI constructed from url.
+ * Build a complete URI according to the supplied parameters.
+ *
* If the url is already abolute but a different proto was supplied,
* only the proto part of the URI will be updated. If url has no
* path specified, the path of the current REQUEST_URI will be taken.
* The host will be taken either from the Host HTTP header of the client
* the SERVER_NAME or just localhost if prior are not available.
- *
- * Some examples:
+ * If a port is pecified in either the url or as sperate parameter,
+ * it will be added if it differs from te default port for HTTP(S).
+ *
+ * Returns the absolute URI as string.
+ *
+ * Examples:
*
- * url = "page.php" => http://www.example.com/current/path/page.php
- * url = "/page.php" => http://www.example.com/page.php
- * url = "/page.php", proto = "https" => https://www.example.com/page.php
+ *
*
- *
*/
-PHP_FUNCTION(http_absolute_uri)
+PHP_FUNCTION(http_build_uri)
{
char *url = NULL, *proto = NULL, *host = NULL;
int url_len = 0, proto_len = 0, host_len = 0;
@@ -98,17 +107,63 @@ PHP_FUNCTION(http_absolute_uri)
}
/* }}} */
-/* {{{ proto string http_negotiate_language(array supported[, string default = 'en-US'])
+#define HTTP_DO_NEGOTIATE(type, supported, rs_array) \
+{ \
+ HashTable *result; \
+ if (result = http_negotiate_ ##type(supported)) { \
+ char *key; \
+ uint key_len; \
+ ulong idx; \
+ \
+ if (HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key, &key_len, &idx, 1, NULL)) { \
+ RETVAL_STRINGL(key, key_len-1, 0); \
+ } else { \
+ RETVAL_NULL(); \
+ } \
+ \
+ if (rs_array) { \
+ zend_hash_copy(Z_ARRVAL_P(rs_array), result, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); \
+ } \
+ \
+ zend_hash_destroy(result); \
+ FREE_HASHTABLE(result); \
+ \
+ } else { \
+ zval **value; \
+ \
+ zend_hash_internal_pointer_reset(Z_ARRVAL_P(supported)); \
+ if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void **) &value)) { \
+ RETVAL_ZVAL(*value, 1, 0); \
+ } else { \
+ RETVAL_NULL(); \
+ } \
+ \
+ if (rs_array) { \
+ zval **value; \
+ \
+ FOREACH_VAL(supported, value) { \
+ convert_to_string_ex(value); \
+ add_assoc_double(rs_array, Z_STRVAL_PP(value), 1.0); \
+ } \
+ } \
+ } \
+}
+
+
+/* {{{ proto string http_negotiate_language(array supported[, array &result])
*
* This function negotiates the clients preferred language based on its
- * Accept-Language HTTP header. It returns the negotiated language or
- * the default language if none match.
- *
- * The qualifier is recognized and languages without qualifier are rated highest.
- *
- * The supported parameter is expected to be an array having
- * the supported languages as array values.
- *
+ * Accept-Language HTTP header. The qualifier is recognized and languages
+ * without qualifier are rated highest. The qualifier will be decreased by
+ * 10% for partial matches (i.e. matching primary language).
+ *
+ * Expects an array as parameter cotaining the supported languages as values.
+ * If the optional second parameter is supplied, it will be filled with an
+ * array containing the negotiation results.
+ *
+ * Returns the negotiated language or the default language (i.e. first array entry)
+ * if none match.
+ *
* Example:
*
*
*
- *
*/
PHP_FUNCTION(http_negotiate_language)
{
- zval *supported;
- char *def = NULL;
- int def_len = 0;
+ zval *supported, *rs_array = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|s", &supported, &def, &def_len) != SUCCESS) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|z", &supported, &rs_array) != SUCCESS) {
RETURN_FALSE;
}
-
- if (!def) {
- def = "en-US";
+
+ if (rs_array) {
+ zval_dtor(rs_array);
+ array_init(rs_array);
}
-
- RETURN_STRING(http_negotiate_language(supported, def), 0);
+
+ HTTP_DO_NEGOTIATE(language, supported, rs_array);
}
/* }}} */
-/* {{{ proto string http_negotiate_charset(array supported[, string default = 'iso-8859-1'])
+/* {{{ proto string http_negotiate_charset(array supported[, array &result])
*
* This function negotiates the clients preferred charset based on its
- * Accept-Charset HTTP header. It returns the negotiated charset or
- * the default charset if none match.
- *
- * The qualifier is recognized and charset without qualifier are rated highest.
- *
- * The supported parameter is expected to be an array having
- * the supported charsets as array values.
- *
+ * Accept-Charset HTTP header. The qualifier is recognized and charsets
+ * without qualifier are rated highest.
+ *
+ * Expects an array as parameter cotaining the supported charsets as values.
+ * If the optional second parameter is supplied, it will be filled with an
+ * array containing the negotiation results.
+ *
+ * Returns the negotiated charset or the default charset (i.e. first array entry)
+ * if none match.
+ *
* Example:
*
*
*
*/
PHP_FUNCTION(http_negotiate_charset)
{
- zval *supported;
- char *def = NULL;
- int def_len = 0;
+ zval *supported, *rs_array = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|s", &supported, &def, &def_len) != SUCCESS) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|z", &supported, &rs_array) != SUCCESS) {
RETURN_FALSE;
}
-
- if (!def) {
- def = "iso-8859-1";
+
+ if (rs_array) {
+ zval_dtor(rs_array);
+ array_init(rs_array);
}
- RETURN_STRING(http_negotiate_charset(supported, def), 0);
+ HTTP_DO_NEGOTIATE(charset, supported, rs_array);
}
/* }}} */
@@ -195,6 +256,9 @@ PHP_FUNCTION(http_negotiate_charset)
*
* Send HTTP status code.
*
+ * Expects an HTTP status code as parameter.
+ *
+ * Returns TRUE on success or FALSE on failure.
*/
PHP_FUNCTION(http_send_status)
{
@@ -214,10 +278,13 @@ PHP_FUNCTION(http_send_status)
/* {{{ proto bool http_send_last_modified([int timestamp])
*
- * This converts the given timestamp to a valid HTTP date and
+ * Send a "Last-Modified" header with a valid HTTP date.
+ *
+ * Accepts a unix timestamp, converts it to a valid HTTP date and
* sends it as "Last-Modified" HTTP header. If timestamp is
- * omitted, current time is sent.
+ * omitted, the current time will be sent.
*
+ * Returns TRUE on success or FALSE on failure.
*/
PHP_FUNCTION(http_send_last_modified)
{
@@ -237,31 +304,39 @@ PHP_FUNCTION(http_send_last_modified)
/* {{{ proto bool http_send_content_type([string content_type = 'application/x-octetstream'])
*
- * Sets the content type.
+ * Send the Content-Type of the sent entity. This is particularly important
+ * if you use the http_send() API.
+ *
+ * Accepts an optional string parameter containing the desired content type
+ * (primary/secondary).
*
+ * Returns TRUE on success or FALSE on failure.
*/
PHP_FUNCTION(http_send_content_type)
{
- char *ct;
- int ct_len = 0;
+ char *ct = "application/x-octetstream";
+ int ct_len = lenof("application/x-octetstream");
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ct, &ct_len) != SUCCESS) {
RETURN_FALSE;
}
- if (!ct_len) {
- RETURN_SUCCESS(http_send_content_type("application/x-octetstream", lenof("application/x-octetstream")));
- }
RETURN_SUCCESS(http_send_content_type(ct, ct_len));
}
/* }}} */
/* {{{ proto bool http_send_content_disposition(string filename[, bool inline = false])
*
- * Set the Content Disposition. The Content-Disposition header is very useful
+ * 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).
*
+ * Expects a string parameter specifying the file name the "Save as..." dialogue
+ * should display. Optionally accepts a bool parameter, which, if set to true
+ * and the user agent knows how to handle the content type, will probably not
+ * cause the popup window to be shown.
+ *
+ * Returns TRUE on success or FALSE on failure.
*/
PHP_FUNCTION(http_send_content_disposition)
{
@@ -276,11 +351,18 @@ PHP_FUNCTION(http_send_content_disposition)
}
/* }}} */
-/* {{{ proto bool http_match_modified([int timestamp[, for_range = false]])
+/* {{{ proto bool http_match_modified([int timestamp[, bool for_range = false]])
*
- * Matches the given timestamp against the clients "If-Modified-Since" resp.
- * "If-Unmodified-Since" HTTP headers.
+ * Matches the given unix timestamp against the clients "If-Modified-Since"
+ * resp. "If-Unmodified-Since" HTTP headers.
*
+ * Accepts a unix timestamp which should be matched. Optionally accepts an
+ * additional bool parameter, which if set to true will check the header
+ * usually used to validate HTTP ranges. If timestamp is omitted, the
+ * current time will be used.
+ *
+ * Returns TRUE if timestamp represents an earlier date than the header,
+ * else FALSE.
*/
PHP_FUNCTION(http_match_modified)
{
@@ -303,11 +385,17 @@ PHP_FUNCTION(http_match_modified)
}
/* }}} */
-/* {{{ proto bool http_match_etag(string etag[, for_range = false])
+/* {{{ proto bool http_match_etag(string etag[, bool for_range = false])
*
- * This matches the given ETag against the clients
- * "If-Match" resp. "If-None-Match" HTTP headers.
+ * Matches the given ETag against the clients "If-Match" resp.
+ * "If-None-Match" HTTP headers.
*
+ * Expects a string parameter containing the ETag to compare. Optionally
+ * accepts a bool parameter, which, if set to true, will check the header
+ * usually used to validate HTTP ranges.
+ *
+ * Retuns TRUE if ETag matches or the header contained the asterisk ("*"),
+ * else FALSE.
*/
PHP_FUNCTION(http_match_etag)
{
@@ -328,6 +416,10 @@ PHP_FUNCTION(http_match_etag)
/* {{{ proto bool http_cache_last_modified([int timestamp_or_expires]])
*
+ * Attempts to cache the sent entity by its last modification date.
+ *
+ * Accepts a unix timestamp as parameter which is handled as follows:
+ *
* If timestamp_or_expires 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,
@@ -335,6 +427,10 @@ PHP_FUNCTION(http_match_etag)
* requested last modification date is not between the calculated timespan,
* the Last-Modified header is updated and the actual body will be sent.
*
+ * Returns FALSE on failure, or *exits* with "304 Not Modified" if the entity is cached.
+ *
+ * A log entry will be written to the cache log if the INI entry
+ * http.cache_log is set and the cache attempt was successful.
*/
PHP_FUNCTION(http_cache_last_modified)
{
@@ -371,14 +467,17 @@ PHP_FUNCTION(http_cache_last_modified)
/* {{{ proto bool http_cache_etag([string etag])
*
- * This function attempts to cache the HTTP body based on an ETag,
- * either supplied or generated through calculation of the MD5
- * checksum of the output (uses output buffering).
+ * Attempts to cache the sent entity by its ETag, either supplied or generated
+ * by the hash algorythm specified by the INI setting "http.etag_mode".
*
- * If clients "If-None-Match" header matches the supplied/calculated
+ * If the clients "If-None-Match" header matches the supplied/calculated
* ETag, the body is considered cached on the clients side and
* a "304 Not Modified" status code is issued.
*
+ * Returns FALSE on failure, or *exits* with "304 Not Modified" if the entity is cached.
+ *
+ * A log entry is written to the cache log if the INI entry
+ * "http.cache_log" is set and the cache attempt was successful.
*/
PHP_FUNCTION(http_cache_etag)
{
@@ -395,7 +494,8 @@ PHP_FUNCTION(http_cache_etag)
/* {{{ proto string ob_etaghandler(string data, int mode)
*
- * For use with ob_start().
+ * For use with ob_start(). Output buffer handler generating an ETag with
+ * the hash algorythm specified with the INI setting "http.etag_mode".
*/
PHP_FUNCTION(ob_etaghandler)
{
@@ -408,14 +508,22 @@ PHP_FUNCTION(ob_etaghandler)
}
Z_TYPE_P(return_value) = IS_STRING;
- http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), mode);
+ http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), (uint *) &Z_STRLEN_P(return_value), mode);
}
/* }}} */
-/* {{{ proto void http_throttle(double sec[, long bytes = 2097152])
+/* {{{ proto void http_throttle(double sec[, int bytes = 2097152])
*
- * Use with http_send() API.
+ * 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.
+ *
+ * Note: This doesn't really work with the FastCGI SAPI.
*
+ * Expects a double parameter specifying the seconds too sleep() after
+ * each chunk sent. Additionally accepts an optional int parameter
+ * representing the chunk size in bytes.
+ *
* Example:
*
* URI." will be displayed,
- * if the client doesn't redirect immediatly.
+ * if the client doesn't redirect immediatly, and the request method was
+ * another one than HEAD.
+ *
+ * Returns FALSE on failure, or *exits* on success.
+ *
+ * A log entry will be written to the redirect log, if the INI entry
+ * "http.redirect_log" is set and the redirect attempt was successful.
*/
PHP_FUNCTION(http_redirect)
{
int url_len;
size_t query_len = 0;
- zend_bool session = 0, permanent = 0, free_params = 0;
+ zend_bool session = 0, free_params = 0;
zval *params = NULL;
+ long status = 302;
char *query = NULL, *url = NULL, *URI, *LOC, *RED = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!/bb", &url, &url_len, ¶ms, &session, &permanent) != SUCCESS) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!/bl", &url, &url_len, ¶ms, &session, &status) != SUCCESS) {
RETURN_FALSE;
}
@@ -545,7 +667,7 @@ PHP_FUNCTION(http_redirect)
FREE_ZVAL(params);
}
- RETURN_SUCCESS(http_exit_ex(permanent ? 301 : 302, LOC, RED, 1));
+ RETURN_SUCCESS(http_exit_ex(status, LOC, RED, 1));
}
/* }}} */
@@ -553,6 +675,7 @@ PHP_FUNCTION(http_redirect)
*
* Sends raw data with support for (multiple) range requests.
*
+ * Retursn TRUE on success, or FALSE on failure.
*/
PHP_FUNCTION(http_send_data)
{
@@ -571,6 +694,9 @@ PHP_FUNCTION(http_send_data)
*
* Sends a file with support for (multiple) range requests.
*
+ * Expects a string parameter referencing the file to send.
+ *
+ * Returns TRUE on success, or FALSE on failure.
*/
PHP_FUNCTION(http_send_file)
{
@@ -592,6 +718,9 @@ PHP_FUNCTION(http_send_file)
*
* Sends an already opened stream with support for (multiple) range requests.
*
+ * Expects a resource parameter referncing the stream to read from.
+ *
+ * Returns TRUE on success, or FALSE on failure.
*/
PHP_FUNCTION(http_send_stream)
{
@@ -609,20 +738,24 @@ PHP_FUNCTION(http_send_stream)
/* {{{ proto string http_chunked_decode(string encoded)
*
- * This function decodes a string that was HTTP-chunked encoded.
- * Returns false on failure.
+ * Decodes a string that was HTTP-chunked encoded.
+ *
+ * Expects a chunked encoded string as parameter.
+ *
+ * Returns the decoded string on success or FALSE on failure.
*/
PHP_FUNCTION(http_chunked_decode)
{
char *encoded = NULL, *decoded = NULL;
- int encoded_len = 0, decoded_len = 0;
+ size_t decoded_len = 0;
+ int encoded_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &encoded, &encoded_len) != SUCCESS) {
RETURN_FALSE;
}
if (NULL != http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) {
- RETURN_STRINGL(decoded, decoded_len, 0);
+ RETURN_STRINGL(decoded, (int) decoded_len, 0);
} else {
RETURN_FALSE;
}
@@ -631,8 +764,14 @@ PHP_FUNCTION(http_chunked_decode)
/* {{{ proto object http_parse_message(string message)
*
- * Parses (a) http_message(s) into a simple recursive object structure:
+ * Parses (a) http_message(s) into a simple recursive object structure.
+ *
+ * Expects a string parameter containing a single HTTP message or
+ * several consecutive HTTP messages.
*
+ * Returns an hierachical object structure of the parsed messages.
+ *
+ * Example:
*
* 3)));
@@ -675,10 +814,10 @@ PHP_FUNCTION(http_parse_message)
RETURN_NULL();
}
-
if (msg = http_message_parse(message, message_len)) {
object_init(return_value);
http_message_tostruct_recursive(msg, return_value);
+ http_message_free(&msg);
} else {
RETURN_NULL();
}
@@ -687,6 +826,35 @@ PHP_FUNCTION(http_parse_message)
/* {{{ proto array http_parse_headers(string header)
*
+ * Parses HTTP headers into an associative array.
+ *
+ * Expects a string parameter containing HTTP headers.
+ *
+ * Returns an array on success, or FALSE on failure.
+ *
+ * Example:
+ *
+ * text/html; chatset=UTF-8
+ * [Server] => Funky/1.0
+ * [Set-Cookie] => Array
+ * (
+ * [0] => foo=bar
+ * [1] => baz=quux
+ * )
+ * [Folded] => works
+ * too
+ * ?>
+ *
*/
PHP_FUNCTION(http_parse_headers)
{
@@ -708,6 +876,8 @@ PHP_FUNCTION(http_parse_headers)
/* {{{ proto array http_get_request_headers(void)
*
* Get a list of incoming HTTP headers.
+ *
+ * Returns an associative array of incoming request headers.
*/
PHP_FUNCTION(http_get_request_headers)
{
@@ -721,6 +891,8 @@ PHP_FUNCTION(http_get_request_headers)
/* {{{ proto string http_get_request_body(void)
*
* Get the raw request body (e.g. POST or PUT data).
+ *
+ * Returns NULL when using the CLI SAPI.
*/
PHP_FUNCTION(http_get_request_body)
{
@@ -740,6 +912,12 @@ PHP_FUNCTION(http_get_request_body)
/* {{{ proto bool http_match_request_header(string header, string value[, bool match_case = false])
*
* Match an incoming HTTP header.
+ *
+ * Expects two string parameters representing the header name (case-insensitive)
+ * and the header value that should be compared. The case sensitivity of the
+ * header value depends on the additional optional bool parameter accepted.
+ *
+ * Returns TRUE if header value matches, else FALSE.
*/
PHP_FUNCTION(http_match_request_header)
{
@@ -762,7 +940,7 @@ PHP_FUNCTION(http_match_request_header)
*
* Performs an HTTP GET request on the supplied url.
*
- * The second parameter is expected to be an associative
+ * The second parameter, if set, is expected to be an associative
* array where the following keys will be recognized:
*
* - redirect: int, whether and how many redirects to follow
@@ -826,6 +1004,8 @@ PHP_FUNCTION(http_match_request_header)
* )
* ?>
*
+ *
+ * Returns the HTTP response(s) as string on success, or FALSE on failure.
*/
PHP_FUNCTION(http_get)
{
@@ -854,9 +1034,11 @@ PHP_FUNCTION(http_get)
/* {{{ proto string http_head(string url[, array options[, array &info]])
*
- * Performs an HTTP HEAD request on the suppied url.
- * Returns the HTTP response as string.
- * See http_get() for a full list of available options.
+ * Performs an HTTP HEAD request on the supplied url.
+ *
+ * See http_get() for a full list of available parameters and options.
+ *
+ * Returns the HTTP response as string on success, or FALSE on failure.
*/
PHP_FUNCTION(http_head)
{
@@ -885,9 +1067,12 @@ PHP_FUNCTION(http_head)
/* {{{ proto string http_post_data(string url, string data[, array options[, array &info]])
*
- * Performs an HTTP POST request, posting data.
- * Returns the HTTP response as string.
- * See http_get() for a full list of available options.
+ * Performs an HTTP POST requeston the supplied url.
+ *
+ * Expects a string as second parameter containing the pre-encoded post data.
+ * See http_get() for a full list of available parameters and options.
+ *
+ * Returns the HTTP response(s) as string on success, or FALSE on failure.
*/
PHP_FUNCTION(http_post_data)
{
@@ -921,9 +1106,12 @@ PHP_FUNCTION(http_post_data)
/* {{{ proto string http_post_fields(string url, array data[, array files[, array options[, array &info]]])
*
- * Performs an HTTP POST request, posting www-form-urlencoded array data.
- * Returns the HTTP response as string.
- * See http_get() for a full list of available options.
+ * Performs an HTTP POST request on the supplied url.
+ *
+ * Expecrs an associative array as second parameter, which will be
+ * www-form-urlencoded. See http_get() for a full list of available options.
+ *
+ * Returns the HTTP response(s) as string on success, or FALSE on failure.
*/
PHP_FUNCTION(http_post_fields)
{
@@ -958,9 +1146,12 @@ PHP_FUNCTION(http_post_fields)
/* {{{ proto string http_put_file(string url, string file[, array options[, array &info]])
*
- * Performs an HTTP PUT request, uploading file.
- * Returns the HTTP response as string.
+ * Performs an HTTP PUT request on the supplied url.
+ *
+ * Expects the second parameter to be a string referncing the file to upload.
* See http_get() for a full list of available options.
+ *
+ * Returns the HTTP response(s) as string on success, or FALSE on failure.
*/
PHP_FUNCTION(http_put_file)
{
@@ -1005,9 +1196,13 @@ PHP_FUNCTION(http_put_file)
/* {{{ proto string http_put_stream(string url, resource stream[, array options[, array &info]])
*
- * Performs an HTTP PUT request, uploading stream.
- * Returns the HTTP response as string.
+ * Performs an HTTP PUT request on the supplied url.
+ *
+ * Expects the second parameter to be a resource referencing an already
+ * opened stream, from which the data to upload should be read.
* See http_get() for a full list of available options.
+ *
+ * Returns the HTTP response(s) as string on success. or FALSE on failure.
*/
PHP_FUNCTION(http_put_stream)
{
@@ -1045,15 +1240,21 @@ PHP_FUNCTION(http_put_stream)
}
}
/* }}} */
+#endif /* HTTP_HAVE_CURL */
+/* }}} HAVE_CURL */
-/* {{{ proto long http_request_method_register(string method)
+/* {{{ proto int http_request_method_register(string method)
*
* Register a custom request method.
+ *
+ * Expects a string parameter containing the request method name to register.
+ *
+ * Returns the ID of the request method on success, or FALSE on failure.
*/
PHP_FUNCTION(http_request_method_register)
{
char *method;
- int *method_len;
+ int method_len;
unsigned long existing;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) {
@@ -1063,13 +1264,17 @@ PHP_FUNCTION(http_request_method_register)
RETURN_LONG((long) existing);
}
- RETVAL_LONG((long) http_request_method_register(method));
+ RETVAL_LONG((long) http_request_method_register(method, method_len));
}
/* }}} */
/* {{{ proto bool http_request_method_unregister(mixed method)
*
* Unregister a previously registered custom request method.
+ *
+ * Expects either the request method name or ID.
+ *
+ * Returns TRUE on success, or FALSE on failure.
*/
PHP_FUNCTION(http_request_method_unregister)
{
@@ -1084,7 +1289,6 @@ PHP_FUNCTION(http_request_method_unregister)
case IS_OBJECT:
convert_to_string(method);
case IS_STRING:
-#include "zend_operators.h"
if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) {
convert_to_long(method);
} else {
@@ -1103,9 +1307,13 @@ PHP_FUNCTION(http_request_method_unregister)
}
/* }}} */
-/* {{{ proto long http_request_method_exists(mixed method)
+/* {{{ proto int http_request_method_exists(mixed method)
*
* Check if a request method is registered (or available by default).
+ *
+ * Expects either the request method name or ID as parameter.
+ *
+ * Returns TRUE if the request method is known, else FALSE.
*/
PHP_FUNCTION(http_request_method_exists)
{
@@ -1135,9 +1343,13 @@ PHP_FUNCTION(http_request_method_exists)
}
/* }}} */
-/* {{{ proto string http_request_method_name(long method)
+/* {{{ proto string http_request_method_name(int method)
*
* Get the literal string representation of a standard or registered request method.
+ *
+ * Expects the request method ID as parameter.
+ *
+ * Returns the request method name as string on success, or FALSE on failure.
*/
PHP_FUNCTION(http_request_method_name)
{
@@ -1152,118 +1364,6 @@ PHP_FUNCTION(http_request_method_name)
}
}
/* }}} */
-#endif
-/* }}} HAVE_CURL */
-
-
-/* {{{ proto bool http_auth_basic(string user, string pass[, string realm = "Restricted"])
- *
- * Example:
- *
- * Authorization failed!');
- * }
- * ?>
- *
- */
-PHP_FUNCTION(http_auth_basic)
-{
- char *realm = NULL, *user, *pass, *suser, *spass;
- int r_len, u_len, p_len;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s", &user, &u_len, &pass, &p_len, &realm, &r_len) != SUCCESS) {
- RETURN_FALSE;
- }
-
- if (!realm) {
- realm = "Restricted";
- }
-
- if (SUCCESS != http_auth_basic_credentials(&suser, &spass)) {
- http_auth_basic_header(realm);
- RETURN_FALSE;
- }
-
- if (strcasecmp(suser, user)) {
- http_auth_basic_header(realm);
- RETURN_FALSE;
- }
-
- if (strcmp(spass, pass)) {
- http_auth_basic_header(realm);
- RETURN_FALSE;
- }
-
- RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto bool http_auth_basic_cb(mixed callback[, string realm = "Restricted"])
- *
- * Example:
- *
- * quoteSmart($user);
- * if (strlen($realpass = $db->getOne($query)) {
- * return $pass === $realpass;
- * }
- * return false;
- * }
- * if (!http_auth_basic_cb('auth_cb')) {
- * die('Authorization failed
');
- * }
- * ?>
- *
- */
-PHP_FUNCTION(http_auth_basic_cb)
-{
- zval *cb;
- char *realm = NULL, *user, *pass;
- int r_len;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &cb, &realm, &r_len) != SUCCESS) {
- RETURN_FALSE;
- }
-
- if (!realm) {
- realm = "Restricted";
- }
-
- if (SUCCESS != http_auth_basic_credentials(&user, &pass)) {
- http_auth_basic_header(realm);
- RETURN_FALSE;
- }
- {
- zval *zparams[2] = {NULL, NULL}, retval;
- int result = 0;
-
- MAKE_STD_ZVAL(zparams[0]);
- MAKE_STD_ZVAL(zparams[1]);
- ZVAL_STRING(zparams[0], user, 0);
- ZVAL_STRING(zparams[1], pass, 0);
-
- if (SUCCESS == call_user_function(EG(function_table), NULL, cb,
- &retval, 2, zparams TSRMLS_CC)) {
- result = Z_LVAL(retval);
- }
-
- efree(user);
- efree(pass);
- efree(zparams[0]);
- efree(zparams[1]);
-
- if (!result) {
- http_auth_basic_header(realm);
- }
-
- RETURN_BOOL(result);
- }
-}
-/* }}}*/
/* {{{ Sara Golemons http_build_query() */
#ifndef ZEND_ENGINE_2
@@ -1309,13 +1409,6 @@ PHP_FUNCTION(http_build_query)
PHP_FUNCTION(http_test)
{
- ulong idx;
- char *key;
- zval **data;
- FOREACH_HASH_KEYVAL(&EG(symbol_table), key, idx, data) {
- convert_to_string_ex(data);
- fprintf(stderr, "\t %s => %s\n", key, Z_STRVAL_PP(data));
- }
}
/*