#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
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_recursive(HashTable *ht, php_http_buffer_t *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC);
static inline php_url *php_http_url_from_struct(php_url *url, HashTable *ht TSRMLS_DC)
{
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);
}