X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_params.h;h=42f56f901c5249b2bf12d661761ab048d49a56c7;hp=3aa446f4f9c5f3cc04b369f5ab1a02edb5850ce7;hb=refs%2Fheads%2Fv2.4.x;hpb=8d05291f42b3b42159b3fe91492aa4862f3d4405

diff --git a/php_http_params.h b/php_http_params.h
index 3aa446f..42f56f9 100644
--- a/php_http_params.h
+++ b/php_http_params.h
@@ -6,23 +6,50 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 #ifndef PHP_HTTP_PARAMS_H
 #define PHP_HTTP_PARAMS_H
 
-#define PHP_HTTP_PARAMS_ALLOW_COMMA			0x01
-#define PHP_HTTP_PARAMS_ALLOW_FAILURE		0x02
-#define PHP_HTTP_PARAMS_RAISE_ERROR			0x04
-#define PHP_HTTP_PARAMS_DEFAULT	(PHP_HTTP_PARAMS_ALLOW_COMMA|PHP_HTTP_PARAMS_ALLOW_FAILURE|PHP_HTTP_PARAMS_RAISE_ERROR)
-#define PHP_HTTP_PARAMS_COLON_SEPARATOR		0x10
+typedef struct php_http_params_token {
+	char *str;
+	size_t len;
+} php_http_params_token_t;
 
-typedef void (*php_http_params_parse_func_t)(void *cb_arg, const char *key, int keylen, const char *val, int vallen TSRMLS_DC);
+#define PHP_HTTP_PARAMS_RAW			0x00
+#define PHP_HTTP_PARAMS_ESCAPED		0x01
+#define PHP_HTTP_PARAMS_URLENCODED	0x04
+#define PHP_HTTP_PARAMS_DIMENSION	0x08
+#define PHP_HTTP_PARAMS_RFC5987		0x10
+#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)
 
-PHP_HTTP_API void php_http_params_parse_default_func(void *ht, const char *key, int keylen, const char *val, int vallen TSRMLS_DC);
-PHP_HTTP_API STATUS php_http_params_parse(const char *params, int flags, php_http_params_parse_func_t cb, void *cb_arg TSRMLS_DC);
+typedef struct php_http_params_opts {
+	php_http_params_token_t input;
+	php_http_params_token_t **param;
+	php_http_params_token_t **arg;
+	php_http_params_token_t **val;
+	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 php_http_params_token_t **php_http_params_separator_init(zval *zv TSRMLS_DC);
+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;
+
+PHP_HTTP_API zend_class_entry *php_http_params_class_entry;
+
+PHP_MINIT_FUNCTION(http_params);
+
+#define php_http_params_object_new php_http_object_new
+#define php_http_params_object_new_ex php_http_object_new_ex
 
 #endif