X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=079996986697c361a73f6c6a9e6ce520d24db4cc;hp=6afde9455f8773e917d8403afb1cd068865ad33c;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=6dd728f3faa5dcedf81f3f9a6cfe2e41993efc0b diff --git a/http_functions.c b/http_functions.c index 6afde94..0799969 100644 --- a/http_functions.c +++ b/http_functions.c @@ -1,203 +1,275 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2010, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ -#define _WINSOCKAPI_ -#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#define HTTP_WANT_SAPI +#define HTTP_WANT_CURL +#define HTTP_WANT_ZLIB +#include "php_http.h" -#include "php.h" #include "php_ini.h" -#include "snprintf.h" -#include "ext/standard/info.h" -#include "ext/session/php_session.h" #include "ext/standard/php_string.h" -#include "ext/standard/php_smart_str.h" +#include "zend_operators.h" -#include "SAPI.h" +#ifdef HTTP_HAVE_SESSION +# include "ext/session/php_session.h" +#endif -#include "php_http.h" #include "php_http_api.h" -#include "php_http_curl_api.h" -#include "php_http_std_defs.h" - -ZEND_DECLARE_MODULE_GLOBALS(http) +#include "php_http_cache_api.h" +#include "php_http_cookie_api.h" +#include "php_http_date_api.h" +#include "php_http_encoding_api.h" +#include "php_http_headers_api.h" +#include "php_http_message_api.h" +#include "php_http_request_api.h" +#include "php_http_request_method_api.h" +#include "php_http_persistent_handle_api.h" +#include "php_http_send_api.h" +#include "php_http_url_api.h" /* {{{ proto string http_date([int timestamp]) - * - * This function returns a valid HTTP date regarding RFC 822/1123 - * looking like: "Wed, 22 Dec 2004 11:34:47 GMT" - * - */ + Compose a valid HTTP date regarding RFC 1123 looking like: "Wed, 22 Dec 2004 11:34:47 GMT" */ PHP_FUNCTION(http_date) { long t = -1; + char *date; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &t) != SUCCESS) { RETURN_FALSE; } if (t == -1) { - t = (long) time(NULL); + t = HTTP_G->request.time; } - RETURN_STRING(http_date(t), 0); + if (!(date = http_date(t))) { + http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Could not compose date of timestamp %ld", t); + RETURN_FALSE; + } + + RETURN_STRING(date, 0); } /* }}} */ -/* {{{ proto string http_absolute_uri(string url[, string proto]) - * - * This function returns an absolute URI constructed from url. - * 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: - * 
- *  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) -{ - char *url = NULL, *proto = NULL; - int url_len = 0, proto_len = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &url, &url_len, &proto, &proto_len) != SUCCESS) { - RETURN_FALSE; - } - - RETURN_STRING(http_absolute_uri(url, proto), 0); -} -/* }}} */ - -/* {{{ proto string http_negotiate_language(array supported[, string default = 'en-US']) - * - * 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. - * - * Example: - * 
- * 
- *
- * - */ +/* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE|HTTP_URL_FROM_ENV[, array &new_url]]]]) + Build an URL. */ +PHP_FUNCTION(http_build_url) +{ + char *url_str = NULL; + size_t url_len = 0; + long flags = HTTP_URL_REPLACE|HTTP_URL_FROM_ENV; + zval *z_old_url = NULL, *z_new_url = NULL, *z_composed_url = NULL; + php_url *old_url = NULL, *new_url = NULL, *composed_url = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!/z!/lz", &z_old_url, &z_new_url, &flags, &z_composed_url) != SUCCESS) { + RETURN_FALSE; + } + + if (z_new_url) { + if (Z_TYPE_P(z_new_url) == IS_ARRAY || Z_TYPE_P(z_new_url) == IS_OBJECT) { + new_url = http_url_from_struct(NULL, HASH_OF(z_new_url)); + } else { + convert_to_string(z_new_url); + if (!(new_url = php_url_parse_ex(Z_STRVAL_P(z_new_url), Z_STRLEN_P(z_new_url)))) { + http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", Z_STRVAL_P(z_new_url)); + RETURN_FALSE; + } + } + } + + if (z_old_url) { + if (Z_TYPE_P(z_old_url) == IS_ARRAY || Z_TYPE_P(z_old_url) == IS_OBJECT) { + old_url = http_url_from_struct(NULL, HASH_OF(z_old_url)); + } else { + convert_to_string(z_old_url); + if (!(old_url = php_url_parse_ex(Z_STRVAL_P(z_old_url), Z_STRLEN_P(z_old_url)))) { + if (new_url) { + php_url_free(new_url); + } + http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", Z_STRVAL_P(z_old_url)); + RETURN_FALSE; + } + } + } + + if (z_composed_url) { + http_build_url(flags, old_url, new_url, &composed_url, &url_str, &url_len); + http_url_tostruct(composed_url, z_composed_url); + php_url_free(composed_url); + } else { + http_build_url(flags, old_url, new_url, NULL, &url_str, &url_len); + } + + if (new_url) { + php_url_free(new_url); + } + if (old_url) { + php_url_free(old_url); + } + + RETURN_STRINGL(url_str, url_len, 0); +} +/* }}} */ + +/* {{{ proto string http_build_str(array query [, string prefix[, string arg_separator]]) + Opponent to parse_str(). */ +PHP_FUNCTION(http_build_str) +{ + zval *formdata; + char *prefix = NULL, *arg_sep = INI_STR("arg_separator.output"); + int prefix_len = 0, arg_sep_len = strlen(arg_sep); + phpstr formstr; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) { + RETURN_FALSE; + } + + if (!arg_sep_len) { + arg_sep = HTTP_URL_ARGSEP; + arg_sep_len = lenof(HTTP_URL_ARGSEP); + } + + phpstr_init(&formstr); + if (SUCCESS != http_urlencode_hash_recursive(HASH_OF(formdata), &formstr, arg_sep, arg_sep_len, prefix, prefix_len)) { + RETURN_FALSE; + } + + if (!formstr.used) { + phpstr_dtor(&formstr); + RETURN_NULL(); + } + + RETURN_PHPSTR_VAL(&formstr); +} +/* }}} */ + +#define HTTP_DO_NEGOTIATE_DEFAULT(supported) \ + { \ + 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(); \ + } \ + } +#define HTTP_DO_NEGOTIATE(type, supported, rs_array) \ +{ \ + HashTable *result; \ + if ((result = http_negotiate_ ##type(supported))) { \ + char *key; \ + uint key_len; \ + ulong idx; \ + \ + if (zend_hash_num_elements(result) && 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 { \ + HTTP_DO_NEGOTIATE_DEFAULT(supported); \ + } \ + \ + 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 { \ + HTTP_DO_NEGOTIATE_DEFAULT(supported); \ + \ + if (rs_array) { \ + HashPosition pos; \ + zval **value_ptr; \ + \ + FOREACH_VAL(pos, supported, value_ptr) { \ + zval *value = http_zsep(IS_STRING, *value_ptr); \ + add_assoc_double(rs_array, Z_STRVAL_P(value), 1.0); \ + zval_ptr_dtor(&value); \ + } \ + } \ + } \ +} + +/* {{{ proto string http_negotiate_language(array supported[, array &result]) + Negotiate the clients preferred language. */ PHP_FUNCTION(http_negotiate_language) { - zval *supported; - char *def = NULL; - int def_len = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|s", &supported, &def, &def_len) != SUCCESS) { - RETURN_FALSE; - } - - if (!def) { - def = "en-US"; - } - - RETURN_STRING(http_negotiate_language(supported, def), 0); -} -/* }}} */ - -/* {{{ proto string http_negotiate_charset(array supported[, string default = 'iso-8859-1']) - * - * 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. - * - * Example: - * 
- * 
- *
- */ + zval *supported, *rs_array = NULL; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|z", &supported, &rs_array) != SUCCESS) { + RETURN_FALSE; + } + + if (rs_array) { + zval_dtor(rs_array); + array_init(rs_array); + } + + HTTP_DO_NEGOTIATE(language, supported, rs_array); +} +/* }}} */ + +/* {{{ proto string http_negotiate_charset(array supported[, array &result]) + Negotiate the clients preferred charset. */ 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); +} +/* }}} */ + +/* {{{ proto string http_negotiate_content_type(array supported[, array &result]) + Negotiate the clients preferred content type. */ +PHP_FUNCTION(http_negotiate_content_type) +{ + zval *supported, *rs_array = NULL; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|z", &supported, &rs_array)) { + RETURN_FALSE; + } + + if (rs_array) { + zval_dtor(rs_array); + array_init(rs_array); + } + + HTTP_DO_NEGOTIATE(content_type, supported, rs_array); } /* }}} */ /* {{{ proto bool http_send_status(int status) - * - * Send HTTP status code. - * - */ + Send HTTP status code. */ PHP_FUNCTION(http_send_status) { - int status = 0; + long status = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &status) != SUCCESS) { RETURN_FALSE; } if (status < 100 || status > 510) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid HTTP status code (100-510): %d", status); + http_error_ex(HE_WARNING, HTTP_E_HEADER, "Invalid HTTP status code (100-510): %d", status); RETURN_FALSE; } @@ -206,12 +278,7 @@ PHP_FUNCTION(http_send_status) /* }}} */ /* {{{ proto bool http_send_last_modified([int timestamp]) - * - * This converts the given timestamp to a valid HTTP date and - * sends it as "Last-Modified" HTTP header. If timestamp is - * omitted, current time is sent. - * - */ + Send a "Last-Modified" header with a valid HTTP date. */ PHP_FUNCTION(http_send_last_modified) { long t = -1; @@ -221,7 +288,7 @@ PHP_FUNCTION(http_send_last_modified) } if (t == -1) { - t = (long) time(NULL); + t = HTTP_G->request.time; } RETURN_SUCCESS(http_send_last_modified(t)); @@ -229,33 +296,22 @@ 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. */ 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", sizeof("application/x-octetstream") - 1)); - } 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 - * 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). - * - */ + Send the Content-Disposition. */ PHP_FUNCTION(http_send_content_disposition) { char *filename; @@ -269,12 +325,8 @@ PHP_FUNCTION(http_send_content_disposition) } /* }}} */ -/* {{{ proto bool http_match_modified([int timestamp[, for_range = false]]) - * - * Matches the given timestamp against the clients "If-Modified-Since" resp. - * "If-Unmodified-Since" HTTP headers. - * - */ +/* {{{ proto bool http_match_modified([int timestamp[, bool for_range = false]]) + Matches the given unix timestamp against the clients "If-Modified-Since" resp. "If-Unmodified-Since" HTTP headers. */ PHP_FUNCTION(http_match_modified) { long t = -1; @@ -286,22 +338,18 @@ PHP_FUNCTION(http_match_modified) // current time if not supplied (senseless though) if (t == -1) { - t = (long) time(NULL); + t = HTTP_G->request.time; } if (for_range) { - RETURN_BOOL(http_modified_match("HTTP_IF_UNMODIFIED_SINCE", t)); + RETURN_BOOL(http_match_last_modified("HTTP_IF_UNMODIFIED_SINCE", t)); } - RETURN_BOOL(http_modified_match("HTTP_IF_MODIFIED_SINCE", t)); + RETURN_BOOL(http_match_last_modified("HTTP_IF_MODIFIED_SINCE", t)); } /* }}} */ -/* {{{ proto bool http_match_etag(string etag[, for_range = false]) - * - * This matches the given ETag against the clients - * "If-Match" resp. "If-None-Match" HTTP headers. - * - */ +/* {{{ proto bool http_match_etag(string etag[, bool for_range = false]) + Matches the given ETag against the clients "If-Match" resp. "If-None-Match" HTTP headers. */ PHP_FUNCTION(http_match_etag) { int etag_len; @@ -313,22 +361,14 @@ PHP_FUNCTION(http_match_etag) } if (for_range) { - RETURN_BOOL(http_etag_match("HTTP_IF_MATCH", etag)); + RETURN_BOOL(http_match_etag("HTTP_IF_MATCH", etag)); } - RETURN_BOOL(http_etag_match("HTTP_IF_NONE_MATCH", etag)); + RETURN_BOOL(http_match_etag("HTTP_IF_NONE_MATCH", etag)); } /* }}} */ /* {{{ proto bool http_cache_last_modified([int timestamp_or_expires]]) - * - * If timestamp_or_exires 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 Last-Modified header is updated and the actual body will be sent. - * - */ + Attempts to cache the sent entity by its last modification date. */ PHP_FUNCTION(http_cache_last_modified) { long last_modified = 0, send_modified = 0, t; @@ -337,13 +377,15 @@ PHP_FUNCTION(http_cache_last_modified) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &last_modified) != SUCCESS) { RETURN_FALSE; } + + HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); - t = (long) time(NULL); + t = HTTP_G->request.time; /* 0 or omitted */ if (!last_modified) { /* does the client have? (att: caching "forever") */ - if (zlm = http_get_server_var("HTTP_IF_MODIFIED_SINCE")) { + if ((zlm = http_get_server_var("HTTP_IF_MODIFIED_SINCE", 1))) { last_modified = send_modified = http_parse_date(Z_STRVAL_P(zlm)); /* send current time */ } else { @@ -358,41 +400,30 @@ PHP_FUNCTION(http_cache_last_modified) send_modified = last_modified; } - RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1)); + RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL))); } /* }}} */ /* {{{ 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). - * - * If 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. - * - */ + 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". */ PHP_FUNCTION(http_cache_etag) { - char *etag; + char *etag = NULL; int etag_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &etag, &etag_len) != SUCCESS) { RETURN_FALSE; } + + HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); - RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1)); + RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL))); } /* }}} */ -/* {{{ proto string ob_httpetaghandler(string data, int mode) - * - * For use with ob_start(). - * Note that this has to be started as first output buffer. - * WARNING: Don't use with http_send_*(). - */ -PHP_FUNCTION(ob_httpetaghandler) +/* {{{ proto string ob_etaghandler(string data, int mode) + For use with ob_start(). Output buffer handler generating an ETag with the hash algorithm specified with the INI setting "http.etag.mode". */ +PHP_FUNCTION(ob_etaghandler) { char *data; int data_len; @@ -402,114 +433,143 @@ PHP_FUNCTION(ob_httpetaghandler) RETURN_FALSE; } - if (mode & PHP_OUTPUT_HANDLER_START) { - if (HTTP_G(etag_started)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_httpetaghandler can only be used once"); - RETURN_STRINGL(data, data_len, 1); - } - http_send_header("Cache-Control: " HTTP_DEFAULT_CACHECONTROL); - HTTP_G(etag_started) = 1; + Z_TYPE_P(return_value) = IS_STRING; + http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), (uint *) &Z_STRLEN_P(return_value), mode); +} +/* }}} */ + +/* {{{ proto void http_throttle(double sec[, int bytes = 40960]) + Sets the throttle delay and send buffer size for use with http_send() API. */ +PHP_FUNCTION(http_throttle) +{ + long chunk_size = HTTP_SENDBUF_SIZE; + double interval; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d|l", &interval, &chunk_size)) { + return; } - if (OG(ob_nesting_level) > 1) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "ob_httpetaghandler must be started prior to other output buffers"); - RETURN_STRINGL(data, data_len, 1); - } + HTTP_G->send.throttle_delay = interval; + HTTP_G->send.buffer_size = chunk_size; +} +/* }}} */ - Z_TYPE_P(return_value) = IS_STRING; - http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), mode); -} -/* }}} */ - -/* {{{ proto void http_redirect([string url[, array params[, bool session,[ bool permanent]]]]) - * - * Redirect to a given url. - * The supplied url will be expanded with http_absolute_uri(), the params array will - * be treated with http_build_query() and the session identification will be appended - * if session is true. - * - * Depending on permanent the redirection will be issued with a permanent - * ("301 Moved Permanently") or a temporary ("302 Found") redirection - * status code. - * - * To be RFC compliant, "Redirecting to URI." will be displayed, - * if the client doesn't redirect immediatly. - */ +/* {{{ proto void http_redirect([string url[, array params[, bool session = false[, int status = 302]]]]) + Redirect to the given url. */ PHP_FUNCTION(http_redirect) { - int url_len; + int url_len = 0; size_t query_len = 0; - zend_bool session = 0, permanent = 0; + zend_bool session = 0, free_params = 0; zval *params = NULL; - char *query, *url, *URI, - LOC[HTTP_URI_MAXLEN + sizeof("Location: ")], - RED[HTTP_URI_MAXLEN * 2 + sizeof("Redirecting to %s?%s.\n")]; + long status = HTTP_REDIRECT; + 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; } +#ifdef HTTP_HAVE_SESSION /* append session info */ - if (session && (PS(session_status) == php_session_active)) { + if (session) { if (!params) { + free_params = 1; MAKE_STD_ZVAL(params); array_init(params); } - if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not append session information"); + if (PS(session_status) == php_session_active) { + if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) { + http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not append session information"); + } } } +#endif /* treat params array with http_build_query() */ if (params) { if (SUCCESS != http_urlencode_hash_ex(Z_ARRVAL_P(params), 0, NULL, 0, &query, &query_len)) { + if (free_params) { + zval_dtor(params); + FREE_ZVAL(params); + } + if (query) { + efree(query); + } RETURN_FALSE; } } - URI = http_absolute_uri(url, NULL); + URI = http_absolute_url_ex(url, HTTP_URL_FROM_ENV); + if (query_len) { - snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s?%s", URI, query); - sprintf(RED, "Redirecting to %s?%s.\n", URI, query, URI, query); - efree(query); + spprintf(&LOC, 0, "Location: %s?%s", URI, query); + if (status != 300) { + spprintf(&RED, 0, "Redirecting to %s?%s.\n", URI, query, URI, query); + } } else { - snprintf(LOC, HTTP_URI_MAXLEN + sizeof("Location: "), "Location: %s", URI); - sprintf(RED, "Redirecting to %s.\n", URI, URI); + spprintf(&LOC, 0, "Location: %s", URI); + if (status != 300) { + spprintf(&RED, 0, "Redirecting to %s.\n", URI, URI); + } } + efree(URI); - - if ((SUCCESS == http_send_header(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) { - php_body_write(RED, strlen(RED) TSRMLS_CC); - RETURN_TRUE; + if (query) { + efree(query); } - RETURN_FALSE; + if (free_params) { + zval_dtor(params); + FREE_ZVAL(params); + } + + switch (status) { + case 300: + RETVAL_SUCCESS(http_send_status_header(status, LOC)); + efree(LOC); + return; + + case HTTP_REDIRECT_PERM: + case HTTP_REDIRECT_FOUND: + case HTTP_REDIRECT_POST: + case HTTP_REDIRECT_PROXY: + case HTTP_REDIRECT_TEMP: + break; + + case 306: + default: + http_error_ex(HE_NOTICE, HTTP_E_RUNTIME, "Unsupported redirection status code: %ld", status); + case HTTP_REDIRECT: + if ( SG(request_info).request_method && + strcasecmp(SG(request_info).request_method, "HEAD") && + strcasecmp(SG(request_info).request_method, "GET")) { + status = HTTP_REDIRECT_POST; + } else { + status = HTTP_REDIRECT_FOUND; + } + break; + } + + RETURN_SUCCESS(http_exit_ex(status, LOC, RED, 1)); } /* }}} */ /* {{{ proto bool http_send_data(string data) - * - * Sends raw data with support for (multiple) range requests. - * - */ + Sends raw data with support for (multiple) range requests. */ PHP_FUNCTION(http_send_data) { - zval *zdata; + int data_len; + char *data_buf; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zdata) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data_buf, &data_len) != SUCCESS) { RETURN_FALSE; } - convert_to_string_ex(&zdata); - http_send_header("Accept-Ranges: bytes"); - RETURN_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata))); + RETURN_SUCCESS(http_send_data(data_buf, data_len)); } /* }}} */ /* {{{ proto bool http_send_file(string file) - * - * Sends a file with support for (multiple) range requests. - * - */ + Sends a file with support for (multiple) range requests. */ PHP_FUNCTION(http_send_file) { char *file; @@ -522,16 +582,12 @@ PHP_FUNCTION(http_send_file) RETURN_FALSE; } - http_send_header("Accept-Ranges: bytes"); RETURN_SUCCESS(http_send_file(file)); } /* }}} */ /* {{{ proto bool http_send_stream(resource stream) - * - * Sends an already opened stream with support for (multiple) range requests. - * - */ + Sends an already opened stream with support for (multiple) range requests. */ PHP_FUNCTION(http_send_stream) { zval *zstream; @@ -542,187 +598,290 @@ PHP_FUNCTION(http_send_stream) } php_stream_from_zval(file, &zstream); - http_send_header("Accept-Ranges: bytes"); RETURN_SUCCESS(http_send_stream(file)); } /* }}} */ /* {{{ 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. */ 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 (SUCCESS == http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) { - RETURN_STRINGL(decoded, decoded_len, 0); + if (NULL != http_encoding_dechunk(encoded, encoded_len, &decoded, &decoded_len)) { + RETURN_STRINGL(decoded, (int) decoded_len, 0); } else { RETURN_FALSE; } } /* }}} */ -/* {{{ proto array http_split_response(string http_response) - * - * This function splits an HTTP response into an array with headers and the - * content body. The returned array may look simliar to the following example: - * - * 
- *  array(
- *         'Status' => '200 Ok',
- *         'Content-Type' => 'text/plain',
+/* {{{ proto object http_parse_message(string message)
+	Parses (a) http_message(s) into a simple recursive object structure. */
+PHP_FUNCTION(http_parse_message)
+{
+	char *message;
+	int message_len;
+	http_message *msg = NULL;
+	
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &message, &message_len)) {
+		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();
+	}
+}
+/* }}} */
 
