X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=fdee36d80bfcec98c42fa38e7b4da2c7e76fb147;hp=f2c53121f5c9e994c719b610a2d6726dd3592831;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d diff --git a/php_http_api.h b/php_http_api.h index f2c5312..fdee36d 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-2010, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -20,11 +20,14 @@ #define HTTP_SUPPORT_MAGICMIME 0x04L #define HTTP_SUPPORT_ENCODINGS 0x08L #define HTTP_SUPPORT_SSLREQUESTS 0x20L +#define HTTP_SUPPORT_PERSISTENCE 0x40L +#define HTTP_SUPPORT_EVENTS 0x80L #define HTTP_PARAMS_ALLOW_COMMA 0x01 #define HTTP_PARAMS_ALLOW_FAILURE 0x02 #define HTTP_PARAMS_RAISE_ERROR 0x04 #define HTTP_PARAMS_DEFAULT (HTTP_PARAMS_ALLOW_COMMA|HTTP_PARAMS_ALLOW_FAILURE|HTTP_PARAMS_RAISE_ERROR) +#define HTTP_PARAMS_COLON_SEPARATOR 0x10 extern PHP_MINIT_FUNCTION(http_support); @@ -34,6 +37,9 @@ PHP_HTTP_API long _http_support(long feature); #define pretty_key(key, key_len, uctitle, xhyphen) _http_pretty_key(key, key_len, uctitle, xhyphen) extern char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen); +#define http_boundary(b, l) _http_boundary((b), (l) TSRMLS_CC) +extern size_t _http_boundary(char *buf, size_t len TSRMLS_DC); + #define http_error(type, code, string) _http_error_ex(type, code, "%s", string) #define http_error_ex _http_error_ex extern void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...); @@ -56,6 +62,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 */ @@ -100,25 +111,8 @@ extern zval *_http_exception_wrap(zval *old_exception, zval *new_exception, zend action; \ } -#define HTTP_CHECK_OPEN_BASEDIR(file, act) \ - if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) \ - { \ - const char *tmp = file; \ - \ - if (!strncasecmp(tmp, "file:", lenof("file:"))) { \ - tmp += lenof("file:"); \ - while ((tmp - (const char *)file < 7) && (*tmp == '/' || *tmp == '\\')) ++tmp; \ - } \ - \ - if ( (tmp != file || !strstr(file, "://")) && \ - (!*tmp || php_check_open_basedir(tmp TSRMLS_CC) || \ - (PG(safe_mode) && !php_checkuid(tmp, "rb+", CHECKUID_CHECK_MODE_PARAM)))) { \ - act; \ - } \ - } - #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 +122,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) @@ -163,9 +152,9 @@ static inline void _http_sleep(double s) #define HTTP_MLLISEC (1000) #define HTTP_MCROSEC (1000 * 1000) #define HTTP_NANOSEC (1000 * 1000 * 1000) -#define HTTP_MSEC(s) (s * HTTP_MLLISEC) -#define HTTP_USEC(s) (s * HTTP_MCROSEC) -#define HTTP_NSEC(s) (s * HTTP_NANOSEC) +#define HTTP_MSEC(s) ((long)(s * HTTP_MLLISEC)) +#define HTTP_USEC(s) ((long)(s * HTTP_MCROSEC)) +#define HTTP_NSEC(s) ((long)(s * HTTP_NANOSEC)) #if defined(PHP_WIN32) Sleep((DWORD) HTTP_MSEC(s)); @@ -222,7 +211,7 @@ static inline const char *_http_locate_body(const char *message) if (*(msg+1) == '\n') { body = msg + 2; break; - } else if (*(msg+1) == '\r' && *(msg+2) == '\n' && msg != message && *(msg-1) == '\r') { + } else if (*(msg+1) == '\r' && *(msg+2) == '\n') { body = msg + 3; break; } @@ -243,8 +232,8 @@ static inline const char *_http_locate_eol(const char *line, int *eol_len) return eol; } -#define convert_to_type(t, z) _convert_to_type((t), (z)) -static inline zval *_convert_to_type(int type, zval *z) +#define http_zset(t, z) _http_zset((t), (z)) +static inline zval *_http_zset(int type, zval *z) { if (Z_TYPE_P(z) != type) { switch (type) { @@ -259,10 +248,10 @@ static inline zval *_convert_to_type(int type, zval *z) } return z; } -#define convert_to_type_ex(t, z, p) _convert_to_type_ex((t), (z), (p)) -static inline zval *_convert_to_type_ex(int type, zval *z, zval **p) -{ - *p = z; +#define http_zsep(t, z) _http_zsep_ex((t), (z), NULL) +#define http_zsep_ex(t, z, p) _http_zsep_ex((t), (z), (p)) +static inline zval *_http_zsep_ex(int type, zval *z, zval **p) { + SEPARATE_ARG_IF_REF(z); if (Z_TYPE_P(z) != type) { switch (type) { case IS_NULL: convert_to_null_ex(&z); break; @@ -274,45 +263,20 @@ static inline zval *_convert_to_type_ex(int type, zval *z, zval **p) case IS_OBJECT: convert_to_object_ex(&z); break; } } - if (*p == z) { - *p = NULL; - } else { + if (p) { *p = z; } return z; } -#define zval_copy(t, z) _zval_copy((t), (z) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) -static inline zval *_zval_copy(int type, zval *z ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) -{ - zval *copy; - - copy = emalloc_rel(sizeof(zval)); - *copy = *z; - zval_copy_ctor(copy); - convert_to_type(type, copy); - copy->refcount = 0; - copy->is_ref = 0; - - return copy; -} - -#define zval_free(z) _zval_free(z) -static inline void _zval_free(zval **z) -{ - zval_dtor(*z); - FREE_ZVAL(*z); - *z = NULL; -} - 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,23 +287,23 @@ 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)) #define array_copy(src, dst) zend_hash_copy(dst, src, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)) #define ARRAY_JOIN_STRONLY 1 #define ARRAY_JOIN_PRETTIFY 2 -#define array_join(src, dst, append, flags) zend_hash_apply_with_arguments(src, (append)?apply_array_append_func:apply_array_merge_func, 2, dst, (int)flags) +#define array_join(src, dst, append, flags) zend_hash_apply_with_arguments(src HTTP_ZAPI_HASH_TSRMLS_CC, (append)?apply_array_append_func:apply_array_merge_func, 2, dst, (int)flags) -extern int apply_array_append_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key); -extern int apply_array_merge_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key); +extern int apply_array_append_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key); +extern int apply_array_merge_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key); #endif