Merge branch 'master' into phpng

[m6w6/ext-http] / php_http_params.h

diff --git a/php_http_params.h b/php_http_params.h
index 42f56f901c5249b2bf12d661761ab048d49a56c7..b8892101e15d28bc83d7590b34d6e3080e6127ab 100644 (file)
--- a/php_http_params.h
+++ b/php_http_params.h
@@ -23,6 +23,7 @@ typedef struct php_http_params_token {
 #define PHP_HTTP_PARAMS_URLENCODED     0x04
 #define PHP_HTTP_PARAMS_DIMENSION      0x08
 #define PHP_HTTP_PARAMS_RFC5987                0x10
+#define PHP_HTTP_PARAMS_RFC5988                0x20
 #define PHP_HTTP_PARAMS_QUERY          (PHP_HTTP_PARAMS_URLENCODED|PHP_HTTP_PARAMS_DIMENSION)
 #define PHP_HTTP_PARAMS_DEFAULT                (PHP_HTTP_PARAMS_ESCAPED|PHP_HTTP_PARAMS_RFC5987)
 
@@ -31,15 +32,15 @@ typedef struct php_http_params_opts {
        php_http_params_token_t **param;
        php_http_params_token_t **arg;
        php_http_params_token_t **val;
-       zval *defval;
+       zval defval;
        unsigned flags;
 } php_http_params_opts_t;
 
 PHP_HTTP_API php_http_params_opts_t *php_http_params_opts_default_get(php_http_params_opts_t *opts);
-PHP_HTTP_API HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t *opts TSRMLS_DC);
-PHP_HTTP_API php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf, HashTable *params, const char *pss, size_t psl, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags TSRMLS_DC);
+PHP_HTTP_API HashTable *php_http_params_parse(HashTable *params, const php_http_params_opts_t *opts);
+PHP_HTTP_API php_http_buffer_t *php_http_params_to_string(php_http_buffer_t *buf, HashTable *params, const char *pss, size_t psl, const char *ass, size_t asl, const char *vss, size_t vsl, unsigned flags);
 
-PHP_HTTP_API php_http_params_token_t **php_http_params_separator_init(zval *zv TSRMLS_DC);
+PHP_HTTP_API php_http_params_token_t **php_http_params_separator_init(zval *zv);
 PHP_HTTP_API void php_http_params_separator_free(php_http_params_token_t **separator);
 
 typedef php_http_object_t php_http_params_object_t;