| 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_url_api.h 292841 2009-12-31 08:48:57Z mike $ */
-
#ifndef PHP_HTTP_URL_H
#define PHP_HTTP_URL_H
PHP_HTTP_URL_STRIP_FRAGMENT \
)
#define PHP_HTTP_URL_FROM_ENV 0x1000
+#define PHP_HTTP_URL_SANITIZE_PATH 0x2000
+
+typedef struct php_http_url_part {
+ char *str;
+ size_t len;
+} php_http_url_part_t;
+
+/* parse multibyte according to locale */
+#define PHP_HTTP_URL_PARSE_MBLOC 0x001
+/* parse utf8 multibyte sequences */
+#define PHP_HTTP_URL_PARSE_MBUTF8 0x002
+/* convert multibyte hostnames to IDNA */
+#define PHP_HTTP_URL_PARSE_IDN 0x010
+
+typedef struct php_http_url {
+ /* compatible to php_url, but do not use php_url_free() */
+ char *scheme;
+ char *user;
+ char *pass;
+ char *host;
+ unsigned short port;
+ char *path;
+ char *query;
+ char *fragment;
+ /* our stuff */
+#ifdef ZTS
+ void ***ts;
+#endif
+ const char *ptr;
+ const char *end;
+ size_t maxlen;
+ off_t offset;
+ unsigned flags;
+ char buffer[];
+} php_http_url_t;
+
+PHP_HTTP_API php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags TSRMLS_DC);
+PHP_HTTP_API void php_http_url_free(php_http_url_t **url);
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_t *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 void php_http_url_to_string(php_url *url, char **url_str, size_t *url_len TSRMLS_DC)
+{
+ php_http_buffer_t buf;
+
+ php_http_buffer_init(&buf);
+
+ if (url->scheme && *url->scheme) {
+ php_http_buffer_appendl(&buf, url->scheme);
+ php_http_buffer_appends(&buf, "://");
+ } else {
+ php_http_buffer_appends(&buf, "//");
+ }
+
+ if (url->user && *url->user) {
+ php_http_buffer_appendl(&buf, url->user);
+ if (url->pass && *url->pass) {
+ php_http_buffer_appends(&buf, ":");
+ php_http_buffer_appendl(&buf, url->pass);
+ }
+ php_http_buffer_appends(&buf, "@");
+ }
+
+ if (url->host && *url->host) {
+ php_http_buffer_appendl(&buf, url->host);
+ } else {
+ php_http_buffer_appends(&buf, "localhost");
+ }
+
+ if (url->port) {
+ php_http_buffer_appendf(&buf, ":%hu", url->port);
+ }
+
+ if (url->path && *url->path) {
+ php_http_buffer_appendl(&buf, url->path);
+ }
+
+ if (url->query && *url->query) {
+ php_http_buffer_appends(&buf, "?");
+ php_http_buffer_appendl(&buf, url->query);
+ }
+
+ if (url->fragment && *url->fragment) {
+ php_http_buffer_appends(&buf, "#");
+ php_http_buffer_appendl(&buf, url->fragment);
+ }
+
+ php_http_buffer_shrink(&buf);
+ php_http_buffer_fix(&buf);
+
+ if (url_len) {
+ *url_len = buf.used;
+ }
+
+ if (url_str) {
+ *url_str = buf.data;
+ } else {
+ php_http_buffer_dtor(&buf);
+ }
+}
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);
}
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);
return Z_ARRVAL(arr);
}
-extern zend_class_entry *php_http_url_class_entry;
-extern zend_function_entry php_http_url_method_entry[];
+PHP_HTTP_API zend_class_entry *php_http_url_class_entry;
+PHP_MINIT_FUNCTION(http_url);
#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, toString);
-
-extern PHP_MINIT_FUNCTION(http_url);
-
#endif
/*
projects / m6w6 / ext-http / blobdiff