X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_api.h;h=e3ab8397a53ca8c6d425e6157c75112cd0ce50d5;hp=731e1709ffe96d0c04fcfaef33c5977dbbd1d8e5;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=781c90c0447166dd52ef881ae15751fa466c32fb diff --git a/php_http_message_api.h b/php_http_message_api.h index 731e170..e3ab839 100644 --- a/php_http_message_api.h +++ b/php_http_message_api.h @@ -1,16 +1,13 @@ /* - +----------------------------------------------------------------------+ - | 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-2006, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ @@ -18,55 +15,63 @@ #ifndef PHP_HTTP_MESSAGE_API_H #define PHP_HTTP_MESSAGE_API_H -#include "phpstr/phpstr.h" +#include "php_http_info_api.h" -typedef enum { - HTTP_MSG_NONE, - HTTP_MSG_REQUEST, - HTTP_MSG_RESPONSE +typedef enum _http_message_type_t { + HTTP_MSG_NONE = 0, + HTTP_MSG_REQUEST = IS_HTTP_REQUEST, + HTTP_MSG_RESPONSE = IS_HTTP_RESPONSE, } http_message_type; -typedef struct _http_message http_message; +typedef struct _http_message_t http_message; -struct _http_message { +struct _http_message_t { phpstr body; HashTable hdrs; http_message_type type; - - union { - struct { - float http_version; - char *method; - char *URI; - } request; - - struct { - float http_version; - int code; - } response; - - } info; - + struct http_info http; http_message *parent; }; -/* required minimum length of an HTTP message "HTTP/1.1 200\r\n" */ -#define HTTP_MSG_MIN_SIZE 15 +/* required minimum length of an HTTP message "HTTP/1.1" */ +#define HTTP_MSG_MIN_SIZE 8 /* shorthand for type checks */ #define HTTP_MSG_TYPE(TYPE, msg) ((msg) && ((msg)->type == HTTP_MSG_ ##TYPE)) -#define http_message_new() _http_message_init_ex(NULL, 0) -#define http_message_init(m) _http_message_init_ex((m), 0) -#define http_message_init_ex(m, t) _http_message_init_ex((m), (t)) -PHP_HTTP_API http_message *_http_message_init_ex(http_message *m, http_message_type t); +#define http_message_new() http_message_init_ex(NULL, 0) +#define http_message_init(m) http_message_init_ex((m), 0) +#define http_message_init_ex(m, t) _http_message_init_ex((m), (t) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) +#define http_message_init_rel(m, t) _http_message_init_ex((m), (t) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC) +PHP_HTTP_API http_message *_http_message_init_ex(http_message *m, http_message_type t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); #define http_message_set_type(m, t) _http_message_set_type((m), (t)) PHP_HTTP_API void _http_message_set_type(http_message *m, http_message_type t); +#define http_message_set_info(m, i) _http_message_set_info((m), (i)) +PHP_HTTP_API void _http_message_set_info(http_message *message, http_info *info); + +#define http_message_header(m, h) _http_message_header_ex((m), (h), sizeof(h)) +#define http_message_header_ex _http_message_header_ex +static inline zval *_http_message_header_ex(http_message *msg, char *key_str, size_t key_len) +{ + zval **header; + if (SUCCESS == zend_hash_find(&msg->hdrs, key_str, key_len, (void *) &header)) { + return *header; + } + return NULL; +} + +#define http_message_count(c, m) \ +{ \ + http_message *__tmp_msg = (m); \ + for (c = 0; __tmp_msg; __tmp_msg = __tmp_msg->parent, ++(c)); \ +} + #define http_message_parse(m, l) http_message_parse_ex(NULL, (m), (l)) -#define http_message_parse_ex(h, m, l) _http_message_parse_ex((h), (m), (l) TSRMLS_CC) -PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t length TSRMLS_DC); +#define http_message_parse_ex(h, m, l) _http_message_parse_ex((h), (m), (l) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) +#define http_message_parse_rel(h, m, l) _http_message_parse_ex((h), (m), (l) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC TSRMLS_CC) +PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); #define http_message_tostring(m, s, l) _http_message_tostring((m), (s), (l)) PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_t *length); @@ -74,6 +79,15 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ #define http_message_serialize(m, s, l) _http_message_serialize((m), (s), (l)) PHP_HTTP_API void _http_message_serialize(http_message *message, char **string, size_t *length); +#define http_message_reverse(m) _http_message_reverse(m) +PHP_HTTP_API http_message *_http_message_reverse(http_message *msg); + +#define http_message_interconnect(m1, m2) _http_message_interconnect((m1), (m2)) +PHP_HTTP_API http_message *_http_message_interconnect(http_message *m1, http_message *m2); + +#define http_message_tostruct_recursive(m, s) _http_message_tostruct_recursive((m), (s) TSRMLS_CC) +PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *strct TSRMLS_DC); + #define http_message_send(m) _http_message_send((m) TSRMLS_CC) PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC); @@ -84,7 +98,7 @@ PHP_HTTP_API http_message *_http_message_dup(http_message *msg TSRMLS_DC); PHP_HTTP_API void _http_message_dtor(http_message *message); #define http_message_free(m) _http_message_free((m)) -PHP_HTTP_API void _http_message_free(http_message *message); +PHP_HTTP_API void _http_message_free(http_message **message); #endif