X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_querystring_api.c;fp=http_querystring_api.c;h=0000000000000000000000000000000000000000;hp=7caa7bcf92ebca441d05f54417a792bd4a7656f1;hb=87db9817d428282792c8146d9c2ae9748ebf6f1e;hpb=7a5c865f6faf8b1b6c91735e9d3b040449ea74ba diff --git a/http_querystring_api.c b/http_querystring_api.c deleted file mode 100644 index 7caa7bc..0000000 --- a/http_querystring_api.c +++ /dev/null @@ -1,220 +0,0 @@ -/* - +--------------------------------------------------------------------+ - | 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-2010, Michael Wallner | - +--------------------------------------------------------------------+ -*/ - -/* $Id$ */ - -#define HTTP_WANT_SAPI -#include "php_http.h" - -#include "php_variables.h" -#ifdef HTTP_HAVE_ICONV -# undef PHP_ATOM_INC -# include "ext/iconv/php_iconv.h" -# include "ext/standard/url.h" -#endif - -#include "php_http_api.h" -#include "php_http_url_api.h" -#include "php_http_querystring_api.h" - -#ifdef ZEND_ENGINE_2 -#define THIS_CE http_querystring_object_ce -extern zend_class_entry *http_querystring_object_ce; -#endif - - -#define http_querystring_modify_array_ex(q, t, k, kl, i, pe) _http_querystring_modify_array_ex((q), (t), (k), (kl), (i), (pe) TSRMLS_CC) -static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC); -#define http_querystring_modify_array(q, p) _http_querystring_modify_array((q), (p) TSRMLS_CC) -static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC); - - -#ifdef HTTP_HAVE_ICONV -PHP_HTTP_API int _http_querystring_xlate(zval *array, zval *param, const char *ie, const char *oe TSRMLS_DC) -{ - HashPosition pos; - zval **entry = NULL; - char *xlate_str = NULL, *xkey; - size_t xlate_len = 0, xlen; - HashKey key = initHashKey(0); - - FOREACH_KEYVAL(pos, param, key, entry) { - if (key.type == HASH_KEY_IS_STRING) { - if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(key.str, key.len-1, &xkey, &xlen, oe, ie)) { - http_error_ex(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to convert '%.*s' from '%s' to '%s'", key.len-1, key.str, ie, oe); - return FAILURE; - } - } - - if (Z_TYPE_PP(entry) == IS_STRING) { - if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry), &xlate_str, &xlate_len, oe, ie)) { - if (key.type == HASH_KEY_IS_STRING) { - efree(xkey); - } - http_error_ex(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to convert '%.*s' from '%s' to '%s'", Z_STRLEN_PP(entry), Z_STRVAL_PP(entry), ie, oe); - return FAILURE; - } - if (key.type == HASH_KEY_IS_STRING) { - add_assoc_stringl_ex(array, xkey, xlen+1, xlate_str, xlate_len, 0); - } else { - add_index_stringl(array, key.num, xlate_str, xlate_len, 0); - } - } else if (Z_TYPE_PP(entry) == IS_ARRAY) { - zval *subarray; - - MAKE_STD_ZVAL(subarray); - array_init(subarray); - if (key.type == HASH_KEY_IS_STRING) { - add_assoc_zval_ex(array, xkey, xlen+1, subarray); - } else { - add_index_zval(array, key.num, subarray); - } - if (SUCCESS != http_querystring_xlate(subarray, *entry, ie, oe)) { - if (key.type == HASH_KEY_IS_STRING) { - efree(xkey); - } - return FAILURE; - } - } - - if (key.type == HASH_KEY_IS_STRING) { - efree(xkey); - } - } - return SUCCESS; -} -#endif /* HAVE_ICONV */ - -PHP_HTTP_API void _http_querystring_update(zval *qarray, zval *qstring TSRMLS_DC) -{ - char *s = NULL; - size_t l = 0; - - if (Z_TYPE_P(qarray) != IS_ARRAY) { - convert_to_array(qarray); - } - if (SUCCESS == http_urlencode_hash_ex(Z_ARRVAL_P(qarray), 0, NULL, 0, &s, &l)) { - zval_dtor(qstring); - ZVAL_STRINGL(qstring, s, l, 0); - } else { - http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to update query string"); - } -} - -PHP_HTTP_API int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC) -{ - if (Z_TYPE_P(params) == IS_ARRAY) { - return http_querystring_modify_array(qarray, params); - } else if (Z_TYPE_P(params) == IS_OBJECT) { -#ifdef ZEND_ENGINE_2 - if (instanceof_function(Z_OBJCE_P(params), http_querystring_object_ce TSRMLS_CC)) { - return http_querystring_modify_array(qarray, zend_read_property(THIS_CE, params, ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)); - } else { -#endif - return http_querystring_modify_array(qarray, params); -#ifdef ZEND_ENGINE_2 - } -#endif - } else { - int rv; - zval array; - zval *qstring = http_zsep(IS_STRING, params); - - INIT_PZVAL(&array); - array_init(&array); - - sapi_module.treat_data(PARSE_STRING, estrdup(Z_STRVAL_P(qstring)), &array TSRMLS_CC); - zval_ptr_dtor(&qstring); - - rv = http_querystring_modify_array(qarray, &array); - zval_dtor(&array); - return rv; - } -} - -static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC) -{ - int rv = 0; - HashKey key = initHashKey(0); - HashPosition pos; - zval **params_entry = NULL; - - FOREACH_HASH_KEYVAL(pos, HASH_OF(params), key, params_entry) { - /* only public properties */ - if ((key.type != HASH_KEY_IS_STRING || *key.str) && http_querystring_modify_array_ex(qarray, key.type, key.str, key.len, key.num, *params_entry)) { - rv = 1; - } - } - - return rv; -} - -static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC) -{ - zval **qarray_entry; - - /* ensure array type */ - if (Z_TYPE_P(qarray) != IS_ARRAY) { - convert_to_array(qarray); - } - - /* delete */ - if (Z_TYPE_P(params_entry) == IS_NULL) { - if (key_type == HASH_KEY_IS_STRING) { - return (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarray), key, keylen)); - } else { - return (SUCCESS == zend_hash_index_del(Z_ARRVAL_P(qarray), idx)); - } - } - - /* update */ - if ( ((key_type == HASH_KEY_IS_STRING) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), key, keylen, (void *) &qarray_entry))) || - ((key_type == HASH_KEY_IS_LONG) && (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(qarray), idx, (void *) &qarray_entry)))) { - zval equal; - - /* recursive */ - if (Z_TYPE_P(params_entry) == IS_ARRAY || Z_TYPE_P(params_entry) == IS_OBJECT) { - return http_querystring_modify(*qarray_entry, params_entry); - } - /* equal */ - if ((SUCCESS == is_equal_function(&equal, *qarray_entry, params_entry TSRMLS_CC)) && Z_BVAL(equal)) { - return 0; - } - } - - /* add */ - if (Z_TYPE_P(params_entry) == IS_OBJECT) { - zval *new_array; - - MAKE_STD_ZVAL(new_array); - array_init(new_array); - http_querystring_modify_array(new_array, params_entry); - params_entry = new_array; - } else { - ZVAL_ADDREF(params_entry); - } - if (key_type == HASH_KEY_IS_STRING) { - add_assoc_zval_ex(qarray, key, keylen, params_entry); - } else { - add_index_zval(qarray, idx, params_entry); - } - return 1; -} - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim<600: noet sw=4 ts=4 - */