use the params parser for query strings

[m6w6/ext-http] / php_http_url.h

diff --git a/php_http_url.h b/php_http_url.h
index bbb6177617e957acb3762570bdd7c893e011e381..65a764e6c1f899394298184b3c471a8a7aef4c06 100644 (file)
--- a/php_http_url.h
+++ b/php_http_url.h
@@ -6,15 +6,15 @@
     | 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-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id: php_http_url_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
 #ifndef PHP_HTTP_URL_H
 #define PHP_HTTP_URL_H
 
+#include <ext/standard/url.h>
+
 #define PHP_HTTP_URL_REPLACE           0x000
 #define PHP_HTTP_URL_JOIN_PATH         0x001
 #define PHP_HTTP_URL_JOIN_QUERY                0x002
@@ -33,12 +33,20 @@
        PHP_HTTP_URL_STRIP_FRAGMENT \
 )
 #define PHP_HTTP_URL_FROM_ENV          0x1000
+#define PHP_HTTP_URL_SANITIZE_PATH     0x2000
 
 PHP_HTTP_API void php_http_url(int flags, const php_url *old_url, const php_url *new_url, php_url **url_ptr, char **url_str, size_t *url_len TSRMLS_DC);
-PHP_HTTP_API char *php_http_url_absolute(const char *url, int flags TSRMLS_DC);
 
-PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, zend_bool override_argsep, char *pre_encoded_data, size_t pre_encoded_len, char **encoded_data, size_t *encoded_len TSRMLS_DC);
-PHP_HTTP_API STATUS php_http_url_encode_hash_recursive(HashTable *ht, php_http_buffer *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC);
+PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len TSRMLS_DC);
+PHP_HTTP_API STATUS php_http_url_encode_hash_ex(HashTable *hash, php_http_buffer_t *qstr, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *pre_encoded_str, size_t pre_encoded_len TSRMLS_DC);
+
+static inline void php_http_url_argsep(const char **str, size_t *len TSRMLS_DC)
+{
+       if (SUCCESS != php_http_ini_entry(ZEND_STRL("arg_separator.output"), str, len, 0 TSRMLS_CC) || !*len) {
+               *str = PHP_HTTP_URL_ARGSEP;
+               *len = lenof(PHP_HTTP_URL_ARGSEP);
+       }
+}
 
 static inline php_url *php_http_url_from_struct(php_url *url, HashTable *ht TSRMLS_DC)
 {
@@ -50,42 +58,42 @@ static inline php_url *php_http_url_from_struct(php_url *url, HashTable *ht TSRM
        memset(url, 0, sizeof(*url));
        
        if (SUCCESS == zend_hash_find(ht, "scheme", sizeof("scheme"), (void *) &e)) {
-               zval *cpy = php_http_zsep(IS_STRING, *e);
+               zval *cpy = php_http_ztyp(IS_STRING, *e);
                url->scheme = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
                zval_ptr_dtor(&cpy);
        }
        if (SUCCESS == zend_hash_find(ht, "user", sizeof("user"), (void *) &e)) {
-               zval *cpy = php_http_zsep(IS_STRING, *e);
+               zval *cpy = php_http_ztyp(IS_STRING, *e);
                url->user = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
                zval_ptr_dtor(&cpy);
        }
        if (SUCCESS == zend_hash_find(ht, "pass", sizeof("pass"), (void *) &e)) {
-               zval *cpy = php_http_zsep(IS_STRING, *e);
+               zval *cpy = php_http_ztyp(IS_STRING, *e);
                url->pass = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
                zval_ptr_dtor(&cpy);
        }
        if (SUCCESS == zend_hash_find(ht, "host", sizeof("host"), (void *) &e)) {
-               zval *cpy = php_http_zsep(IS_STRING, *e);
+               zval *cpy = php_http_ztyp(IS_STRING, *e);
                url->host = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
                zval_ptr_dtor(&cpy);
        }
        if (SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &e)) {
-               zval *cpy = php_http_zsep(IS_STRING, *e);
+               zval *cpy = php_http_ztyp(IS_STRING, *e);
                url->path = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
                zval_ptr_dtor(&cpy);
        }
        if (SUCCESS == zend_hash_find(ht, "query", sizeof("query"), (void *) &e)) {
-               zval *cpy = php_http_zsep(IS_STRING, *e);
+               zval *cpy = php_http_ztyp(IS_STRING, *e);
                url->query = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
                zval_ptr_dtor(&cpy);
        }
        if (SUCCESS == zend_hash_find(ht, "fragment", sizeof("fragment"), (void *) &e)) {
-               zval *cpy = php_http_zsep(IS_STRING, *e);
+               zval *cpy = php_http_ztyp(IS_STRING, *e);
                url->fragment = estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
                zval_ptr_dtor(&cpy);
        }
        if (SUCCESS == zend_hash_find(ht, "port", sizeof("port"), (void *) &e)) {
-               zval *cpy = php_http_zsep(IS_LONG, *e);
+               zval *cpy = php_http_ztyp(IS_LONG, *e);
                url->port = (unsigned short) Z_LVAL_P(cpy);
                zval_ptr_dtor(&cpy);
        }
@@ -102,9 +110,11 @@ static inline HashTable *php_http_url_to_struct(php_url *url, zval *strct TSRMLS
                        default:
                                zval_dtor(strct);
                                array_init(strct);
+                               /* no break */
                        case IS_ARRAY:
                        case IS_OBJECT:
                                INIT_PZVAL_ARRAY((&arr), HASH_OF(strct));
+                               break;
                }
        } else {
                INIT_PZVAL(&arr);
@@ -141,16 +151,17 @@ static inline HashTable *php_http_url_to_struct(php_url *url, zval *strct TSRMLS
        return Z_ARRVAL(arr);
 }
 
-extern zend_class_entry *php_http_url_class_entry;
-extern zend_function_entry php_http_url_method_entry[];
+zend_class_entry *php_http_url_get_class_entry(void);
 
 #define php_http_url_object_new php_http_object_new
 #define php_http_url_object_new_ex php_http_object_new_ex
 
 PHP_METHOD(HttpUrl, __construct);
+PHP_METHOD(HttpUrl, mod);
 PHP_METHOD(HttpUrl, toString);
+PHP_METHOD(HttpUrl, toArray);
 
-extern PHP_MINIT_FUNCTION(http_url);
+PHP_MINIT_FUNCTION(http_url);
 
 #endif