X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message.h;h=2f995074173add6e49d33d058e6180f12be1c052;hp=65509e72a0a3efa904b4e30496f1161a6b119ac3;hb=7a1fef9608be28f02f5a5b07b33065372574d593;hpb=88770c6b3fb365da405b4aede6def9ce88dbca7c diff --git a/php_http_message.h b/php_http_message.h index 65509e7..2f99507 100644 --- a/php_http_message.h +++ b/php_http_message.h @@ -6,23 +6,19 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2010, Michael Wallner | + | Copyright (c) 2004-2014, Michael Wallner | +--------------------------------------------------------------------+ */ -/* $Id: php_http_message.h 292841 2009-12-31 08:48:57Z mike $ */ - #ifndef PHP_HTTP_MESSAGE_H #define PHP_HTTP_MESSAGE_H +#include "php_http_message_body.h" +#include "php_http_header.h" + /* required minimum length of an HTTP message "HTTP/1.1" */ #define PHP_HTTP_MESSAGE_MIN_SIZE 8 #define PHP_HTTP_MESSAGE_TYPE(TYPE, msg) ((msg) && ((msg)->type == PHP_HTTP_ ##TYPE)) -#define PHP_HTTP_MESSAGE_TYPE_CHECK(type, msg, action) \ - if (!PHP_HTTP_MESSAGE_TYPE(type, (msg))) { \ - php_http_error(HE_NOTICE, PHP_HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type "#type); \ - action; \ - } typedef php_http_info_type_t php_http_message_type_t; typedef struct php_http_message php_http_message_t; @@ -30,27 +26,42 @@ typedef struct php_http_message php_http_message_t; struct php_http_message { PHP_HTTP_INFO_IMPL(http, type) HashTable hdrs; - php_http_message_body_t body; + php_http_message_body_t *body; php_http_message_t *parent; void *opaque; -#ifdef ZTS - void ***ts; -#endif }; -PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **message, HashTable **headers, php_http_info_t *info TSRMLS_DC); +PHP_HTTP_API zend_bool php_http_message_info_callback(php_http_message_t **message, HashTable **headers, php_http_info_t *info); -PHP_HTTP_API php_http_message_t *php_http_message_init(php_http_message_t *m, php_http_message_type_t t TSRMLS_DC); -PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m, php_http_message_type_t t TSRMLS_DC); -PHP_HTTP_API php_http_message_t *php_http_message_copy(php_http_message_t *from, php_http_message_t *to); +PHP_HTTP_API php_http_message_t *php_http_message_init(php_http_message_t *m, php_http_message_type_t t, php_http_message_body_t *body); +PHP_HTTP_API php_http_message_t *php_http_message_init_env(php_http_message_t *m, php_http_message_type_t t); PHP_HTTP_API php_http_message_t *php_http_message_copy_ex(php_http_message_t *from, php_http_message_t *to, zend_bool parents); +static inline php_http_message_t *php_http_message_copy(php_http_message_t *from, php_http_message_t *to) +{ + return php_http_message_copy_ex(from, to, 1); +} + PHP_HTTP_API void php_http_message_dtor(php_http_message_t *message); PHP_HTTP_API void php_http_message_free(php_http_message_t **message); PHP_HTTP_API void php_http_message_set_type(php_http_message_t *m, php_http_message_type_t t); PHP_HTTP_API void php_http_message_set_info(php_http_message_t *message, php_http_info_t *info); -PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, char *key_str, size_t key_len, int join); +PHP_HTTP_API void php_http_message_update_headers(php_http_message_t *msg); + +PHP_HTTP_API zval *php_http_message_header(php_http_message_t *msg, const char *key_str, size_t key_len); + +static inline zend_string *php_http_message_header_string(php_http_message_t *msg, const char *key_str, size_t key_len) +{ + zval *header; + + if ((header = php_http_message_header(msg, key_str, key_len))) { + return php_http_header_value_to_string(header); + } + return NULL; +} + +PHP_HTTP_API zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary); PHP_HTTP_API void php_http_message_to_string(php_http_message_t *msg, char **string, size_t *length); PHP_HTTP_API void php_http_message_to_struct(php_http_message_t *msg, zval *strct); @@ -58,82 +69,43 @@ PHP_HTTP_API void php_http_message_to_callback(php_http_message_t *msg, php_http PHP_HTTP_API void php_http_message_serialize(php_http_message_t *message, char **string, size_t *length); PHP_HTTP_API php_http_message_t *php_http_message_reverse(php_http_message_t *msg); -PHP_HTTP_API php_http_message_t *php_http_message_interconnect(php_http_message_t *m1, php_http_message_t *m2); +PHP_HTTP_API php_http_message_t *php_http_message_zip(php_http_message_t *one, php_http_message_t *two); -#define php_http_message_count(c, m) \ -{ \ - php_http_message_t *__tmp_msg = (m); \ - for (c = 0; __tmp_msg; __tmp_msg = __tmp_msg->parent, ++(c)); \ -} +static inline size_t php_http_message_count(php_http_message_t *m) +{ + size_t c = 1; -PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len TSRMLS_DC); + while ((m = m->parent)) { + ++c; + } -/* PHP */ + return c; +} + +PHP_HTTP_API php_http_message_t *php_http_message_parse(php_http_message_t *msg, const char *str, size_t len, zend_bool greedy); typedef struct php_http_message_object { - zend_object zo; php_http_message_t *message; - zend_object_value parent, body; - zval *iterator; + struct php_http_message_object *parent; + php_http_message_body_object_t *body; + zval iterator; + zend_object zo; } php_http_message_object_t; -extern zend_class_entry *php_http_message_class_entry; -extern zend_function_entry http_message_method_entry[]; - -extern PHP_MINIT_FUNCTION(http_message); -extern PHP_MSHUTDOWN_FUNCTION(http_message); - -extern void php_http_message_object_prepend(zval *this_ptr, zval *prepend, zend_bool top /* = 1 */ TSRMLS_DC); -extern void php_http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC); - -extern zend_object_value php_http_message_object_new(zend_class_entry *ce TSRMLS_DC); -extern zend_object_value php_http_message_object_new_ex(zend_class_entry *ce, php_http_message_t *msg, php_http_message_object_t **ptr TSRMLS_DC); -extern zend_object_value php_http_message_object_clone(zval *object TSRMLS_DC); -extern void php_http_message_object_free(void *object TSRMLS_DC); - -PHP_METHOD(HttpMessage, __construct); -PHP_METHOD(HttpMessage, getBody); -PHP_METHOD(HttpMessage, setBody); -PHP_METHOD(HttpMessage, getHeader); -PHP_METHOD(HttpMessage, setHeader); -PHP_METHOD(HttpMessage, addHeader); -PHP_METHOD(HttpMessage, getHeaders); -PHP_METHOD(HttpMessage, setHeaders); -PHP_METHOD(HttpMessage, addHeaders); -PHP_METHOD(HttpMessage, getType); -PHP_METHOD(HttpMessage, setType); -PHP_METHOD(HttpMessage, getInfo); -PHP_METHOD(HttpMessage, setInfo); -PHP_METHOD(HttpMessage, getResponseCode); -PHP_METHOD(HttpMessage, setResponseCode); -PHP_METHOD(HttpMessage, getResponseStatus); -PHP_METHOD(HttpMessage, setResponseStatus); -PHP_METHOD(HttpMessage, getRequestMethod); -PHP_METHOD(HttpMessage, setRequestMethod); -PHP_METHOD(HttpMessage, getRequestUrl); -PHP_METHOD(HttpMessage, setRequestUrl); -PHP_METHOD(HttpMessage, getHttpVersion); -PHP_METHOD(HttpMessage, setHttpVersion); -PHP_METHOD(HttpMessage, guessContentType); -PHP_METHOD(HttpMessage, getParentMessage); -PHP_METHOD(HttpMessage, send); -PHP_METHOD(HttpMessage, toString); -PHP_METHOD(HttpMessage, toMessageTypeObject); - -PHP_METHOD(HttpMessage, count); -PHP_METHOD(HttpMessage, serialize); -PHP_METHOD(HttpMessage, unserialize); -PHP_METHOD(HttpMessage, rewind); -PHP_METHOD(HttpMessage, valid); -PHP_METHOD(HttpMessage, current); -PHP_METHOD(HttpMessage, key); -PHP_METHOD(HttpMessage, next); - -PHP_METHOD(HttpMessage, factory); - -PHP_METHOD(HttpMessage, detach); -PHP_METHOD(HttpMessage, prepend); -PHP_METHOD(HttpMessage, reverse); +PHP_HTTP_API zend_class_entry *php_http_message_class_entry; + +PHP_MINIT_FUNCTION(http_message); +PHP_MSHUTDOWN_FUNCTION(http_message); + +void php_http_message_object_prepend(zval *this_ptr, zval *prepend, zend_bool top /* = 1 */); +void php_http_message_object_reverse(zval *this_ptr, zval *return_value); +ZEND_RESULT_CODE php_http_message_object_set_body(php_http_message_object_t *obj, zval *zbody); +ZEND_RESULT_CODE php_http_message_object_init_body_object(php_http_message_object_t *obj); + +zend_object *php_http_message_object_new(zend_class_entry *ce); +php_http_message_object_t *php_http_message_object_new_ex(zend_class_entry *ce, php_http_message_t *msg); +zend_object *php_http_message_object_clone(zval *object); +void php_http_message_object_free(zend_object *object); #endif