X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_params.h;h=b8892101e15d28bc83d7590b34d6e3080e6127ab;hp=716cba8cc478731d42a8b3a302749398e213699b;hb=468e8d748d365811af4ce890fd8fc4c1f88cc08a;hpb=58410541834f8f897291c290d38e7a505dbb93c1

diff --git a/php_http_params.h b/php_http_params.h
index 716cba8..b889210 100644
--- a/php_http_params.h
+++ b/php_http_params.h
@@ -6,7 +6,7 @@
     | 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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -19,44 +19,39 @@ typedef struct php_http_params_token {
 } php_http_params_token_t;
 
 #define PHP_HTTP_PARAMS_RAW			0x00
-#define PHP_HTTP_PARAMS_DEFAULT		0x01
+#define PHP_HTTP_PARAMS_ESCAPED		0x01
 #define PHP_HTTP_PARAMS_URLENCODED	0x04
 #define PHP_HTTP_PARAMS_DIMENSION	0x08
-#define PHP_HTTP_PARAMS_QUERY	(PHP_HTTP_PARAMS_URLENCODED|PHP_HTTP_PARAMS_DIMENSION)
+#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;
+	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;
 
-zend_class_entry *php_http_params_get_class_entry(void);
+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
 
-PHP_METHOD(HttpParams, __construct);
-PHP_METHOD(HttpParams, toString);
-PHP_METHOD(HttpParams, toArray);
-PHP_METHOD(HttpParams, offsetExists);
-PHP_METHOD(HttpParams, offsetUnset);
-PHP_METHOD(HttpParams, offsetSet);
-PHP_METHOD(HttpParams, offsetGet);
-
 #endif
 
 /*