- *         'Content-Language' => 'en-US'
- *     ),
- *     1 => "Hello World!"
- * );
- * ?>
- *
- */ -PHP_FUNCTION(http_split_response) +/* {{{ proto array http_parse_headers(string header) + Parses HTTP headers into an associative array. */ +PHP_FUNCTION(http_parse_headers) { - zval *zresponse, *zbody, *zheaders; + char *header; + int header_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zresponse) != SUCCESS) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header, &header_len)) { RETURN_FALSE; } - convert_to_string_ex(&zresponse); + array_init(return_value); + if (SUCCESS != http_parse_headers(header, return_value)) { + zval_dtor(return_value); + http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse headers"); + RETURN_FALSE; + } +} +/* }}}*/ - MAKE_STD_ZVAL(zbody); - MAKE_STD_ZVAL(zheaders); - array_init(zheaders); +/* {{{ proto object http_parse_cookie(string cookie[, int flags[, array allowed_extras]]) + Parses HTTP cookies like sent in a response into a struct. */ +PHP_FUNCTION(http_parse_cookie) +{ + char *cookie, **allowed_extras = NULL; + int i = 0, cookie_len; + long flags = 0; + zval *allowed_extras_array = NULL, **entry = NULL; + HashPosition pos; + http_cookie_list list; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|la!", &cookie, &cookie_len, &flags, &allowed_extras_array)) { + RETURN_FALSE; + } + + if (allowed_extras_array) { + allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *)); + FOREACH_VAL(pos, allowed_extras_array, entry) { + zval *data = http_zsep(IS_STRING, *entry); + allowed_extras[i++] = estrndup(Z_STRVAL_P(data), Z_STRLEN_P(data)); + zval_ptr_dtor(&data); + } + } + + if (http_parse_cookie_ex(&list, cookie, flags, allowed_extras)) { + object_init(return_value); + http_cookie_list_tostruct(&list, return_value); + http_cookie_list_dtor(&list); + } else { + RETVAL_FALSE; + } + + if (allowed_extras) { + for (i = 0; allowed_extras[i]; ++i) { + efree(allowed_extras[i]); + } + efree(allowed_extras); + } +} +/* }}} */ - if (SUCCESS != http_split_response(zresponse, zheaders, zbody)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP response"); +/* {{{ proto string http_build_cookie(array cookie) + Build a cookie string from an array/object like returned by http_parse_cookie(). */ +PHP_FUNCTION(http_build_cookie) +{ + char *str = NULL; + size_t len = 0; + zval *strct; + http_cookie_list list; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &strct)) { RETURN_FALSE; } + + http_cookie_list_fromstruct(&list, strct); + http_cookie_list_tostring(&list, &str, &len); + http_cookie_list_dtor(&list); + + RETURN_STRINGL(str, len, 0); +} +/* }}} */ + +/* {{{ proto object http_parse_params(string param[, int flags = HTTP_PARAMS_DEFAULT]) + Parse parameter list. */ +PHP_FUNCTION(http_parse_params) +{ + char *param; + int param_len; + zval *params; + long flags = HTTP_PARAMS_DEFAULT; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", ¶m, ¶m_len, &flags)) { + RETURN_FALSE; + } + + MAKE_STD_ZVAL(params); + array_init(params); + if (SUCCESS != http_parse_params(param, flags, Z_ARRVAL_P(params))) { + zval_ptr_dtor(¶ms); + RETURN_FALSE; + } + + object_init(return_value); + add_property_zval(return_value, "params", params); +#ifdef ZEND_ENGINE_2 + zval_ptr_dtor(¶ms); +#endif +} +/* }}} */ + +/* {{{ proto array http_get_request_headers(void) + Get a list of incoming HTTP headers. */ +PHP_FUNCTION(http_get_request_headers) +{ + NO_ARGS; array_init(return_value); - add_index_zval(return_value, 0, zheaders); - add_index_zval(return_value, 1, zbody); + http_get_request_headers(Z_ARRVAL_P(return_value)); } /* }}} */ -/* {{{ proto array http_parse_headers(string header) - * - */ -PHP_FUNCTION(http_parse_headers) +/* {{{ proto string http_get_request_body(void) + Get the raw request body (e.g. POST or PUT data). */ +PHP_FUNCTION(http_get_request_body) { - char *header, *rnrn; - int header_len; + char *body; + size_t length; - if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header, &header_len)) { - RETURN_FALSE; + NO_ARGS; + + if (SUCCESS == http_get_request_body(&body, &length)) { + RETURN_STRINGL(body, (int) length, 0); + } else { + RETURN_NULL(); } +} +/* }}} */ - array_init(return_value); +/* {{{ proto resource http_get_request_body_stream(void) + Create a stream to read the raw request body (e.g. POST or PUT data). This function can only be used once if the request method was another than POST. */ +PHP_FUNCTION(http_get_request_body_stream) +{ + php_stream *s; + + NO_ARGS; + + if ((s = http_get_request_body_stream())) { + php_stream_to_zval(s, return_value); + } else { + http_error(HE_WARNING, HTTP_E_RUNTIME, "Failed to create request body stream"); + RETURN_NULL(); + } +} +/* }}} */ + +/* {{{ proto bool http_match_request_header(string header, string value[, bool match_case = false]) + Match an incoming HTTP header. */ +PHP_FUNCTION(http_match_request_header) +{ + char *header, *value; + int header_len, value_len; + zend_bool match_case = 0; - if (rnrn = strstr(header, HTTP_CRLF HTTP_CRLF)) { - header_len = rnrn - header + 2; + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", &header, &header_len, &value, &value_len, &match_case)) { + RETURN_FALSE; } - if (SUCCESS != http_parse_headers(header, header_len, return_value)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP header"); + + RETURN_BOOL(http_match_request_header_ex(header, value, match_case)); +} +/* }}} */ + +/* {{{ proto object http_persistent_handles_count() */ +PHP_FUNCTION(http_persistent_handles_count) +{ + NO_ARGS; + object_init(return_value); + if (!http_persistent_handle_statall_ex(HASH_OF(return_value))) { zval_dtor(return_value); - RETURN_FALSE; + RETURN_NULL(); } } -/* }}}*/ +/* }}} */ -/* {{{ proto array http_get_request_headers(void) - * - */ -PHP_FUNCTION(http_get_request_headers) +/* {{{ proto void http_persistent_handles_clean([string name]) */ +PHP_FUNCTION(http_persistent_handles_clean) { - if (ZEND_NUM_ARGS()) { - WRONG_PARAM_COUNT; + char *name_str = NULL; + int name_len = 0; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &name_str, &name_len)) { + http_persistent_handle_cleanup_ex(name_str, name_len, 1); } +} +/* }}} */ - array_init(return_value); - http_get_request_headers(return_value); +/* {{{ proto string http_persistent_handles_ident([string ident]) */ +PHP_FUNCTION(http_persistent_handles_ident) +{ + char *ident_str = NULL; + int ident_len = 0; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ident_str, &ident_len)) { + RETVAL_STRING(zend_ini_string(ZEND_STRS("http.persistent.handles.ident"), 0), 1); + if (ident_str && ident_len) { + zend_alter_ini_entry(ZEND_STRS("http.persistent.handles.ident"), ident_str, ident_len, ZEND_INI_USER, PHP_INI_STAGE_RUNTIME); + } + } } /* }}} */ /* {{{ HAVE_CURL */ #ifdef HTTP_HAVE_CURL +#define RETVAL_RESPONSE_OR_BODY(request) \ + { \ + zval **bodyonly; \ + \ + /* check if only the body should be returned */ \ + if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void *) &bodyonly)) && i_zend_is_true(*bodyonly)) { \ + http_message *msg = http_message_parse(PHPSTR_VAL(&request.conv.response), PHPSTR_LEN(&request.conv.response)); \ + \ + if (msg) { \ + RETVAL_STRINGL(PHPSTR_VAL(&msg->body), PHPSTR_LEN(&msg->body), 1); \ + http_message_free(&msg); \ + } \ + } else { \ + RETVAL_STRINGL(request.conv.response.data, request.conv.response.used, 1); \ + } \ + } + /* {{{ proto string http_get(string url[, array options[, array &info]]) - * - * Performs an HTTP GET request on the supplied url. - * - * The second parameter is expected to be an associative - * array where the following keys will be recognized: - * 
- *  - redirect:         int, whether and how many redirects to follow
- *  - unrestrictedauth: bool, whether to continue sending credentials on
- *                      redirects to a different host
- *  - proxyhost:        string, proxy host in "host[:port]" format
- *  - proxyport:        int, use another proxy port as specified in proxyhost
- *  - proxyauth:        string, proxy credentials in "user:pass" format
- *  - proxyauthtype:    int, HTTP_AUTH_BASIC and/or HTTP_AUTH_NTLM
- *  - httpauth:         string, http credentials in "user:pass" format
- *  - httpauthtype:     int, HTTP_AUTH_BASIC, DIGEST and/or NTLM
- *  - compress:         bool, whether to allow gzip/deflate content encoding
- *                      (defaults to true)
- *  - port:             int, use another port as specified in the url
- *  - referer:          string, the referer to sends
- *  - useragent:        string, the user agent to send
- *                      (defaults to PECL::HTTP/version (PHP/version)))
- *  - headers:          array, list of custom headers as associative array
- *                      like array("header" => "value")
- *  - cookies:          array, list of cookies as associative array
- *                      like array("cookie" => "value")
- *  - cookiestore:      string, path to a file where cookies are/will be stored
- *
- * - * The optional third parameter will be filled with some additional information - * in form af an associative array, if supplied, like the following example: - * 
- *  'http://localhost',
- *     'response_code' => 403,
- *     'total_time' => 0.017,
- *     'namelookup_time' => 0.013,
- *     'connect_time' => 0.014,
- *     'pretransfer_time' => 0.014,
- *     'size_upload' => 0,
- *     'size_download' => 202,
- *     'speed_download' => 11882,
- *     'speed_upload' => 0,
- *     'header_size' => 145,
- *     'request_size' => 62,
- *     'ssl_verifyresult' => 0,
- *     'filetime' => -1,
- *     'content_length_download' => 202,
- *     'content_length_upload' => 0,
- *     'starttransfer_time' => 0.017,
- *     'content_type' => 'text/html; charset=iso-8859-1',
- *     'redirect_time' => 0,
- *     'redirect_count' => 0,
- *     'private' => '',
- *     'http_connectcode' => 0,
- *     'httpauth_avail' => 0,
- *     'proxyauth_avail' => 0,
- * )
- * ?>
- *
- */ + Performs an HTTP GET request on the supplied url. */ PHP_FUNCTION(http_get) { - char *URL, *data = NULL; - size_t data_len = 0; - int URL_len; zval *options = NULL, *info = NULL; + char *URL; + int URL_len; + http_request request; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) { RETURN_FALSE; @@ -733,26 +892,28 @@ PHP_FUNCTION(http_get) array_init(info); } - if (SUCCESS == http_get(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { - RETURN_STRINGL(data, data_len, 0); - } else { - RETURN_FALSE; + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_GET, URL); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); } + http_request_dtor(&request); } /* }}} */ /* {{{ 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. */ PHP_FUNCTION(http_head) { - char *URL, *data = NULL; - size_t data_len = 0; - int URL_len; zval *options = NULL, *info = NULL; + char *URL; + int URL_len; + http_request request; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) { RETURN_FALSE; @@ -763,26 +924,29 @@ PHP_FUNCTION(http_head) array_init(info); } - if (SUCCESS == http_head(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { - RETURN_STRINGL(data, data_len, 0); - } else { - RETURN_FALSE; + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_HEAD, URL); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); } + http_request_dtor(&request); } /* }}} */ -/* {{{ proto string http_post_data(string url, string data[, array options[, &info]]) - * - * Performs an HTTP POST request, posting data. - * Returns the HTTP response as string. - * See http_get() for a full list of available options. - */ +/* {{{ proto string http_post_data(string url, string data[, array options[, array &info]]) + Performs an HTTP POST request on the supplied url. */ PHP_FUNCTION(http_post_data) { - char *URL, *postdata, *data = NULL; - size_t data_len = 0; - int postdata_len, URL_len; zval *options = NULL, *info = NULL; + char *URL, *postdata; + int postdata_len, URL_len; + http_request_body body; + http_request request; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &postdata, &postdata_len, &options, &info) != SUCCESS) { RETURN_FALSE; @@ -793,28 +957,36 @@ PHP_FUNCTION(http_post_data) array_init(info); } - if (SUCCESS == http_post_data(URL, postdata, (size_t) postdata_len, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { - RETURN_STRINGL(data, data_len, 0); - } else { - RETURN_FALSE; + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_POST, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, postdata, postdata_len, 0); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); } + http_request_dtor(&request); } /* }}} */ -/* {{{ proto string http_post_array(string url, array data[, 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. - */ -PHP_FUNCTION(http_post_array) +/* {{{ proto string http_post_fields(string url, array data[, array files[, array options[, array &info]]]) + Performs an HTTP POST request on the supplied url. */ +PHP_FUNCTION(http_post_fields) { - char *URL, *data = NULL; - size_t data_len = 0; + zval *options = NULL, *info = NULL, *fields = NULL, *files = NULL; + char *URL; int URL_len; - zval *options = NULL, *info = NULL, *postdata; + http_request_body body; + http_request request; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|a/!z", &URL, &URL_len, &postdata, &options, &info) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa!|a!a/!z", &URL, &URL_len, &fields, &files, &options, &info) != SUCCESS) { + RETURN_FALSE; + } + + if (!http_request_body_fill(&body, fields ? Z_ARRVAL_P(fields) : NULL, files ? Z_ARRVAL_P(files) : NULL)) { RETURN_FALSE; } @@ -823,167 +995,392 @@ PHP_FUNCTION(http_post_array) array_init(info); } - if (SUCCESS == http_post_array(URL, Z_ARRVAL_P(postdata), HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) { - RETURN_STRINGL(data, data_len, 0); - } else { - RETURN_FALSE; + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_POST, URL); + request.body = &body; + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); } + http_request_dtor(&request); } /* }}} */ -#endif -/* }}} HAVE_CURL */ +/* {{{ proto string http_put_file(string url, string file[, array options[, array &info]]) + Performs an HTTP PUT request on the supplied url. */ +PHP_FUNCTION(http_put_file) +{ + char *URL, *file; + int URL_len, f_len; + zval *options = NULL, *info = NULL; + php_stream *stream; + php_stream_statbuf ssb; + http_request_body body; + http_request request; + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &file, &f_len, &options, &info)) { + RETURN_FALSE; + } -/* {{{ proto bool http_auth_basic(string user, string pass[, string realm = "Restricted"]) - * - * Example: - * 
- * Authorization failed!');
- * }
- * ?>
- *
- */ -PHP_FUNCTION(http_auth_basic) + if (!(stream = php_stream_open_wrapper_ex(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT))) { + RETURN_FALSE; + } + if (php_stream_stat(stream, &ssb)) { + php_stream_close(stream); + RETURN_FALSE; + } + + if (info) { + zval_dtor(info); + array_init(info); + } + + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_PUT, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); + } + http_request_dtor(&request); +} +/* }}} */ + +/* {{{ proto string http_put_stream(string url, resource stream[, array options[, array &info]]) + Performs an HTTP PUT request on the supplied url. */ +PHP_FUNCTION(http_put_stream) { - char *realm = NULL, *user, *pass, *suser, *spass; - int r_len, u_len, p_len; + zval *resource, *options = NULL, *info = NULL; + char *URL; + int URL_len; + php_stream *stream; + php_stream_statbuf ssb; + http_request_body body; + http_request request; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s", &user, &u_len, &pass, &p_len, &realm, &r_len) != SUCCESS) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sr|a/!z", &URL, &URL_len, &resource, &options, &info)) { RETURN_FALSE; } - if (!realm) { - realm = "Restricted"; + php_stream_from_zval(stream, &resource); + if (php_stream_stat(stream, &ssb)) { + RETURN_FALSE; } - if (SUCCESS != http_auth_credentials(&suser, &spass)) { - http_auth_header("Basic", realm); + if (info) { + zval_dtor(info); + array_init(info); + } + + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_PUT, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 0); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); + } + http_request_dtor(&request); +} +/* }}} */ + +/* {{{ proto string http_put_data(string url, string data[, array options[, array &info]]) + Performs an HTTP PUT request on the supplied url. */ +PHP_FUNCTION(http_put_data) +{ + char *URL, *data; + int URL_len, data_len; + zval *options = NULL, *info = NULL; + http_request_body body; + http_request request; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &data, &data_len, &options, &info)) { RETURN_FALSE; } + + if (info) { + zval_dtor(info); + array_init(info); + } + + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, HTTP_PUT, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, data, data_len, 0); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); + } + http_request_dtor(&request); +} +/* }}} */ + +/* {{{ proto string http_request(int method, string url[, string body[, array options[, array &info]]]) + Performs a custom HTTP request on the supplied url. */ +PHP_FUNCTION(http_request) +{ + long meth; + char *URL, *data = NULL; + int URL_len, data_len = 0; + zval *options = NULL, *info = NULL; + http_request_body body; + http_request request; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls|sa/!z", &meth, &URL, &URL_len, &data, &data_len, &options, &info)) { + RETURN_FALSE; + } + + if (info) { + zval_dtor(info); + array_init(info); + } + + RETVAL_FALSE; + + http_request_init_ex(&request, NULL, meth, URL); + request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, data, data_len, 0); + if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { + http_request_exec(&request); + if (info) { + http_request_info(&request, Z_ARRVAL_P(info)); + } + RETVAL_RESPONSE_OR_BODY(request); + } + http_request_dtor(&request); +} +/* }}} */ - if (strcasecmp(suser, user)) { - http_auth_header("Basic", realm); +/* {{{ proto string http_request_body_encode(array fields, array files) + Generate x-www-form-urlencoded resp. form-data encoded request body. */ +PHP_FUNCTION(http_request_body_encode) +{ + zval *fields = NULL, *files = NULL; + HashTable *fields_ht, *files_ht; + http_request_body body; + char *buf; + size_t len; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!", &fields, &files)) { RETURN_FALSE; } + + fields_ht = (fields && Z_TYPE_P(fields) == IS_ARRAY) ? Z_ARRVAL_P(fields) : NULL; + files_ht = (files && Z_TYPE_P(files) == IS_ARRAY) ? Z_ARRVAL_P(files) : NULL; + if (http_request_body_fill(&body, fields_ht, files_ht) && (SUCCESS == http_request_body_encode(&body, &buf, &len))) { + RETVAL_STRINGL(buf, len, 0); + } else { + http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not encode request body"); + RETVAL_FALSE; + } + http_request_body_dtor(&body); +} +#endif /* HTTP_HAVE_CURL */ +/* }}} HAVE_CURL */ - if (strcmp(spass, pass)) { - http_auth_header("Basic", realm); +/* {{{ proto int http_request_method_register(string method) + Register a custom request method. */ +PHP_FUNCTION(http_request_method_register) +{ + char *method; + int method_len; + ulong existing; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) { RETURN_FALSE; } + if ((existing = http_request_method_exists(1, 0, method))) { + RETURN_LONG((long) existing); + } - RETURN_TRUE; + RETVAL_LONG((long) http_request_method_register(method, method_len)); } /* }}} */ -/* {{{ 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) +/* {{{ proto bool http_request_method_unregister(mixed method) + Unregister a previously registered custom request method. */ +PHP_FUNCTION(http_request_method_unregister) { - zval *cb; - char *realm = NULL, *user, *pass; - int r_len; + zval *method; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &cb, &realm, &r_len) != SUCCESS) { + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) { RETURN_FALSE; } - if (!realm) { - realm = "Restricted"; + switch (Z_TYPE_P(method)) { + case IS_OBJECT: + convert_to_string(method); + case IS_STRING: + if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) { + convert_to_long(method); + } else { + int mn; + if (!(mn = http_request_method_exists(1, 0, Z_STRVAL_P(method)))) { + RETURN_FALSE; + } + zval_dtor(method); + ZVAL_LONG(method, (long)mn); + } + case IS_LONG: + RETURN_SUCCESS(http_request_method_unregister(Z_LVAL_P(method))); + default: + RETURN_FALSE; } +} +/* }}} */ - if (SUCCESS != http_auth_credentials(&user, &pass)) { - http_auth_header("Basic", realm); - RETURN_FALSE; - } - { - zval *zparams[2] = {NULL, NULL}, retval; - int result = 0; +/* {{{ proto int http_request_method_exists(mixed method) + Check if a request method is registered (or available by default). */ +PHP_FUNCTION(http_request_method_exists) +{ + if (return_value_used) { + zval *method; - MAKE_STD_ZVAL(zparams[0]); - MAKE_STD_ZVAL(zparams[1]); - ZVAL_STRING(zparams[0], user, 0); - ZVAL_STRING(zparams[1], pass, 0); + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) { + RETURN_FALSE; + } - if (SUCCESS == call_user_function(EG(function_table), NULL, cb, - &retval, 2, zparams TSRMLS_CC)) { - result = Z_LVAL(retval); + switch (Z_TYPE_P(method)) { + case IS_OBJECT: + convert_to_string(method); + case IS_STRING: + if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) { + convert_to_long(method); + } else { + RETURN_LONG((long) http_request_method_exists(1, 0, Z_STRVAL_P(method))); + } + case IS_LONG: + RETURN_LONG((long) http_request_method_exists(0, (int) Z_LVAL_P(method), NULL)); + default: + RETURN_FALSE; } + } +} +/* }}} */ - efree(user); - efree(pass); - efree(zparams[0]); - efree(zparams[1]); +/* {{{ proto string http_request_method_name(int method) + Get the literal string representation of a standard or registered request method. */ +PHP_FUNCTION(http_request_method_name) +{ + if (return_value_used) { + long method; - if (!result) { - http_auth_header("Basic", realm); + if ((SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &method)) || (method < 0)) { + RETURN_FALSE; } - RETURN_BOOL(result); + RETURN_STRING(estrdup(http_request_method_name((int) method)), 0); } } -/* }}}*/ +/* }}} */ -/* {{{ Sara Golemons http_build_query() */ -#ifndef ZEND_ENGINE_2 +/* {{{ */ +#ifdef HTTP_HAVE_ZLIB -/* {{{ proto string http_build_query(mixed formdata [, string prefix]) - Generates a form-encoded query string from an associative array or object. */ -PHP_FUNCTION(http_build_query) +/* {{{ proto string http_deflate(string data[, int flags = 0]) + Compress data with gzip, zlib AKA deflate or raw deflate encoding. */ +PHP_FUNCTION(http_deflate) { - zval *formdata; - char *prefix = NULL; - int prefix_len = 0; - smart_str formstr = {0}; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|s", &formdata, &prefix, &prefix_len) != SUCCESS) { - RETURN_FALSE; + char *data; + int data_len; + long flags = 0; + + RETVAL_NULL(); + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &flags)) { + char *encoded; + size_t encoded_len; + + if (SUCCESS == http_encoding_deflate(flags, data, data_len, &encoded, &encoded_len)) { + RETURN_STRINGL(encoded, (int) encoded_len, 0); + } } +} +/* }}} */ - if (Z_TYPE_P(formdata) != IS_ARRAY && Z_TYPE_P(formdata) != IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter 1 expected to be Array or Object. Incorrect value given."); - RETURN_FALSE; +/* {{{ proto string http_inflate(string data) + Decompress data compressed with either gzip, deflate AKA zlib or raw deflate encoding. */ +PHP_FUNCTION(http_inflate) +{ + char *data; + int data_len; + + RETVAL_NULL(); + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &data_len)) { + char *decoded; + size_t decoded_len; + + if (SUCCESS == http_encoding_inflate(data, data_len, &decoded, &decoded_len)) { + RETURN_STRINGL(decoded, (int) decoded_len, 0); + } } +} +/* }}} */ - if (php_url_encode_hash_ex(HASH_OF(formdata), &formstr, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL) TSRMLS_CC) == FAILURE) { - if (formstr.c) { - efree(formstr.c); - } +/* {{{ proto string ob_deflatehandler(string data, int mode) + For use with ob_start(). The deflate output buffer handler can only be used once. */ +PHP_FUNCTION(ob_deflatehandler) +{ + char *data; + int data_len; + long mode; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &data, &data_len, &mode)) { RETURN_FALSE; } - if (!formstr.c) { - RETURN_NULL(); + http_ob_deflatehandler(data, data_len, &Z_STRVAL_P(return_value), (uint *) &Z_STRLEN_P(return_value), mode); + Z_TYPE_P(return_value) = Z_STRVAL_P(return_value) ? IS_STRING : IS_NULL; +} +/* }}} */ + +/* {{{ proto string ob_inflatehandler(string data, int mode) + For use with ob_start(). Same restrictions as with ob_deflatehandler apply. */ +PHP_FUNCTION(ob_inflatehandler) +{ + char *data; + int data_len; + long mode; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &data, &data_len, &mode)) { + RETURN_FALSE; } + + http_ob_inflatehandler(data, data_len, &Z_STRVAL_P(return_value), (uint *) &Z_STRLEN_P(return_value), mode); + Z_TYPE_P(return_value) = Z_STRVAL_P(return_value) ? IS_STRING : IS_NULL; +} +/* }}} */ - smart_str_0(&formstr); +#endif /* HTTP_HAVE_ZLIB */ +/* }}} */ - RETURN_STRINGL(formstr.c, formstr.len, 0); +/* {{{ proto int http_support([int feature = 0]) + Check for feature that require external libraries. */ +PHP_FUNCTION(http_support) +{ + long feature = 0; + + RETVAL_LONG(0L); + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &feature)) { + RETVAL_LONG(http_support(feature)); + } } /* }}} */ -#endif /* !ZEND_ENGINE_2 */ -/* }}} */ /* * Local variables: @@ -993,3 +1390,4 @@ PHP_FUNCTION(http_build_query) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ +