X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=2de5abbc2d4560fc80f3d0fdbd97a3e337903808;hp=f2c53121f5c9e994c719b610a2d6726dd3592831;hb=9e37263154391dec762b839cad4b7dd13e35467e;hpb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d diff --git a/php_http_api.h b/php_http_api.h index f2c5312..2de5abb 100644 --- a/php_http_api.h +++ b/php_http_api.h @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2006, Michael Wallner | + | Copyright (c) 2004-2007, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -20,6 +20,7 @@ #define HTTP_SUPPORT_MAGICMIME 0x04L #define HTTP_SUPPORT_ENCODINGS 0x08L #define HTTP_SUPPORT_SSLREQUESTS 0x20L +#define HTTP_SUPPORT_PERSISTENCE 0x40L #define HTTP_PARAMS_ALLOW_COMMA 0x01 #define HTTP_PARAMS_ALLOW_FAILURE 0x02 @@ -56,6 +57,11 @@ extern zval *_http_exception_wrap(zval *old_exception, zval *new_exception, zend if (EG(exception)) { \ EG(exception) = http_exception_wrap(EG(exception), NULL, ex_ce); \ } + +typedef zend_object_value (*http_object_new_t)(zend_class_entry *ce, void *, void ** TSRMLS_DC); + +#define http_object_new(ov, cn, cl, co, ce, i, pp) _http_object_new((ov), (cn), (cl), (http_object_new_t) (co), (ce), (i), (void *) (pp) TSRMLS_CC) +extern STATUS _http_object_new(zend_object_value *ov, const char *cname_str, uint cname_len, http_object_new_t create, zend_class_entry *parent_ce, void *intern_ptr, void **obj_ptr TSRMLS_DC); #endif /* ZEND_ENGINE_2 */ @@ -118,7 +124,7 @@ extern zval *_http_exception_wrap(zval *old_exception, zval *new_exception, zend } #define http_log(f, i, m) _http_log_ex((f), (i), (m) TSRMLS_CC) -extern void http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC); +extern void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC); #define http_exit(s, h) http_exit_ex((s), (h), NULL, 1) #define http_exit_ex(s, h, b, e) _http_exit_ex((s), (h), (b), (e) TSRMLS_CC) @@ -128,15 +134,10 @@ extern STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send #define http_check_method_ex(m, a) _http_check_method_ex((m), (a)) extern STATUS _http_check_method_ex(const char *method, const char *methods); -#define HTTP_GSC(var, name, ret) HTTP_GSP(var, name, return ret) -#define HTTP_GSP(var, name, ret) \ - if (!(var = _http_get_server_var_ex(name, strlen(name)+1, 1 TSRMLS_CC))) { \ - ret; \ - } -#define http_got_server_var(v) (NULL != _http_get_server_var_ex((v), sizeof(v), 1 TSRMLS_CC)) -#define http_get_server_var(v) http_get_server_var_ex((v), sizeof(v)) -#define http_get_server_var_ex(v, s) _http_get_server_var_ex((v), (s), 0 TSRMLS_CC) -PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zend_bool check TSRMLS_DC); +#define http_got_server_var(v) (NULL != http_get_server_var_ex((v), strlen(v), 1)) +#define http_get_server_var(v, c) http_get_server_var_ex((v), strlen(v), (c)) +#define http_get_server_var_ex(v, l, c) _http_get_server_var_ex((v), (l), (c) TSRMLS_CC) +PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_len, zend_bool check TSRMLS_DC); #define http_get_request_body(b, l) _http_get_request_body_ex((b), (l), 1 TSRMLS_CC) #define http_get_request_body_ex(b, l, d) _http_get_request_body_ex((b), (l), (d) TSRMLS_CC) @@ -306,13 +307,13 @@ static inline void _zval_free(zval **z) } typedef struct _HashKey { - int type; - int dup; char *str; uint len; ulong num; + uint dup:1; + uint type:31; } HashKey; -#define initHashKey(dup) {0, (dup), NULL, 0, 0} +#define initHashKey(dup) {NULL, 0, 0, (dup), 0} #define FOREACH_VAL(pos, array, val) FOREACH_HASH_VAL(pos, Z_ARRVAL_P(array), val) #define FOREACH_HASH_VAL(pos, hash, val) \ @@ -323,13 +324,13 @@ typedef struct _HashKey { #define FOREACH_KEY(pos, array, key) FOREACH_HASH_KEY(pos, Z_ARRVAL_P(array), key) #define FOREACH_HASH_KEY(pos, hash, _key) \ for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \ - ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT; \ + ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (zend_bool) (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT; \ zend_hash_move_forward_ex(hash, &pos)) \ #define FOREACH_KEYVAL(pos, array, key, val) FOREACH_HASH_KEYVAL(pos, Z_ARRVAL_P(array), key, val) #define FOREACH_HASH_KEYVAL(pos, hash, _key, val) \ for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \ - ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT && \ + ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (zend_bool) (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT && \ zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \ zend_hash_move_forward_ex(hash, &pos))