X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=7cb3c4cdf8b6d06d880777c0cbd2679b490fbdcf;hp=452ec8f86a98fed4ea6e2e4e17c2a43fd6f69372;hb=a12e8ddfaa5a94e76261f165b0c0299c87b886b1;hpb=0f9c41f499873dbd4ab88469d838922554a49a99
diff --git a/http.c b/http.c
index 452ec8f..7cb3c4c 100644
--- a/http.c
+++ b/http.c
@@ -34,6 +34,8 @@
#include "php_http.h"
#include "php_http_api.h"
+#include "php_http_curl_api.h"
+#include "php_http_std_defs.h"
#ifdef ZEND_ENGINE_2
# include "ext/standard/php_http.h"
@@ -76,7 +78,6 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
ZEND_GET_MODULE(http)
#endif
-
/* {{{ http_functions[] */
function_entry http_functions[] = {
PHP_FE(http_date, NULL)
@@ -86,12 +87,12 @@ function_entry http_functions[] = {
PHP_FE(http_redirect, NULL)
PHP_FE(http_send_status, NULL)
PHP_FE(http_send_last_modified, NULL)
+ PHP_FE(http_send_content_type, NULL)
+ PHP_FE(http_send_content_disposition, NULL)
PHP_FE(http_match_modified, NULL)
PHP_FE(http_match_etag, NULL)
PHP_FE(http_cache_last_modified, NULL)
PHP_FE(http_cache_etag, NULL)
- PHP_FE(http_content_type, NULL)
- PHP_FE(http_content_disposition, NULL)
PHP_FE(http_send_data, NULL)
PHP_FE(http_send_file, NULL)
PHP_FE(http_send_stream, NULL)
@@ -115,974 +116,264 @@ function_entry http_functions[] = {
};
/* }}} */
-/* {{{ http_module_entry */
-zend_module_entry http_module_entry = {
-#if ZEND_MODULE_API_NO >= 20010901
- STANDARD_MODULE_HEADER,
-#endif
- "http",
- http_functions,
- PHP_MINIT(http),
- NULL,
- NULL,
- PHP_RSHUTDOWN(http),
- PHP_MINFO(http),
-#if ZEND_MODULE_API_NO >= 20010901
- PHP_EXT_HTTP_VERSION,
-#endif
- STANDARD_MODULE_PROPERTIES
-};
-/* }}} */
-
-#define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
-#define HASH_ORNULL(z) ((z) ? Z_ARRVAL_P(z) : NULL)
-/* {{{ 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"
- *
- */
-PHP_FUNCTION(http_date)
-{
- long t = -1;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &t) != SUCCESS) {
- RETURN_FALSE;
- }
-
- if (t == -1) {
- t = (long) time(NULL);
- }
-
- RETURN_STRING(http_date(t), 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:
- *
- *
- *
- *
- */
-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:
- *
- *
- *
- */
-PHP_FUNCTION(http_negotiate_charset)
-{
- 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 = "iso-8859-1";
- }
-
- RETURN_STRING(http_negotiate_charset(supported, def), 0);
-}
-/* }}} */
-
-/* {{{ proto bool http_send_status(int status)
- *
- * Send HTTP status code.
- *
- */
-PHP_FUNCTION(http_send_status)
-{
- int 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);
- RETURN_FALSE;
- }
-
- RETURN_SUCCESS(http_send_status(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.
- *
- */
-PHP_FUNCTION(http_send_last_modified)
-{
- long t = -1;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &t) != SUCCESS) {
- RETURN_FALSE;
- }
-
- if (t == -1) {
- t = (long) time(NULL);
- }
-
- RETURN_SUCCESS(http_send_last_modified(t));
-}
-/* }}} */
-
-/* {{{ proto bool http_match_modified([int timestamp])
- *
- * Matches the given timestamp against the clients "If-Modified-Since" resp.
- * "If-Unmodified-Since" HTTP headers.
- *
- */
-PHP_FUNCTION(http_match_modified)
-{
- long t = -1;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &t) != SUCCESS) {
- RETURN_FALSE;
- }
-
- // current time if not supplied (senseless though)
- if (t == -1) {
- t = (long) time(NULL);
- }
-
- RETURN_BOOL(http_modified_match("HTTP_IF_MODIFIED_SINCE", t) || http_modified_match("HTTP_IF_UNMODIFIED_SINCE", t));
-}
-/* }}} */
-
-/* {{{ proto bool http_match_etag(string etag)
- *
- * This matches the given ETag against the clients
- * "If-Match" resp. "If-None-Match" HTTP headers.
- *
- */
-PHP_FUNCTION(http_match_etag)
-{
- int etag_len;
- char *etag;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &etag, &etag_len) != SUCCESS) {
- RETURN_FALSE;
- }
-
- RETURN_BOOL(http_etag_match("HTTP_IF_NONE_MATCH", etag) || http_etag_match("HTTP_IF_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.
- *
- */
-PHP_FUNCTION(http_cache_last_modified)
-{
- long last_modified = 0, send_modified = 0, t;
- zval *zlm;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &last_modified) != SUCCESS) {
- RETURN_FALSE;
- }
+#ifdef ZEND_ENGINE_2
- t = (long) time(NULL);
-
- /* 0 or omitted */
- if (!last_modified) {
- /* does the client have? (att: caching "forever") */
- if (zlm = http_get_server_var("HTTP_IF_MODIFIED_SINCE")) {
- last_modified = send_modified = http_parse_date(Z_STRVAL_P(zlm));
- /* send current time */
- } else {
- send_modified = t;
- }
- /* negative value is supposed to be expiration time */
- } else if (last_modified < 0) {
- last_modified += t;
- send_modified = t;
- /* send supplied time explicitly */
- } else {
- send_modified = last_modified;
- }
+/* {{{ HTTPi */
+
+zend_class_entry *httpi_ce;
+
+#define HTTPi_ME(me, al, ai) ZEND_FENTRY(me, ZEND_FN(al), ai, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
+
+zend_function_entry httpi_class_methods[] = {
+ HTTPi_ME(date, http_date, NULL)
+ HTTPi_ME(absoluteURI, http_absolute_uri, NULL)
+ HTTPi_ME(negotiateLanguage, http_negotiate_language, NULL)
+ HTTPi_ME(negotiateCharset, http_negotiate_charset, NULL)
+ HTTPi_ME(redirect, http_redirect, NULL)
+ HTTPi_ME(sendStatus, http_send_status, NULL)
+ HTTPi_ME(sendLastModified, http_send_last_modified, NULL)
+ HTTPi_ME(sendContentType, http_send_content_type, NULL)
+ HTTPi_ME(sendContentDisposition, http_send_content_disposition, NULL)
+ HTTPi_ME(matchModified, http_match_modified, NULL)
+ HTTPi_ME(matchEtag, http_match_etag, NULL)
+ HTTPi_ME(cacheLastModified, http_cache_last_modified, NULL)
+ HTTPi_ME(cacheEtag, http_cache_etag, NULL)
+ HTTPi_ME(chunkedDecode, http_chunked_decode, NULL)
+ HTTPi_ME(splitResponse, http_split_response, NULL)
+ HTTPi_ME(parseHeaders, http_parse_headers, NULL)
+ HTTPi_ME(getRequestHeaders, http_get_request_headers, NULL)
+#ifdef HTTP_HAVE_CURL
+ HTTPi_ME(get, http_get, http_request_info_ref_3)
+ HTTPi_ME(head, http_head, http_request_info_ref_3)
+ HTTPi_ME(postData, http_post_data, http_request_info_ref_4)
+ HTTPi_ME(postArray, http_post_array, http_request_info_ref_4)
+#endif
+ HTTPi_ME(authBasic, http_auth_basic, NULL)
+ HTTPi_ME(authBasicCallback, http_auth_basic_cb, NULL)
+ {NULL, NULL, NULL}
+};
+/* }}} HTTPi */
- http_send_header("Cache-Control: private, must-revalidate, max-age=0");
+/* {{{ HTTPi_Response */
- if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) {
- if (SUCCESS == http_send_status(304)) {
- zend_bailout();
- } else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
- RETURN_FALSE;
- }
- }
- RETURN_SUCCESS(http_send_last_modified(send_modified));
-}
-/* }}} */
+zend_class_entry *httpi_response_ce;
+static zend_object_handlers httpi_response_object_handlers;
-/* {{{ 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.
- *
- */
-PHP_FUNCTION(http_cache_etag)
+#define httpi_response_declare_default_properties(ce) _httpi_response_declare_default_properties(ce TSRMLS_CC)
+static inline void _httpi_response_declare_default_properties(zend_class_entry *ce TSRMLS_DC)
{
- char *etag;
- int etag_len = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &etag, &etag_len) != SUCCESS) {
- RETURN_FALSE;
- }
+ DCL_PROP(PROTECTED, string, contentType, "application/x-octetstream");
+ DCL_PROP(PROTECTED, string, eTag, "");
+ DCL_PROP(PROTECTED, string, dispoFile, "");
+ DCL_PROP(PROTECTED, string, cacheControl, "public");
+ DCL_PROP(PROTECTED, string, data, "");
+ DCL_PROP(PROTECTED, string, file, "");
+ DCL_PROP(PROTECTED, long, stream, 0);
+ DCL_PROP(PROTECTED, long, lastModified, 0);
+ DCL_PROP(PROTECTED, long, dispoInline, 0);
+ DCL_PROP(PROTECTED, long, cache, 0);
+ DCL_PROP(PROTECTED, long, gzip, 0);
- http_send_header("Cache-Control: private, must-revalidate, max-age=0");
-
- if (etag_len) {
- http_send_etag(etag, etag_len);
- if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
- if (SUCCESS == http_send_status(304)) {
- zend_bailout();
- } else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
- RETURN_FALSE;
- }
- }
- }
-
- /* if no etag is given and we didn't already start ob_etaghandler -- start it */
- if (!HTTP_G(etag_started)) {
- RETURN_BOOL(HTTP_G(etag_started) = (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1)));
- }
- RETURN_TRUE;
+ DCL_PROP(PRIVATE, long, raw_cache_header, 0);
+ DCL_PROP(PRIVATE, long, send_mode, -1);
}
-/* }}} */
-/* {{{ 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)
+#define httpi_response_destroy_object _httpi_response_destroy_object
+void _httpi_response_destroy_object(void *object, zend_object_handle handle TSRMLS_DC)
{
- 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 (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: private, must-revalidate, max-age=0");
- HTTP_G(etag_started) = 1;
+ httpi_response_object *o = object;
+ if (OBJ_PROP(o)) {
+ zend_hash_destroy(OBJ_PROP(o));
+ FREE_HASHTABLE(OBJ_PROP(o));
}
-
- 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);
- }
-
- Z_TYPE_P(return_value) = IS_STRING;
- http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), &Z_STRLEN_P(return_value), mode);
+ efree(o);
}
-/* }}} */
-/* {{{ 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.
- */
-PHP_FUNCTION(http_redirect)
+#define httpi_response_new_object _httpi_response_new_object
+zend_object_value _httpi_response_new_object(zend_class_entry *ce TSRMLS_DC)
{
- int url_len;
- zend_bool session = 0, permanent = 0;
- zval *params = NULL;
- smart_str qstr = {0};
- char *url, *URI, LOC[HTTP_URI_MAXLEN + 9], RED[HTTP_URI_MAXLEN * 2 + 34];
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!/bb", &url, &url_len, ¶ms, &session, &permanent) != SUCCESS) {
- RETURN_FALSE;
- }
+ zend_object_value ov;
+ httpi_response_object *o;
- /* append session info */
- if (session && (PS(session_status) == php_session_active)) {
- if (!params) {
- 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");
- }
- }
+ o = ecalloc(1, sizeof(httpi_response_object));
+ o->zo.ce = ce;
- /* treat params array with http_build_query() */
- if (params) {
- if (php_url_encode_hash_ex(Z_ARRVAL_P(params), &qstr, NULL,0,NULL,0,NULL,0,NULL TSRMLS_CC) != SUCCESS) {
- if (qstr.c) {
- efree(qstr.c);
- }
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not encode query parameters");
- RETURN_FALSE;
- }
- smart_str_0(&qstr);
- }
+ ALLOC_HASHTABLE(OBJ_PROP(o));
+ zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- URI = http_absolute_uri(url, NULL);
- if (qstr.c) {
- snprintf(LOC, HTTP_URI_MAXLEN + strlen("Location: "), "Location: %s?%s", URI, qstr.c);
- sprintf(RED, "Redirecting to %s?%s.\n", URI, qstr.c, URI, qstr.c);
- efree(qstr.c);
- } else {
- snprintf(LOC, HTTP_URI_MAXLEN + strlen("Location: "), "Location: %s", URI);
- sprintf(RED, "Redirecting to %s.\n", URI, URI);
- }
- efree(URI);
+ ov.handle = zend_objects_store_put(o, httpi_response_destroy_object, NULL, NULL TSRMLS_CC);
+ ov.handlers = &httpi_response_object_handlers;
- if ((SUCCESS == http_send_header(LOC)) && (SUCCESS == http_send_status((permanent ? 301 : 302)))) {
- php_body_write(RED, strlen(RED) TSRMLS_CC);
- RETURN_TRUE;
- }
- RETURN_FALSE;
+ return ov;
}
-/* }}} */
-
-/* {{{ proto bool http_send_data(string data)
- *
- * Sends raw data with support for (multiple) range requests.
- *
- */
-PHP_FUNCTION(http_send_data)
-{
- zval *zdata;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zdata) != SUCCESS) {
- RETURN_FALSE;
- }
-
- convert_to_string_ex(&zdata);
- http_send_header("Accept-Ranges: bytes");
- RETURN_SUCCESS(http_send_data(zdata));
-}
-/* }}} */
+zend_function_entry httpi_response_class_methods[] = {
+ PHP_ME(HTTPi_Response, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+/* PHP_ME(HTTPi_Response, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
+*/
+ PHP_ME(HTTPi_Response, setETag, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Response, getETag, NULL, ZEND_ACC_PUBLIC)
-/* {{{ proto bool http_send_file(string file)
- *
- * Sends a file with support for (multiple) range requests.
- *
- */
-PHP_FUNCTION(http_send_file)
-{
- zval *zfile;
+ PHP_ME(HTTPi_Response, setContentDisposition, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Response, getContentDisposition, NULL, ZEND_ACC_PUBLIC)
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zfile) != SUCCESS) {
- RETURN_FALSE;
- }
+ PHP_ME(HTTPi_Response, setContentType, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Response, getContentType, NULL, ZEND_ACC_PUBLIC)
- convert_to_string_ex(&zfile);
- http_send_header("Accept-Ranges: bytes");
- RETURN_SUCCESS(http_send_file(zfile));
-}
-/* }}} */
+ PHP_ME(HTTPi_Response, setCache, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Response, getCache, NULL, ZEND_ACC_PUBLIC)
-/* {{{ proto bool http_send_stream(resource stream)
- *
- * Sends an already opened stream with support for (multiple) range requests.
- *
- */
-PHP_FUNCTION(http_send_stream)
-{
- zval *zstream;
- php_stream *file;
+ PHP_ME(HTTPi_Response, setCacheControl, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Response, getCacheControl, NULL, ZEND_ACC_PUBLIC)
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) != SUCCESS) {
- RETURN_FALSE;
- }
+ PHP_ME(HTTPi_Response, setGzip, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Response, getGzip, NULL, ZEND_ACC_PUBLIC)
- php_stream_from_zval(file, &zstream);
- http_send_header("Accept-Ranges: bytes");
- RETURN_SUCCESS(http_send_stream(file));
-}
-/* }}} */
+ PHP_ME(HTTPi_Response, setData, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Response, getData, NULL, ZEND_ACC_PUBLIC)
-/* {{{ proto bool http_content_type([string content_type = 'application/x-octetstream'])
- *
- * Sets the content type.
- *
- */
-PHP_FUNCTION(http_content_type)
-{
- char *ct, *content_type;
- int ct_len = 0;
+ PHP_ME(HTTPi_Response, setFile, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Response, getFile, NULL, ZEND_ACC_PUBLIC)
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ct, &ct_len) != SUCCESS) {
- RETURN_FALSE;
- }
+ PHP_ME(HTTPi_Response, setStream, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Response, getStream, NULL, ZEND_ACC_PUBLIC)
- if (!ct_len) {
- RETURN_SUCCESS(http_send_header("Content-Type: application/x-octetstream"));
- }
+ PHP_ME(HTTPi_Response, send, NULL, ZEND_ACC_PUBLIC)
- /* remember for multiple ranges */
- if (HTTP_G(ctype)) {
- efree(HTTP_G(ctype));
- }
- HTTP_G(ctype) = estrndup(ct, ct_len);
-
- content_type = (char *) emalloc(strlen("Content-Type: ") + ct_len + 1);
- sprintf(content_type, "Content-Type: %s", ct);
-
- RETVAL_BOOL(SUCCESS == http_send_header(content_type));
- efree(content_type);
-}
+ {NULL, NULL, NULL}
+};
/* }}} */
-/* {{{ proto bool http_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).
- *
- */
-PHP_FUNCTION(http_content_disposition)
-{
- char *filename, *header;
- int f_len;
- zend_bool send_inline = 0;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &filename, &f_len, &send_inline) != SUCCESS) {
- RETURN_FALSE;
- }
-
- if (send_inline) {
- header = (char *) emalloc(strlen("Content-Disposition: inline; filename=\"\"") + f_len + 1);
- sprintf(header, "Content-Disposition: inline; filename=\"%s\"", filename);
- } else {
- header = (char *) emalloc(strlen("Content-Disposition: attachment; filename=\"\"") + f_len + 1);
- sprintf(header, "Content-Disposition: attachment; filename=\"%s\"", filename);
- }
+/* {{{ HTTPi_Request */
+#ifdef HTTP_HAVE_CURL
- RETVAL_BOOL(SUCCESS == http_send_header(header));
- efree(header);
-}
-/* }}} */
+zend_class_entry *httpi_request_ce;
+static zend_object_handlers httpi_request_object_handlers;
-/* {{{ proto string http_chunked_decode(string encoded)
- *
- * This function decodes a string that was HTTP-chunked encoded.
- * Returns false on failure.
- */
-PHP_FUNCTION(http_chunked_decode)
+#define httpi_request_declare_default_properties(ce) _httpi_request_declare_default_properties(ce TSRMLS_CC)
+static inline void _httpi_request_declare_default_properties(zend_class_entry *ce TSRMLS_DC)
{
- char *encoded = NULL, *decoded = NULL;
- int encoded_len = 0, decoded_len = 0;
+ DCL_PROP_N(PROTECTED, options);
+ DCL_PROP_N(PROTECTED, responseInfo);
+ DCL_PROP_N(PROTECTED, responseData);
+ DCL_PROP_N(PROTECTED, postData);
+ DCL_PROP_N(PROTECTED, postFiles);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &encoded, &encoded_len) != SUCCESS) {
- RETURN_FALSE;
- }
+ DCL_PROP(PROTECTED, long, method, HTTP_GET);
- if (SUCCESS == http_chunked_decode(encoded, encoded_len, &decoded, &decoded_len)) {
- RETURN_STRINGL(decoded, decoded_len, 0);
- } else {
- RETURN_FALSE;
- }
+ DCL_PROP(PROTECTED, string, url, "");
+ DCL_PROP(PROTECTED, string, contentType, "");
+ DCL_PROP(PROTECTED, string, queryData, "");
+ DCL_PROP(PROTECTED, string, postData, "");
}
-/* }}} */
-/* {{{ 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',
- * 'Content-Language' => 'en-US'
- * ),
- * 1 => "Hello World!"
- * );
- * ?>
- *
- */
-PHP_FUNCTION(http_split_response)
+#define httpi_request_free_object _httpi_request_free_object
+void _httpi_request_free_object(zend_object /* void */ *object TSRMLS_DC)
{
- zval *zresponse, *zbody, *zheaders;
+ httpi_request_object *o = (httpi_request_object *) object;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zresponse) != SUCCESS) {
- RETURN_FALSE;
+ if (OBJ_PROP(o)) {
+ zend_hash_destroy(OBJ_PROP(o));
+ FREE_HASHTABLE(OBJ_PROP(o));
}
-
- convert_to_string_ex(&zresponse);
-
- MAKE_STD_ZVAL(zbody);
- MAKE_STD_ZVAL(zheaders);
- array_init(zheaders);
-
- if (SUCCESS != http_split_response(zresponse, zheaders, zbody)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP response");
- RETURN_FALSE;
+ if (o->ch) {
+ curl_easy_cleanup(o->ch);
+ o->ch = NULL;
}
-
- array_init(return_value);
- add_index_zval(return_value, 0, zheaders);
- add_index_zval(return_value, 1, zbody);
+ efree(o);
}
-/* }}} */
-/* {{{ proto array http_parse_headers(string header)
- *
- */
-PHP_FUNCTION(http_parse_headers)
+#define httpi_request_new_object _httpi_request_new_object
+zend_object_value _httpi_request_new_object(zend_class_entry *ce TSRMLS_DC)
{
- char *header, *rnrn;
- int header_len;
+ zend_object_value ov;
+ httpi_request_object *o;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header, &header_len)) {
- RETURN_FALSE;
- }
+ o = ecalloc(1, sizeof(httpi_request_object));
+ o->zo.ce = ce;
+ o->ch = curl_easy_init();
- array_init(return_value);
+ ALLOC_HASHTABLE(OBJ_PROP(o));
+ zend_hash_init(OBJ_PROP(o), 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
- if (rnrn = strstr(header, HTTP_CRLF HTTP_CRLF)) {
- header_len = rnrn - header + 2;
- }
- if (SUCCESS != http_parse_headers(header, header_len, return_value)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP header");
- zval_dtor(return_value);
- RETURN_FALSE;
- }
-}
-/* }}}*/
+ ov.handle = zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, httpi_request_free_object, NULL TSRMLS_CC);
+ ov.handlers = &httpi_request_object_handlers;
-/* {{{ proto array http_get_request_headers(void)
- *
- */
-PHP_FUNCTION(http_get_request_headers)
-{
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
- }
-
- array_init(return_value);
- http_get_request_headers(return_value);
+ return ov;
}
-/* }}} */
-
-/* {{{ HAVE_CURL */
-#ifdef HTTP_HAVE_CURL
-/* {{{ 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,
- * )
- * ?>
- *
- */
-PHP_FUNCTION(http_get)
-{
- char *URL, *data = NULL;
- size_t data_len = 0;
- int URL_len;
- zval *options = NULL, *info = NULL;
+zend_function_entry httpi_request_class_methods[] = {
+ PHP_ME(HTTPi_Request, __construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+ PHP_ME(HTTPi_Request, __destruct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR)
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) {
- RETURN_FALSE;
- }
+ PHP_ME(HTTPi_Request, setOptions, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, getOptions, NULL, ZEND_ACC_PUBLIC)
- if (info) {
- zval_dtor(info);
- array_init(info);
- }
+ PHP_ME(HTTPi_Request, setMethod, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, getMethod, NULL, ZEND_ACC_PUBLIC)
- if (SUCCESS == http_get(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
- RETURN_STRINGL(data, data_len, 0);
- } else {
- RETURN_FALSE;
- }
-}
-/* }}} */
+ PHP_ME(HTTPi_Request, setURL, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, getURL, NULL, ZEND_ACC_PUBLIC)
-/* {{{ 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.
- */
-PHP_FUNCTION(http_head)
-{
- char *URL, *data = NULL;
- size_t data_len = 0;
- int URL_len;
- zval *options = NULL, *info = NULL;
+ PHP_ME(HTTPi_Request, setContentType, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, getContentType, NULL, ZEND_ACC_PUBLIC)
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) {
- RETURN_FALSE;
- }
+ PHP_ME(HTTPi_Request, setQueryData, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, getQueryData, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, addQueryData, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, unsetQueryData, NULL, ZEND_ACC_PUBLIC)
- if (info) {
- zval_dtor(info);
- array_init(info);
- }
+ PHP_ME(HTTPi_Request, setPostData, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, getPostData, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, addPostData, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, unsetPostData, NULL, ZEND_ACC_PUBLIC)
- if (SUCCESS == http_head(URL, HASH_ORNULL(options), HASH_ORNULL(info), &data, &data_len)) {
- RETURN_STRINGL(data, data_len, 0);
- } else {
- RETURN_FALSE;
- }
-}
-/* }}} */
+ PHP_ME(HTTPi_Request, addPostFile, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, getPostFiles, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, unsetPostFiles, NULL, ZEND_ACC_PUBLIC)
-/* {{{ 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.
- */
-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;
+ PHP_ME(HTTPi_Request, send, NULL, ZEND_ACC_PUBLIC)
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &postdata, &postdata_len, &options, &info) != SUCCESS) {
- RETURN_FALSE;
- }
+ PHP_ME(HTTPi_Request, getResponseData, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, getResponseHeaders, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, getResponseBody, NULL, ZEND_ACC_PUBLIC)
+ PHP_ME(HTTPi_Request, getResponseInfo, NULL, ZEND_ACC_PUBLIC)
- if (info) {
- zval_dtor(info);
- array_init(info);
- }
+ {NULL, NULL, NULL}
+};
- 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;
- }
-}
+#endif /* HTTP_HAVE_CURL */
/* }}} */
-/* {{{ 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)
-{
- char *URL, *data = NULL;
- size_t data_len = 0;
- int URL_len;
- zval *options = NULL, *info = NULL, *postdata;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa|a/!z", &URL, &URL_len, &postdata, &options, &info) != SUCCESS) {
- RETURN_FALSE;
- }
-
- if (info) {
- zval_dtor(info);
- 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;
- }
-}
-/* }}} */
+#endif /* ZEND_ENGINE_2 */
+/* {{{ http_module_entry */
+zend_module_entry http_module_entry = {
+#if ZEND_MODULE_API_NO >= 20010901
+ STANDARD_MODULE_HEADER,
#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_credentials(&suser, &spass)) {
- http_auth_header("Basic", realm);
- RETURN_FALSE;
- }
-
- if (strcasecmp(suser, user)) {
- http_auth_header("Basic", realm);
- RETURN_FALSE;
- }
-
- if (strcmp(spass, pass)) {
- http_auth_header("Basic", realm);
- RETURN_FALSE;
- }
-
- RETURN_TRUE;
-}
+ "http",
+ http_functions,
+ PHP_MINIT(http),
+ PHP_MSHUTDOWN(http),
+ PHP_RINIT(http),
+ PHP_RSHUTDOWN(http),
+ PHP_MINFO(http),
+#if ZEND_MODULE_API_NO >= 20010901
+ PHP_EXT_HTTP_VERSION,
+#endif
+ STANDARD_MODULE_PROPERTIES
+};
/* }}} */
-/* {{{ 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_credentials(&user, &pass)) {
- http_auth_header("Basic", 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_header("Basic", realm);
- }
-
- RETURN_BOOL(result);
- }
+static void free_to_free(void *s)
+{
+ efree(*(char **)s);
}
-/* }}}*/
-
/* {{{ php_http_init_globals(zend_http_globals *) */
static void php_http_init_globals(zend_http_globals *http_globals)
@@ -1092,12 +383,11 @@ static void php_http_init_globals(zend_http_globals *http_globals)
http_globals->etag = NULL;
http_globals->lmod = 0;
#ifdef HTTP_HAVE_CURL
- http_globals->curlbuf.body.data = NULL;
- http_globals->curlbuf.body.used = 0;
- http_globals->curlbuf.body.free = 0;
- http_globals->curlbuf.hdrs.data = NULL;
- http_globals->curlbuf.hdrs.used = 0;
- http_globals->curlbuf.hdrs.free = 0;
+ http_globals->curlbuf.data = NULL;
+ http_globals->curlbuf.used = 0;
+ http_globals->curlbuf.free = 0;
+ http_globals->curlbuf.size = 0;
+ zend_llist_init(&http_globals->to_free, sizeof(char *), free_to_free, 0);
#endif
http_globals->allowed_methods = NULL;
}
@@ -1135,11 +425,23 @@ PHP_MINIT_FUNCTION(http)
{
ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL);
REGISTER_INI_ENTRIES();
-#ifdef HTTP_HAVE_CURL
+
+#if defined(HTTP_HAVE_CURL) && (LIBCURL_VERSION_NUM >= 0x070a05)
REGISTER_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM, CONST_CS | CONST_PERSISTENT);
#endif
+
+#ifdef ZEND_ENGINE_2
+ HTTP_REGISTER_CLASS(HTTPi, httpi, NULL, ZEND_ACC_FINAL_CLASS);
+ HTTP_REGISTER_CLASS_EX(HTTPi_Response, httpi_response, NULL, 0);
+# ifdef HTTP_HAVE_CURL
+ HTTP_REGISTER_CLASS_EX(HTTPi_Request, httpi_request, NULL, 0);
+ REGISTER_LONG_CONSTANT("HTTP_GET", HTTP_GET, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("HTTP_HEAD", HTTP_HEAD, CONST_CS | CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT("HTTP_POST", HTTP_POST, CONST_CS | CONST_PERSISTENT);
+# endif /* HTTP_HAVE_CURL */
+#endif /* ZEND_ENGINE_2 */
return SUCCESS;
}
/* }}} */
@@ -1176,16 +478,16 @@ PHP_RSHUTDOWN_FUNCTION(http)
efree(HTTP_G(ctype));
HTTP_G(ctype) = NULL;
}
+
#ifdef HTTP_HAVE_CURL
- if (HTTP_G(curlbuf).body.data) {
- efree(HTTP_G(curlbuf).body.data);
- HTTP_G(curlbuf).body.data = NULL;
- }
- if (HTTP_G(curlbuf).hdrs.data) {
- efree(HTTP_G(curlbuf).hdrs.data);
- HTTP_G(curlbuf).hdrs.data = NULL;
+ if (HTTP_G(curlbuf).data) {
+ efree(HTTP_G(curlbuf).data);
+ HTTP_G(curlbuf).data = NULL;
+ HTTP_G(curlbuf).used = 0;
+ HTTP_G(curlbuf).free = 0;
}
#endif
+
return SUCCESS;
}
/* }}} */