X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=f6ea5ebffc3821042d8d6bb6af003f435eb3e128;hp=e81deffd554b40bfeeb90e4650df77c283997858;hb=0119515f91847a945a149a1bd335f41dc759bfeb;hpb=7dedd1935ab8400dfbd49fe63c83b74b0d0b68e6 diff --git a/http.c b/http.c index e81deff..f6ea5eb 100644 --- a/http.c +++ b/http.c @@ -15,62 +15,1166 @@ /* $Id$ */ +#define _WINSOCKAPI_ +#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS + #ifdef HAVE_CONFIG_H -#include "config.h" +# include "config.h" +#endif + +#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 "SAPI.h" + +#include "php_http.h" +#include "php_http_api.h" + +#ifdef ZEND_ENGINE_2 +# include "ext/standard/php_http.h" +#endif + +#ifdef HTTP_HAVE_CURL + +# ifdef PHP_WIN32 +# include +# include +# endif + +# include + +/* {{{ ARG_INFO */ +# ifdef ZEND_BEGIN_ARG_INFO +ZEND_BEGIN_ARG_INFO(http_request_info_ref_3, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) +ZEND_END_ARG_INFO(); + +ZEND_BEGIN_ARG_INFO(http_request_info_ref_4, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) +ZEND_END_ARG_INFO(); +# else +static unsigned char http_request_info_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; +static unsigned char http_request_info_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; +# endif +/* }}} ARG_INFO */ + +#endif /* HTTP_HAVE_CURL */ + +ZEND_DECLARE_MODULE_GLOBALS(http) + +#ifdef COMPILE_DL_HTTP +ZEND_GET_MODULE(http) #endif -#include "php.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" +/* {{{ http_functions[] */ +function_entry http_functions[] = { + PHP_FE(http_date, NULL) + PHP_FE(http_absolute_uri, NULL) + PHP_FE(http_negotiate_language, NULL) + PHP_FE(http_negotiate_charset, NULL) + 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_send_data, NULL) + PHP_FE(http_send_file, NULL) + PHP_FE(http_send_stream, NULL) + PHP_FE(http_chunked_decode, NULL) + PHP_FE(http_split_response, NULL) + PHP_FE(http_parse_headers, NULL) + PHP_FE(http_get_request_headers, NULL) +#ifdef HTTP_HAVE_CURL + PHP_FE(http_get, http_request_info_ref_3) + PHP_FE(http_head, http_request_info_ref_3) + PHP_FE(http_post_data, http_request_info_ref_4) + PHP_FE(http_post_array, http_request_info_ref_4) +#endif + PHP_FE(http_auth_basic, NULL) + PHP_FE(http_auth_basic_cb, NULL) +#ifndef ZEND_ENGINE_2 + PHP_FE(http_build_query, NULL) +#endif + PHP_FE(ob_httpetaghandler, NULL) + {NULL, NULL, NULL} +}; +/* }}} */ + +#define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v)) +#define HASH_ORNULL(z) ((z) ? Z_ARRVAL_P(z) : NULL) +#define NO_ARGS if (ZEND_NUM_ARGS()) WRONG_PARAM_COUNT +#define HTTP_URL_ARGSEP_OVERRIDE zend_alter_ini_entry("arg_separator.output", sizeof("arg_separator.output") - 1, "&", 1, ZEND_INI_ALL, ZEND_INI_STAGE_RUNTIME) +#define HTTP_URL_ARGSEP_RESTORE zend_restore_ini_entry("arg_separator.output", sizeof("arg_separator.output") - 1, ZEND_INI_STAGE_RUNTIME) + +#ifdef ZEND_ENGINE_2 + +# define HTTP_REGISTER_CLASS_EX(classname, name, parent, flags) \ + { \ + zend_class_entry ce; \ + INIT_CLASS_ENTRY(ce, #classname, name## _class_methods); \ + ce.create_object = name## _new_object; \ + name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \ + name## _ce->ce_flags |= flags; \ + memcpy(& name## _object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \ + name## _object_handlers.clone_obj = NULL; \ + name## _declare_default_properties(name## _ce); \ + } + +# define HTTP_REGISTER_CLASS(classname, name, parent, flags) \ + { \ + zend_class_entry ce; \ + INIT_CLASS_ENTRY(ce, #classname, name## _class_methods); \ + ce.create_object = NULL; \ + name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \ + name## _ce->ce_flags |= flags; \ + } + +# define getObject(t, o) t * o = ((t *) zend_object_store_get_object(getThis() TSRMLS_CC)) +# define OBJ_PROP(o) o->zo.properties +# define DCL_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC) +# define DCL_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC) +# define DCL_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n), (ZEND_ACC_ ##a) TSRMLS_CC) +# define UPD_PROP(o, t, n, v) zend_update_property_ ##t(o->zo.ce, getThis(), (#n), sizeof(#n), (v) TSRMLS_CC) +# define SET_PROP(o, n, z) zend_update_property(o->zo.ce, getThis(), (#n), sizeof(#n), (z) TSRMLS_CC) +# define GET_PROP(o, n) zend_read_property(o->zo.ce, getThis(), (#n), sizeof(#n), 0 TSRMLS_CC) + +/* {{{ 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 */ + +/* {{{ HTTPi_Response */ + +zend_class_entry *httpi_response_ce; +static zend_object_handlers httpi_response_object_handlers; + +typedef struct { + zend_object zo; +} httpi_response_object; + +#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) +{ + 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); + + DCL_PROP(PRIVATE, long, raw_cache_header, 0); + DCL_PROP(PRIVATE, long, send_mode, -1); +} + +#define httpi_response_destroy_object _httpi_response_destroy_object +void _httpi_response_destroy_object(void *object, zend_object_handle handle TSRMLS_DC) +{ + httpi_response_object *o = object; + if (OBJ_PROP(o)) { + zend_hash_destroy(OBJ_PROP(o)); + FREE_HASHTABLE(OBJ_PROP(o)); + } + efree(o); +} + +#define httpi_response_new_object _httpi_response_new_object +zend_object_value _httpi_response_new_object(zend_class_entry *ce TSRMLS_DC) +{ + zend_object_value ov; + httpi_response_object *o; + + o = ecalloc(sizeof(httpi_response_object), 1); + o->zo.ce = ce; + + 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 *)); + + ov.handle = zend_objects_store_put(o, httpi_response_destroy_object, NULL, NULL TSRMLS_CC); + ov.handlers = &httpi_response_object_handlers; + + return ov; +} + +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) + + PHP_ME(HTTPi_Response, setContentDisposition, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Response, getContentDisposition, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HTTPi_Response, setContentType, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Response, getContentType, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HTTPi_Response, setCache, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Response, getCache, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HTTPi_Response, setCacheControl, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Response, getCacheControl, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HTTPi_Response, setGzip, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Response, getGzip, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HTTPi_Response, setData, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Response, getData, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HTTPi_Response, setFile, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Response, getFile, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HTTPi_Response, setStream, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Response, getStream, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HTTPi_Response, send, NULL, ZEND_ACC_PUBLIC) + + {NULL, NULL, NULL} +}; + +/* {{{ proto void HTTPi_Response::__construct(bool cache, bool gzip) + * + */ +PHP_METHOD(HTTPi_Response, __construct) +{ + zend_bool do_cache = 0, do_gzip = 0; + getObject(httpi_response_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bb", &do_cache, &do_gzip)) { + // throw exception + return; + } + + UPD_PROP(obj, long, cache, do_cache); + UPD_PROP(obj, long, gzip, do_gzip); +} +/* }}} */ + +/* {{{ proto bool HTTPi_Response::setCache(bool cache) + * + */ +PHP_METHOD(HTTPi_Response, setCache) +{ + zend_bool do_cache = 0; + getObject(httpi_response_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &do_cache)) { + RETURN_FALSE; + } + + UPD_PROP(obj, long, cache, do_cache); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto bool HTTPi_Response::getCache() + * + */ +PHP_METHOD(HTTPi_Response, getCache) +{ + zval *do_cache = NULL; + getObject(httpi_response_object, obj); + + NO_ARGS; + + do_cache = GET_PROP(obj, cache); + RETURN_BOOL(Z_LVAL_P(do_cache)); +} +/* }}}*/ + +/* {{{ proto bool HTTPi_Response::setGzip(bool gzip) + * + */ +PHP_METHOD(HTTPi_Response, setGzip) +{ + zend_bool do_gzip = 0; + getObject(httpi_response_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &do_gzip)) { + RETURN_FALSE; + } + + UPD_PROP(obj, long, gzip, do_gzip); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto bool HTTPi_Response::getGzip() + * + */ +PHP_METHOD(HTTPi_Response, getGzip) +{ + zval *do_gzip = NULL; + getObject(httpi_response_object, obj); + + NO_ARGS; + + do_gzip = GET_PROP(obj, gzip); + RETURN_BOOL(Z_LVAL_P(do_gzip)); +} +/* }}} */ + +/* {{{ proto bool HTTPi_Response::setCacheControl(string control[, bool raw = false]) + * + */ +PHP_METHOD(HTTPi_Response, setCacheControl) +{ + char *ccontrol; + int cc_len; + zend_bool raw = 0; + getObject(httpi_response_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &ccontrol, &cc_len, &raw)) { + RETURN_FALSE; + } + + if ((!raw) && (strcmp(ccontrol, "public") && strcmp(ccontrol, "private") && strcmp(ccontrol, "no-cache"))) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol); + RETURN_FALSE; + } + + UPD_PROP(obj, long, raw_cache_header, raw); + UPD_PROP(obj, string, cacheControl, ccontrol); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto string HTTPi_Response::getCacheControl() + * + */ +PHP_METHOD(HTTPi_Response, getCacheControl) +{ + zval *ccontrol; + getObject(httpi_response_object, obj); + + NO_ARGS; + + ccontrol = GET_PROP(obj, cacheControl); + RETURN_STRINGL(Z_STRVAL_P(ccontrol), Z_STRLEN_P(ccontrol), 1); +} +/* }}} */ + +/* {{{ proto bool HTTPi::setContentType(string content_type) + * + */ +PHP_METHOD(HTTPi_Response, setContentType) +{ + char *ctype; + int ctype_len; + getObject(httpi_response_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ctype_len)) { + RETURN_FALSE; + } + + if (!strchr(ctype, '/')) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Content type '%s' doesn't seem to contain a primary and a secondary part", ctype); + RETURN_FALSE; + } + + UPD_PROP(obj, string, contentType, ctype); + + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto string HTTPi_Response::getContentType() + * + */ +PHP_METHOD(HTTPi_Response, getContentType) +{ + zval *ctype; + getObject(httpi_response_object, obj); + + NO_ARGS; + + ctype = GET_PROP(obj, contentType); + RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); +} +/* }}} */ + +/* {{{ proto bool HTTPi_Response::setContentDisposition(string filename[, bool inline = false]) + * + */ +PHP_METHOD(HTTPi_Response, setContentDisposition) +{ + char *file; + int file_len; + zend_bool is_inline = 0; + getObject(httpi_response_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &file, &file_len, &is_inline)) { + RETURN_FALSE; + } + + UPD_PROP(obj, string, dispoFile, file); + UPD_PROP(obj, long, dispoInline, is_inline); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto array HTTPi_Response::getContentDisposition() + * + */ +PHP_METHOD(HTTPi_Response, getContentDisposition) +{ + zval *file; + zval *is_inline; + getObject(httpi_response_object, obj); + + if (ZEND_NUM_ARGS()) { + WRONG_PARAM_COUNT; + } + + file = GET_PROP(obj, dispoFile); + is_inline = GET_PROP(obj, dispoInline); + + array_init(return_value); + add_assoc_stringl(return_value, "filename", Z_STRVAL_P(file), Z_STRLEN_P(file), 1); + add_assoc_bool(return_value, "inline", Z_LVAL_P(is_inline)); +} +/* }}} */ + +/* {{{ proto bool HTTPi_Response::setETag(string etag) + * + */ +PHP_METHOD(HTTPi_Response, setETag) +{ + char *etag; + int etag_len; + getObject(httpi_response_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &etag, &etag_len)) { + RETURN_FALSE; + } + + UPD_PROP(obj, string, eTag, etag); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto string HTTPi_Response::getETag() + * + */ +PHP_METHOD(HTTPi_Response, getETag) +{ + zval *etag; + getObject(httpi_response_object, obj); + + NO_ARGS; + + etag = GET_PROP(obj, eTag); + RETURN_STRINGL(Z_STRVAL_P(etag), Z_STRLEN_P(etag), 1); +} +/* }}} */ + +/* {{{ proto bool HTTPi_Response::setData(string data) + * + */ +PHP_METHOD(HTTPi_Response, setData) +{ + zval *the_data; + char *etag; + getObject(httpi_response_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_data)) { + RETURN_FALSE; + } + + convert_to_string_ex(&the_data); + SET_PROP(obj, data, the_data); + UPD_PROP(obj, long, lastModified, http_lmod(the_data, SEND_DATA)); + UPD_PROP(obj, long, send_mode, SEND_DATA); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto string HTTPi_Response::getData() + * + */ +PHP_METHOD(HTTPi_Response, getData) +{ + zval *the_data; + getObject(httpi_response_object, obj); + + NO_ARGS; + + the_data = GET_PROP(obj, data); + RETURN_STRINGL(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), 1); +} +/* }}} */ + +/* {{{ proto bool HTTPi_Response::setStream(resource stream) + * + */ +PHP_METHOD(HTTPi_Response, setStream) +{ + zval *the_stream; + php_stream *the_real_stream; + char *etag; + getObject(httpi_response_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &the_stream)) { + RETURN_FALSE; + } + + php_stream_from_zval(the_real_stream, &the_stream); + + SET_PROP(obj, stream, the_stream); + UPD_PROP(obj, long, lastModified, http_lmod(the_real_stream, SEND_RSRC)); + UPD_PROP(obj, long, send_mode, SEND_RSRC); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto resource HTTPi_Response::getStream() + * + */ +PHP_METHOD(HTTPi_Response, getStream) +{ + zval *the_stream; + getObject(httpi_response_object, obj); + + NO_ARGS; + + the_stream = GET_PROP(obj, stream); + RETURN_RESOURCE(Z_LVAL_P(the_stream)); +} +/* }}} */ + +/* {{{ proto bool HTTPi_Response::setFile(string file) + * + */ +PHP_METHOD(HTTPi_Response, setFile) +{ + zval *the_file; + getObject(httpi_response_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &the_file)) { + RETURN_FALSE; + } + + convert_to_string_ex(&the_file); + + UPD_PROP(obj, string, file, Z_STRVAL_P(the_file)); + UPD_PROP(obj, long, lastModified, http_lmod(the_file, -1)); + UPD_PROP(obj, long, send_mode, -1); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto string HTTPi_Response::getFile() + * + */ +PHP_METHOD(HTTPi_Response, getFile) +{ + zval *the_file; + getObject(httpi_response_object, obj); + + NO_ARGS; + + the_file = GET_PROP(obj, file); + RETURN_STRINGL(Z_STRVAL_P(the_file), Z_STRLEN_P(the_file), 1); +} +/* }}} */ + +PHP_METHOD(HTTPi_Response, send) +{ + zval *do_cache, *do_gzip; + getObject(httpi_response_object, obj); + + do_cache = GET_PROP(obj, cache); + do_gzip = GET_PROP(obj, gzip); + + /* caching */ + if (Z_LVAL_P(do_cache)) { + zval *cctrl, *etag, *lmod, *ccraw; + + etag = GET_PROP(obj, eTag); + lmod = GET_PROP(obj, lastModified); + cctrl = GET_PROP(obj, cacheControl); + ccraw = GET_PROP(obj, raw_cache_header); + + if (Z_LVAL_P(ccraw)) { + http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), Z_STRVAL_P(cctrl), Z_STRLEN_P(cctrl)); + http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : time(NULL), Z_STRVAL_P(cctrl), Z_STRLEN_P(cctrl)); + } else { + char cc_header[42] = {0}; + sprintf(cc_header, "%s, must-revalidate, max-age=0", Z_STRVAL_P(cctrl)); + http_cache_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag), cc_header, strlen(cc_header)); + http_cache_last_modified(Z_LVAL_P(lmod), Z_LVAL_P(lmod) ? Z_LVAL_P(lmod) : time(NULL), cc_header, strlen(cc_header)); + } + } + + /* gzip */ + if (Z_LVAL_P(do_gzip)) { + /* ... */ + } + + /* content type */ + { + zval *ctype = GET_PROP(obj, contentType); + if (Z_STRLEN_P(ctype)) { + http_send_content_type(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype)); + } else { + http_send_content_type("application/x-octetstream", sizeof("application/x-octetstream") - 1); + } + } + + /* content disposition */ + { + zval *dispo_file = GET_PROP(obj, dispoFile); + if (Z_STRLEN_P(dispo_file)) { + zval *dispo_inline = GET_PROP(obj, dispoInline); + http_send_content_disposition(Z_STRVAL_P(dispo_file), Z_STRLEN_P(dispo_file), Z_LVAL_P(dispo_inline)); + } + } + + /* send */ + { + zval *send_mode = GET_PROP(obj, send_mode); + switch (Z_LVAL_P(send_mode)) + { + case SEND_DATA: + { + RETURN_SUCCESS(http_send_data(GET_PROP(obj, data))); + } + + case SEND_RSRC: + { + php_stream *the_real_stream; + zval *the_stream = GET_PROP(obj, stream); + php_stream_from_zval(the_real_stream, &the_stream); + RETURN_SUCCESS(http_send_stream(the_real_stream)); + } + + default: + { + RETURN_SUCCESS(http_send_file(GET_PROP(obj, file))); + } + } + } +} +/* }}} */ + +/* {{{ HTTPi_Request */ +#ifdef HTTP_HAVE_CURL + +zend_class_entry *httpi_request_ce; +static zend_object_handlers httpi_request_object_handlers; + +typedef struct { + zend_object zo; + CURL *ch; +} httpi_request_object; + +#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) +{ + DCL_PROP_N(PROTECTED, options); + DCL_PROP_N(PROTECTED, responseInfo); + DCL_PROP_N(PROTECTED, responseData); + + DCL_PROP(PROTECTED, long, method, HTTP_GET); + + DCL_PROP(PROTECTED, string, url, ""); + DCL_PROP(PROTECTED, string, contentType, ""); + DCL_PROP(PROTECTED, string, queryData, ""); +} + +#define httpi_request_destroy_object _httpi_request_destroy_object +void _httpi_request_destroy_object(void *object, zend_object_handle handle TSRMLS_DC) +{ + httpi_request_object *o = object; + if (OBJ_PROP(o)) { + zend_hash_destroy(OBJ_PROP(o)); + FREE_HASHTABLE(OBJ_PROP(o)); + } + if (o->ch) { + curl_easy_cleanup(o->ch); + } + efree(o); +} + +#define httpi_request_new_object _httpi_request_new_object +zend_object_value _httpi_request_new_object(zend_class_entry *ce TSRMLS_DC) +{ + zend_object_value ov; + httpi_request_object *o; + + o = ecalloc(sizeof(httpi_request_object), 1); + o->zo.ce = ce; + o->ch = curl_easy_init(); + + 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 *)); + + ov.handle = zend_objects_store_put(o, httpi_request_destroy_object, NULL, NULL TSRMLS_CC); + ov.handlers = &httpi_request_object_handlers; + + return ov; +} + +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) + + PHP_ME(HTTPi_Request, setOptions, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Request, getOptions, NULL, ZEND_ACC_PUBLIC) +*/ + PHP_ME(HTTPi_Request, setMethod, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Request, getMethod, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HTTPi_Request, setURL, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Request, getURL, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HTTPi_Request, setContentType, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Request, getContentType, NULL, ZEND_ACC_PUBLIC) + + 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) +/* + PHP_ME(HTTPi_Request, setPostData, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Request, addPostData, NULL, ZEND_ACC_PUBLIC) + PHP_ME(HTTPi_Request, unsetPostData, NULL, ZEND_ACC_PUBLIC) + + PHP_ME(HTTPi_Request, addPostFile, NULL, ZEND_ACC_PUBLIC) +*/ + PHP_ME(HTTPi_Request, send, NULL, ZEND_ACC_PUBLIC) + + 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) + + {NULL, NULL, NULL} +}; + +/* {{{ proto void HTTPi_request::__construct([string url[, long request_method = HTTP_GET]]) + * + */ +PHP_METHOD(HTTPi_Request, __construct) +{ + char *URL = NULL; + int URL_len; + long meth = -1; + zval *info, *opts, *resp; + getObject(httpi_request_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sl", &URL, &URL_len, &meth)) { + return; + } + + MAKE_STD_ZVAL(opts); array_init(opts); SET_PROP(obj, options, opts); + MAKE_STD_ZVAL(info); array_init(info); SET_PROP(obj, responseInfo, info); + MAKE_STD_ZVAL(resp); array_init(resp); SET_PROP(obj, responseData, resp); + + if (URL) { + UPD_PROP(obj, string, url, URL); + } + if (meth > -1) { + UPD_PROP(obj, long, method, meth); + } +} +/* }}} */ + +/* {{{ proto bool HTTPi_request::setURL(string url) + * + */ +PHP_METHOD(HTTPi_Request, setURL) +{ + char *URL = NULL; + int URL_len; + getObject(httpi_request_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URL, &URL_len)) { + RETURN_FALSE; + } + + UPD_PROP(obj, string, url, URL); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto string HTTPi_request::getUrl() + * + */ +PHP_METHOD(HTTPi_Request, getURL) +{ + zval *URL; + getObject(httpi_request_object, obj); + + NO_ARGS; + + URL = GET_PROP(obj, url); + RETURN_STRINGL(Z_STRVAL_P(URL), Z_STRLEN_P(URL), 1); +} +/* }}} */ + +/* {{{ proto bool HTTPi_request::setMethod(long request_method) + * + */ +PHP_METHOD(HTTPi_Request, setMethod) +{ + long meth; + getObject(httpi_request_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &meth)) { + RETURN_FALSE; + } + + UPD_PROP(obj, long, method, meth); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto long HTTPi_request::getMethod() + * + */ +PHP_METHOD(HTTPi_Request, getMethod) +{ + zval *meth; + getObject(httpi_request_object, obj); + + NO_ARGS; + + meth = GET_PROP(obj, method); + RETURN_LONG(Z_LVAL_P(meth)); +} +/* }}} */ + +/* {{{ proto bool HTTPi_request::setContentType(string content_type) + * + */ +PHP_METHOD(HTTPi_Request, setContentType) +{ + char *ctype; + int ct_len; + getObject(httpi_request_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ct_len)) { + RETURN_FALSE; + } + + if (!strchr(ctype, '/')) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Content-Type '%s' doesn't seem to contain a primary and a secondary part", + ctype); + RETURN_FALSE; + } + + UPD_PROP(obj, string, contentType, ctype); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto string HTTPi_request::getContentType() + * + */ +PHP_METHOD(HTTPi_Request, getContentType) +{ + zval *ctype; + getObject(httpi_request_object, obj); + + NO_ARGS; + + ctype = GET_PROP(obj, contentType); + RETURN_STRINGL(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); +} +/* }}} */ + +/* {{{ proto bool HTTPi_request::setQueryData(mixed query_data) + * + */ +PHP_METHOD(HTTPi_Request, setQueryData) +{ + zval *qdata; + getObject(httpi_request_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &qdata)) { + RETURN_FALSE; + } + + if ((Z_TYPE_P(qdata) == IS_ARRAY) || (Z_TYPE_P(qdata) == IS_OBJECT)) { + smart_str qstr = {0}; + HTTP_URL_ARGSEP_OVERRIDE; + if (SUCCESS != php_url_encode_hash_ex(HASH_OF(qdata), &qstr, NULL, 0, NULL, 0, NULL, 0, NULL TSRMLS_CC)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't encode query data"); + if (qstr.c) { + efree(qstr.c); + } + HTTP_URL_ARGSEP_RESTORE; + RETURN_FALSE; + } + HTTP_URL_ARGSEP_RESTORE; + smart_str_0(&qstr); + UPD_PROP(obj, string, queryData, qstr.c); + efree(qstr.c); + RETURN_TRUE; + } + + convert_to_string(qdata); + UPD_PROP(obj, string, queryData, Z_STRVAL_P(qdata)); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto string HTTPi_request::getQueryData() + * + */ +PHP_METHOD(HTTPi_Request, getQueryData) +{ + zval *qdata; + getObject(httpi_request_object, obj); + + NO_ARGS; + + qdata = GET_PROP(obj, queryData); + RETURN_STRINGL(Z_STRVAL_P(qdata), Z_STRLEN_P(qdata), 1); +} +/* }}} */ + +/* {{{ proto bool HTTPi_request::addQueryData(array query_params) + * + */ +PHP_METHOD(HTTPi_Request, addQueryData) +{ + zval *qdata, *old_qdata; + smart_str qstr = {0}; + char *separator; + getObject(httpi_request_object, obj); + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &qdata)) { + RETURN_FALSE; + } + + old_qdata = GET_PROP(obj, queryData); + if (Z_STRLEN_P(old_qdata)) { + smart_str_appendl(&qstr, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata)); + } + + HTTP_URL_ARGSEP_OVERRIDE; + if (SUCCESS != php_url_encode_hash_ex(HASH_OF(qdata), &qstr, NULL, 0, NULL, 0, NULL, 0, NULL TSRMLS_CC)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't encode query data"); + if (qstr.c) { + efree(qstr.c); + } + HTTP_URL_ARGSEP_RESTORE; + RETURN_FALSE; + } + HTTP_URL_ARGSEP_RESTORE; + + smart_str_0(&qstr); + + UPD_PROP(obj, string, queryData, qstr.c); + efree(qstr.c); + RETURN_TRUE; +} +/* }}} */ + +/* {{{ proto void HTTPi_request::unsetQueryData() + * + */ +PHP_METHOD(HTTPi_Request, unsetQueryData) +{ + getObject(httpi_request_object, obj); + + NO_ARGS; + + UPD_PROP(obj, string, queryData, ""); +} +/* }}} */ -#include "php_http.h" -#include "php_http_api.h" +/* {{{ proto array HTTPi_request::getResponseData() + * + */ +PHP_METHOD(HTTPi_Request, getResponseData) +{ + zval *data; + getObject(httpi_request_object, obj); + + NO_ARGS; + + data = GET_PROP(obj, responseData); + array_init(return_value); + zend_hash_copy(Z_ARRVAL_P(return_value), Z_ARRVAL_P(data), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); +} +/* }}} */ -#if defined(HAVE_CURL) && HAVE_CURL -#include -#endif +/* {{{ proto array HTTPi_request::getResponseHeaders() + * + */ +PHP_METHOD(HTTPi_Request, getResponseHeaders) +{ + zval *data, **headers; + getObject(httpi_request_object, obj); + + NO_ARGS; + + array_init(return_value); + data = GET_PROP(obj, responseData); + if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "headers", sizeof("headers"), (void **) &headers)) { + zend_hash_copy(Z_ARRVAL_P(return_value), Z_ARRVAL_PP(headers), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); + } +} +/* }}} */ -ZEND_DECLARE_MODULE_GLOBALS(http) +/* {{{ proto string HTTPi_request::getResponseBody() + * + */ +PHP_METHOD(HTTPi_Request, getResponseBody) +{ + zval *data, **body; + getObject(httpi_request_object, obj); + + NO_ARGS; + + data = GET_PROP(obj, responseData); + if (SUCCESS == zend_hash_find(Z_ARRVAL_P(data), "body", sizeof("body"), (void **) &body)) { + RETURN_STRINGL(Z_STRVAL_PP(body), Z_STRLEN_PP(body), 1); + } else { + Z_TYPE_P(return_value) = IS_NULL; + } +} +/* }}} */ -#ifdef COMPILE_DL_HTTP -ZEND_GET_MODULE(http) -#endif +/* {{{ proto bool HTTPi_request::send() + * + */ +PHP_METHOD(HTTPi_Request, send) +{ + zval *meth, *URL, *qdata, *opts, *info, *resp; + char *response_data, *request_uri; + size_t response_len; + getObject(httpi_request_object, obj); + + NO_ARGS; + + if ((!obj->ch) && (!(obj->ch = curl_easy_init()))) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initilaize cURL"); + RETURN_FALSE; + } + + meth = GET_PROP(obj, method); + URL = GET_PROP(obj, url); + qdata = GET_PROP(obj, queryData); + opts = GET_PROP(obj, options); + info = GET_PROP(obj, responseInfo); + resp = GET_PROP(obj, responseData); + + request_uri = http_absolute_uri(Z_STRVAL_P(URL), NULL); + if (Z_STRLEN_P(qdata) && (strlen(request_uri) < HTTP_URI_MAXLEN)) { + if (!strchr(request_uri, '?')) { + strcat(request_uri, "?"); + } else { + strcat(request_uri, "&"); + } + strncat(request_uri, Z_STRVAL_P(qdata), HTTP_URI_MAXLEN - strlen(request_uri)); + } + + switch (Z_LVAL_P(meth)) + { + case HTTP_GET: + if (SUCCESS != http_get_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len)) { + RETURN_FALSE; + } + break; + + case HTTP_HEAD: + if (SUCCESS != http_head_ex(obj->ch, request_uri, Z_ARRVAL_P(opts), Z_ARRVAL_P(info), &response_data, &response_len)) { + RETURN_FALSE; + } + break; + + case HTTP_POST: + break; + + default: + break; + } + + /* final data handling */ + { + zval *zheaders, *zbody; + + MAKE_STD_ZVAL(zbody); + MAKE_STD_ZVAL(zheaders) + array_init(zheaders); + + if (SUCCESS != http_split_response_ex(response_data, response_len, zheaders, zbody)) { + zval_dtor(zheaders); + efree(zheaders), + efree(zbody); + RETURN_FALSE; + } + + add_assoc_zval(resp, "headers", zheaders); + add_assoc_zval(resp, "body", zbody); + + RETURN_TRUE; + } + /* */ +} +/* }}} */ -/* {{{ http_functions[] */ -function_entry http_functions[] = { - PHP_FE(http_date, NULL) - PHP_FE(http_absolute_uri, NULL) - PHP_FE(http_negotiate_language, NULL) - PHP_FE(http_negotiate_charset, NULL) - PHP_FE(http_redirect, NULL) - PHP_FE(http_send_status, NULL) - PHP_FE(http_send_last_modified, 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) - PHP_FE(http_chunked_decode, NULL) - PHP_FE(http_split_response, NULL) -#if defined(HAVE_CURL) && HAVE_CURL - PHP_FE(http_get, NULL) - PHP_FE(http_head, NULL) - PHP_FE(http_post_data, NULL) - PHP_FE(http_post_array, NULL) -#endif - PHP_FE(http_auth_basic, NULL) - PHP_FE(http_auth_basic_cb, NULL) - {NULL, NULL, NULL} -}; +#endif /* HTTP_HAVE_CURL */ /* }}} */ +#endif /* ZEND_ENGINE_2 */ + /* {{{ http_module_entry */ zend_module_entry http_module_entry = { #if ZEND_MODULE_API_NO >= 20010901 @@ -79,8 +1183,8 @@ zend_module_entry http_module_entry = { "http", http_functions, PHP_MINIT(http), - NULL, - NULL, + PHP_MSHUTDOWN(http), + PHP_RINIT(http), PHP_RSHUTDOWN(http), PHP_MINFO(http), #if ZEND_MODULE_API_NO >= 20010901 @@ -90,9 +1194,6 @@ zend_module_entry http_module_entry = { }; /* }}} */ -#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 @@ -282,6 +1383,47 @@ PHP_FUNCTION(http_send_last_modified) } /* }}} */ +/* {{{ proto bool http_send_content_type([string content_type = 'application/x-octetstream']) + * + * Sets the content type. + * + */ +PHP_FUNCTION(http_send_content_type) +{ + char *ct; + int ct_len = 0; + + 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). + * + */ +PHP_FUNCTION(http_send_content_disposition) +{ + char *filename; + 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; + } + RETURN_SUCCESS(http_send_content_disposition(filename, f_len, send_inline)); +} +/* }}} */ + /* {{{ proto bool http_match_modified([int timestamp]) * * Matches the given timestamp against the clients "If-Modified-Since" resp. @@ -363,17 +1505,7 @@ PHP_FUNCTION(http_cache_last_modified) send_modified = last_modified; } - http_send_header("Cache-Control: private, must-revalidate, max-age=0"); - - 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)); + RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1)); } /* }}} */ @@ -397,28 +1529,42 @@ PHP_FUNCTION(http_cache_etag) RETURN_FALSE; } - php_end_ob_buffers(0 TSRMLS_CC); - http_send_header("Cache-Control: private, must-revalidate, max-age=0"); + RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, sizeof(HTTP_DEFAULT_CACHECONTROL) - 1)); +} +/* }}} */ - /* if no etag is given and we didn't already - * start ob_etaghandler -- start it - */ - if (!HTTP_G(etag_started) && !etag_len) { - php_ob_set_internal_handler(_http_ob_etaghandler, (uint) 4096, "etag output handler", 0 TSRMLS_CC); - HTTP_G(etag_started) = 1; - RETURN_BOOL(php_start_ob_buffer_named("etag output handler", (uint) 4096, 0 TSRMLS_CC)); +/* {{{ 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) +{ + 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 (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 (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; } - RETURN_SUCCESS(http_send_etag(etag, etag_len)); + 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); } /* }}} */ @@ -481,7 +1627,7 @@ PHP_FUNCTION(http_redirect) sprintf(RED, "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; @@ -548,68 +1694,6 @@ PHP_FUNCTION(http_send_stream) } /* }}} */ -/* {{{ 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; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ct, &ct_len) != SUCCESS) { - RETURN_FALSE; - } - - if (!ct_len) { - RETURN_SUCCESS(http_send_header("Content-Type: application/x-octetstream")); - } - - /* 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); -} -/* }}} */ - -/* {{{ 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); - } - - RETVAL_BOOL(SUCCESS == http_send_header(header)); - efree(header); -} -/* }}} */ - /* {{{ proto string http_chunked_decode(string encoded) * * This function decodes a string that was HTTP-chunked encoded. @@ -638,6 +1722,7 @@ PHP_FUNCTION(http_chunked_decode) * content body. The returned array may look simliar to the following example: * * 
+ *  array(
  *         'Status' => '200 Ok',
@@ -646,6 +1731,7 @@ PHP_FUNCTION(http_chunked_decode)
  *     ),
  *     1 => "Hello World!"
  * );
