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 c570017f8c46bcf984dff7b87e5ae6a3c6ba0563..b8892101e15d28bc83d7590b34d6e3080e6127ab 100644 (file)
--- a/php_http_params.h
+++ b/php_http_params.h
@@ -6,25 +6,51 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_api.h 298891 2010-05-03 08:26:38Z mike $ */
-
 #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;
+
+#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_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)
+
+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);
+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);
+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;
 
-typedef void (*php_http_params_parse_func_t)(void *cb_arg, const char *key, int keylen, const char *val, int vallen TSRMLS_DC);
+PHP_MINIT_FUNCTION(http_params);
 
-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);
+#define php_http_params_object_new php_http_object_new
+#define php_http_params_object_new_ex php_http_object_new_ex
 
 #endif