+ * ?>
  *
*/ PHP_FUNCTION(http_split_response) @@ -662,7 +1748,10 @@ PHP_FUNCTION(http_split_response) MAKE_STD_ZVAL(zheaders); array_init(zheaders); - http_split_response(zresponse, zheaders, zbody); + if (SUCCESS != http_split_response(zresponse, zheaders, zbody)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP response"); + RETURN_FALSE; + } array_init(return_value); add_index_zval(return_value, 0, zheaders); @@ -670,8 +1759,47 @@ PHP_FUNCTION(http_split_response) } /* }}} */ +/* {{{ proto array http_parse_headers(string header) + * + */ +PHP_FUNCTION(http_parse_headers) +{ + char *header, *rnrn; + int header_len; + + if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header, &header_len)) { + RETURN_FALSE; + } + + array_init(return_value); + + 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; + } +} +/* }}}*/ + +/* {{{ 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); +} +/* }}} */ + /* {{{ HAVE_CURL */ -#if defined(HAVE_CURL) && HAVE_CURL +#ifdef HTTP_HAVE_CURL /* {{{ proto string http_get(string url[, array options[, array &info]]) * @@ -703,8 +1831,37 @@ PHP_FUNCTION(http_split_response) * * * The optional third parameter will be filled with some additional information - * in form af an associative array, if supplied (don't forget to initialize it - * with NULL or array()). + * 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) { @@ -942,7 +2099,7 @@ static void php_http_init_globals(zend_http_globals *http_globals) http_globals->ctype = NULL; http_globals->etag = NULL; http_globals->lmod = 0; -#if defined(HAVE_CURL) && HAVE_CURL +#ifdef HTTP_HAVE_CURL http_globals->curlbuf.body.data = NULL; http_globals->curlbuf.body.used = 0; http_globals->curlbuf.body.free = 0; @@ -950,18 +2107,76 @@ static void php_http_init_globals(zend_http_globals *http_globals) http_globals->curlbuf.hdrs.used = 0; http_globals->curlbuf.hdrs.free = 0; #endif + http_globals->allowed_methods = NULL; +} +/* }}} */ + +/* {{{ static inline STATUS http_check_allowed_methods(char *, int) */ +#define http_check_allowed_methods(m, l) _http_check_allowed_methods((m), (l) TSRMLS_CC) +static inline void _http_check_allowed_methods(char *methods, int length TSRMLS_DC) +{ + if (length && SG(request_info).request_method && (!strstr(methods, SG(request_info).request_method))) { + char *allow_header = emalloc(length + sizeof("Allow: ")); + sprintf(allow_header, "Allow: %s", methods); + http_send_header(allow_header); + efree(allow_header); + http_send_status(405); + zend_bailout(); + } +} +/* }}} */ + +/* {{{ PHP_INI */ +PHP_INI_MH(update_allowed_methods) +{ + http_check_allowed_methods(new_value, new_value_length); + return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); } + +PHP_INI_BEGIN() + STD_PHP_INI_ENTRY("http.allowed_methods", "OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,CONNECT", PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals) +PHP_INI_END() /* }}} */ /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(http) { ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL); -#if defined(HAVE_CURL) && HAVE_CURL + REGISTER_INI_ENTRIES(); + +#ifdef HTTP_HAVE_CURL 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; +} +/* }}} */ + +/* {{{ PHP_MSHUTDOWN_FUNCTION */ +PHP_MSHUTDOWN_FUNCTION(http) +{ + UNREGISTER_INI_ENTRIES(); + return SUCCESS; +} +/* }}} */ + +/* {{{ PHP_RINIT_FUNCTION */ +PHP_RINIT_FUNCTION(http) +{ + char *allowed_methods = INI_STR("http.allowed_methods"); + http_check_allowed_methods(allowed_methods, strlen(allowed_methods)); return SUCCESS; } /* }}} */ @@ -969,18 +2184,26 @@ PHP_MINIT_FUNCTION(http) /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(http) { - if (HTTP_G(ctype)) { - efree(HTTP_G(ctype)); - } + HTTP_G(etag_started) = 0; + HTTP_G(lmod) = 0; + if (HTTP_G(etag)) { efree(HTTP_G(etag)); + HTTP_G(etag) = NULL; + } + + if (HTTP_G(ctype)) { + efree(HTTP_G(ctype)); + HTTP_G(ctype) = NULL; } -#if defined(HAVE_CURL) && HAVE_CURL +#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; } #endif return SUCCESS; @@ -994,13 +2217,15 @@ PHP_MINFO_FUNCTION(http) php_info_print_table_header(2, "Extended HTTP support", "enabled"); php_info_print_table_row(2, "Version:", PHP_EXT_HTTP_VERSION); php_info_print_table_row(2, "cURL convenience functions:", -#if defined(HAVE_CURL) && HAVE_CURL +#ifdef HTTP_HAVE_CURL "enabled" #else "disabled" #endif ); php_info_print_table_end(); + + DISPLAY_INI_ENTRIES(); } /* }}} */