X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_url_api.c;h=53faf9506f5417440570c2053df5e9c139011258;hp=83d295af4f58e92eb37c811fffcd6095c171c9a5;hb=7b88d9022c90eb12e5fe195af8644935141c9d68;hpb=5927520464dd6dc3aac3298ca05a1105740be3bd diff --git a/http_url_api.c b/http_url_api.c index 83d295a..53faf95 100644 --- a/http_url_api.c +++ b/http_url_api.c @@ -1,16 +1,13 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2005, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ @@ -19,161 +16,192 @@ # include "config.h" #endif -#include "php.h" -#include "zend_ini.h" -#include "php_output.h" -#include "ext/standard/url.h" +#define HTTP_WANT_NETDB +#include "php_http.h" #include "SAPI.h" +#include "zend_ini.h" +#include "php_output.h" +#include "ext/standard/php_string.h" -#include "phpstr/phpstr.h" - -#include "php_http.h" #include "php_http_api.h" #include "php_http_url_api.h" -#include "php_http_std_defs.h" - -#ifdef PHP_WIN32 -# include -#elif defined(HAVE_NETDB_H) -# include -#endif -ZEND_EXTERN_MODULE_GLOBALS(http); +PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC) +{ + char *abs = estrdup(url); + php_url *purl = php_url_parse(abs); + + STR_SET(abs, NULL); + + if (purl) { + http_build_url(purl, NULL, NULL, &abs, NULL); + php_url_free(purl); + } + + return abs; +} -/* {{{ char *http_absolute_url(char *) */ -PHP_HTTP_API char *_http_absolute_url_ex( - const char *url, size_t url_len, - const char *proto, size_t proto_len, - const char *host, size_t host_len, - unsigned port TSRMLS_DC) +/* {{{ void http_build_url(const php_url *, const php_url *, php_url **, char **, size_t *) */ +PHP_HTTP_API void _http_build_url(const php_url *old_url, const php_url *new_url, php_url **url_ptr, char **url_str, size_t *url_len TSRMLS_DC) { #if defined(PHP_WIN32) || defined(HAVE_NETDB_H) struct servent *se; #endif - php_url *purl, furl = {NULL}; - size_t full_len = 0; - zval *zhost = NULL; - char *scheme = NULL, *URL = ecalloc(1, HTTP_URI_MAXLEN + 1); - - if ((!url || !url_len) && ( - (!(url = SG(request_info).request_uri)) || - (!(url_len = strlen(SG(request_info).request_uri))))) { - http_error(E_WARNING, HTTP_E_PARAM, "Cannot build an absolute URI if supplied URL and REQUEST_URI is empty"); - return NULL; - } - - if (!(purl = php_url_parse((char *) url))) { - http_error_ex(E_WARNING, HTTP_E_PARSE, "Could not parse supplied URL: %s", url); - return NULL; - } - - furl.user = purl->user; - furl.pass = purl->pass; - furl.path = purl->path; - furl.query = purl->query; - furl.fragment = purl->fragment; - - if (proto && proto_len) { - furl.scheme = scheme = estrdup(proto); - } else if (purl->scheme) { - furl.scheme = purl->scheme; -#if defined(PHP_WIN32) || defined(HAVE_NETDB_H) - } else if (port && (se = getservbyport(port, "tcp"))) { - furl.scheme = (scheme = estrdup(se->s_name)); + php_url *url = emalloc(sizeof(php_url)); + +#define __URLCPY(n) \ + url->n = (new_url&&new_url->n) ? estrdup(new_url->n) : ((old_url&&old_url->n) ? estrdup(old_url->n) : NULL) + url->port = (new_url&&new_url->port) ? new_url->port : ((old_url) ? old_url->port : 0); + __URLCPY(scheme); + __URLCPY(user); + __URLCPY(pass); + __URLCPY(host); + __URLCPY(path); + __URLCPY(query); + __URLCPY(fragment); + + if (!url->scheme) { + switch (url->port) + { + case 443: + url->scheme = estrndup("https", lenof("https")); + break; + +#if !defined(PHP_WIN32) && !defined(HAVE_NETDB_H) + default: #endif - } else { - furl.scheme = "http"; - } - - if (port) { - furl.port = port; - } else if (purl->port) { - furl.port = purl->port; - } else if (strncmp(furl.scheme, "http", 4)) { + case 80: + url->scheme = estrndup("http", lenof("http")); + break; + #if defined(PHP_WIN32) || defined(HAVE_NETDB_H) - if (se = getservbyname(furl.scheme, "tcp")) { - furl.port = se->s_port; - } + default: + if ((se = getservbyport(htons(url->port), "tcp")) && se->s_name) { + url->scheme = estrdup(se->s_name); + } else { + url->scheme = estrndup("http", lenof("http")); + } + break; #endif - } else { - furl.port = (furl.scheme[4] == 's') ? 443 : 80; - } - - if (host) { - furl.host = (char *) host; - } else if (purl->host) { - furl.host = purl->host; - } else if ( (zhost = http_get_server_var("HTTP_HOST")) || - (zhost = http_get_server_var("SERVER_NAME"))) { - furl.host = Z_STRVAL_P(zhost); - } else { - furl.host = "localhost"; - } - -#define HTTP_URI_STRLCATS(URL, full_len, add_string) HTTP_URI_STRLCAT(URL, full_len, add_string, sizeof(add_string)-1) -#define HTTP_URI_STRLCATL(URL, full_len, add_string) HTTP_URI_STRLCAT(URL, full_len, add_string, strlen(add_string)) -#define HTTP_URI_STRLCAT(URL, full_len, add_string, add_len) \ - if ((full_len += add_len) > HTTP_URI_MAXLEN) { \ - http_error_ex(E_NOTICE, HTTP_E_URL, \ - "Absolute URI would have exceeded max URI length (%d bytes) - " \ - "tried to add %d bytes ('%s')", \ - HTTP_URI_MAXLEN, add_len, add_string); \ - if (scheme) { \ - efree(scheme); \ - } \ - php_url_free(purl); \ - return URL; \ - } else { \ - strcat(URL, add_string); \ - } - - HTTP_URI_STRLCATL(URL, full_len, furl.scheme); - HTTP_URI_STRLCATS(URL, full_len, "://"); - - if (furl.user) { - HTTP_URI_STRLCATL(URL, full_len, furl.user); - if (furl.pass) { - HTTP_URI_STRLCATS(URL, full_len, ":"); - HTTP_URI_STRLCATL(URL, full_len, furl.pass); } - HTTP_URI_STRLCATS(URL, full_len, "@"); } - HTTP_URI_STRLCATL(URL, full_len, furl.host); - - if ( (!strcmp(furl.scheme, "http") && (furl.port != 80)) || - (!strcmp(furl.scheme, "https") && (furl.port != 443))) { - char port_string[8] = {0}; - snprintf(port_string, 7, ":%u", furl.port); - HTTP_URI_STRLCATL(URL, full_len, port_string); + if (!url->host) { + zval *zhost; + + if ((((zhost = http_get_server_var("HTTP_HOST")) || + (zhost = http_get_server_var("SERVER_NAME")))) && Z_STRLEN_P(zhost)) { + url->host = estrndup(Z_STRVAL_P(zhost), Z_STRLEN_P(zhost)); + } else { + url->host = estrndup("localhost", lenof("localhost")); + } } - - if (furl.path) { - if (furl.path[0] != '/') { - HTTP_URI_STRLCATS(URL, full_len, "/"); + + if (!url->path) { + if (SG(request_info).request_uri && *SG(request_info).request_uri) { + const char *q = strchr(SG(request_info).request_uri, '?'); + + if (q) { + url->path = estrndup(SG(request_info).request_uri, q - SG(request_info).request_uri); + } else { + url->path = estrdup(SG(request_info).request_uri); + } + } else { + url->path = estrndup("/", 1); + } + } else if (*url->path != '/') { + if (SG(request_info).request_uri && *SG(request_info).request_uri) { + const char *q = strchr(SG(request_info).request_uri, '?'); + char *uri, *path; + size_t len; + + if (q) { + uri = estrndup(SG(request_info).request_uri, len = q - SG(request_info).request_uri); + } else { + uri = estrndup(SG(request_info).request_uri, len = strlen(SG(request_info).request_uri)); + } + + php_dirname(uri, len); + spprintf(&path, 0, "%s/%s", uri, url->path); + efree(uri); + STR_SET(url->path, path); + } else { + char *uri; + + spprintf(&uri, 0, "/%s", url->path); + STR_SET(url->path, uri); } - HTTP_URI_STRLCATL(URL, full_len, furl.path); - } else { - HTTP_URI_STRLCATS(URL, full_len, "/"); } - - if (furl.query) { - HTTP_URI_STRLCATS(URL, full_len, "?"); - HTTP_URI_STRLCATL(URL, full_len, furl.query); + + if (url->port) { + if ( ((url->port == 80) && !strcmp(url->scheme, "http")) + || ((url->port ==443) && !strcmp(url->scheme, "https")) +#if defined(PHP_WIN32) || defined(HAVE_NETDB_H) + || ((se = getservbyname(url->scheme, "tcp")) && se->s_port && + (url->port == ntohs(se->s_port))) +#endif + ) { + url->port = 0; + } } - - if (furl.fragment) { - HTTP_URI_STRLCATS(URL, full_len, "#"); - HTTP_URI_STRLCATL(URL, full_len, furl.fragment); + + if (url_str) { + size_t len; + + *url_str = emalloc(HTTP_URL_MAXLEN + 1); + + **url_str = '\0'; + strlcat(*url_str, url->scheme, HTTP_URL_MAXLEN); + strlcat(*url_str, "://", HTTP_URL_MAXLEN); + + if (url->user && *url->user) { + strlcat(*url_str, url->user, HTTP_URL_MAXLEN); + if (url->pass && *url->pass) { + strlcat(*url_str, ":", HTTP_URL_MAXLEN); + strlcat(*url_str, url->pass, HTTP_URL_MAXLEN); + } + strlcat(*url_str, "@", HTTP_URL_MAXLEN); + } + + strlcat(*url_str, url->host, HTTP_URL_MAXLEN); + + if (url->port) { + char port_str[6] = {0}; + + snprintf(port_str, 5, "%d", (int) url->port); + strlcat(*url_str, ":", HTTP_URL_MAXLEN); + strlcat(*url_str, port_str, HTTP_URL_MAXLEN); + } + + if (*url->path != '/') { + strlcat(*url_str, "/", HTTP_URL_MAXLEN); + } + strlcat(*url_str, url->path, HTTP_URL_MAXLEN); + + if (url->query && *url->query) { + strlcat(*url_str, "?", HTTP_URL_MAXLEN); + strlcat(*url_str, url->query, HTTP_URL_MAXLEN); + } + + if (url->fragment && *url->fragment) { + strlcat(*url_str, "#", HTTP_URL_MAXLEN); + strlcat(*url_str, url->fragment, HTTP_URL_MAXLEN); + } + + if (HTTP_URL_MAXLEN == (len = strlen(*url_str))) { + http_error(HE_NOTICE, HTTP_E_URL, "Length of URL exceeds HTTP_URL_MAXLEN"); + } + if (url_len) { + *url_len = len; + } } - - if (scheme) { - efree(scheme); + + if (url_ptr) { + *url_ptr = url; + } else { + php_url_free(url); } - php_url_free(purl); - - return URL; } /* }}} */ @@ -183,188 +211,119 @@ PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, zend_bool override_ char **encoded_data, size_t *encoded_len TSRMLS_DC) { char *arg_sep; + size_t arg_sep_len; phpstr *qstr = phpstr_new(); - if (override_argsep || !strlen(arg_sep = INI_STR("arg_separator.output"))) { + if (override_argsep || !(arg_sep_len = strlen(arg_sep = INI_STR("arg_separator.output")))) { arg_sep = HTTP_URL_ARGSEP; + arg_sep_len = lenof(HTTP_URL_ARGSEP); } if (pre_encoded_len && pre_encoded_data) { phpstr_append(qstr, pre_encoded_data, pre_encoded_len); } - if (SUCCESS != http_urlencode_hash_implementation(hash, qstr, arg_sep)) { - phpstr_free(qstr); + if (SUCCESS != http_urlencode_hash_recursive(hash, qstr, arg_sep, arg_sep_len, NULL, 0)) { + phpstr_free(&qstr); return FAILURE; } phpstr_data(qstr, encoded_data, encoded_len); - phpstr_free(qstr); + phpstr_free(&qstr); return SUCCESS; } /* }}} */ -/* {{{ http_urlencode_hash_implementation - Original Author: Sara Golemon */ -PHP_HTTP_API STATUS _http_urlencode_hash_implementation_ex( - HashTable *ht, phpstr *formstr, char *arg_sep, - const char *num_prefix, int num_prefix_len, - const char *key_prefix, int key_prefix_len, - const char *key_suffix, int key_suffix_len, - zval *type TSRMLS_DC) +/* {{{ http_urlencode_hash_recursive */ +PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC) { - char *key = NULL, *ekey, *newprefix, *p; - int arg_sep_len, key_len, ekey_len, key_type, newprefix_len; - ulong idx; - zval **zdata = NULL, *copyzval; - - if (!ht || !formstr) { - http_error(E_WARNING, HTTP_E_PARAM, "Invalid parameters"); + char *key = NULL; + uint len = 0; + ulong idx = 0; + zval **data = NULL; + HashPosition pos; + + if (!ht || !str) { + http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid parameters"); return FAILURE; } - if (ht->nApplyCount > 0) { - /* Prevent recursion */ return SUCCESS; } - - if (!arg_sep || !strlen(arg_sep)) { - arg_sep = HTTP_URL_ARGSEP; - } - arg_sep_len = strlen(arg_sep); - - for (zend_hash_internal_pointer_reset(ht); - (key_type = zend_hash_get_current_key_ex(ht, &key, &key_len, &idx, 0, NULL)) != HASH_KEY_NON_EXISTANT; - zend_hash_move_forward(ht) - ) { - if (key_type == HASH_KEY_IS_STRING && key_len && key[key_len-1] == '\0') { - /* We don't want that trailing NULL */ - key_len -= 1; + + FOREACH_HASH_KEYLENVAL(pos, ht, key, len, idx, data) { + char *encoded_key; + int encoded_len; + phpstr new_prefix; + + if (!data || !*data) { + return FAILURE; } - -#ifdef ZEND_ENGINE_2 - /* handling for private & protected object properties */ - if (key && *key == '\0' && type != NULL) { - char *tmp; - - zend_object *zobj = zend_objects_get_address(type TSRMLS_CC); - if (zend_check_property_access(zobj, key TSRMLS_CC) != SUCCESS) { - /* private or protected property access outside of the class */ - continue; + + if (key) { + if (len && key[len - 1] == '\0') { + --len; } - zend_unmangle_property_name(key, &tmp, &key); - key_len = strlen(key); + encoded_key = php_url_encode(key, len, &encoded_len); + key = NULL; + } else { + encoded_len = spprintf(&encoded_key, 0, "%ld", idx); } -#endif - - if (zend_hash_get_current_data_ex(ht, (void **)&zdata, NULL) == FAILURE || !zdata || !(*zdata)) { - http_error(E_WARNING, HTTP_E_ENCODE, "Error traversing form data array."); - return FAILURE; + + { + phpstr_init(&new_prefix); + if (prefix && prefix_len) { + phpstr_append(&new_prefix, prefix, prefix_len); + phpstr_appends(&new_prefix, "["); + } + + phpstr_append(&new_prefix, encoded_key, encoded_len); + efree(encoded_key); + + if (prefix && prefix_len) { + phpstr_appends(&new_prefix, "]"); + } + phpstr_fix(&new_prefix); } - if (Z_TYPE_PP(zdata) == IS_ARRAY || Z_TYPE_PP(zdata) == IS_OBJECT) { - if (key_type == HASH_KEY_IS_STRING) { - ekey = php_url_encode(key, key_len, &ekey_len); - newprefix_len = key_suffix_len + ekey_len + key_prefix_len + 1; - newprefix = emalloc(newprefix_len + 1); - p = newprefix; - - if (key_prefix) { - memcpy(p, key_prefix, key_prefix_len); - p += key_prefix_len; - } - - memcpy(p, ekey, ekey_len); - p += ekey_len; - efree(ekey); - - if (key_suffix) { - memcpy(p, key_suffix, key_suffix_len); - p += key_suffix_len; - } - - *(p++) = '['; - *p = '\0'; - } else { - /* Is an integer key */ - ekey_len = spprintf(&ekey, 12, "%ld", idx); - newprefix_len = key_prefix_len + num_prefix_len + ekey_len + key_suffix_len + 1; - newprefix = emalloc(newprefix_len + 1); - p = newprefix; - - if (key_prefix) { - memcpy(p, key_prefix, key_prefix_len); - p += key_prefix_len; - } - - memcpy(p, num_prefix, num_prefix_len); - p += num_prefix_len; - - memcpy(p, ekey, ekey_len); - p += ekey_len; - efree(ekey); - - if (key_suffix) { - memcpy(p, key_suffix, key_suffix_len); - p += key_suffix_len; - } - *(p++) = '['; - *p = '\0'; + + if (Z_TYPE_PP(data) == IS_ARRAY) { + STATUS status; + ++ht->nApplyCount; + status = http_urlencode_hash_recursive(Z_ARRVAL_PP(data), str, arg_sep, arg_sep_len, PHPSTR_VAL(&new_prefix), PHPSTR_LEN(&new_prefix)); + --ht->nApplyCount; + if (SUCCESS != status) { + phpstr_dtor(&new_prefix); + return FAILURE; } - ht->nApplyCount++; - http_urlencode_hash_implementation_ex(HASH_OF(*zdata), formstr, arg_sep, - NULL, 0, newprefix, newprefix_len, "]", 1, (Z_TYPE_PP(zdata) == IS_OBJECT ? *zdata : NULL)); - ht->nApplyCount--; - efree(newprefix); - } else if (Z_TYPE_PP(zdata) == IS_NULL || Z_TYPE_PP(zdata) == IS_RESOURCE) { - /* Skip these types */ - continue; } else { - if (formstr->used) { - phpstr_append(formstr, arg_sep, arg_sep_len); + zval *val; + + ALLOC_ZVAL(val); + *val = **data; + INIT_PZVAL(val); + zval_copy_ctor(val); + convert_to_string(val); + + if (PHPSTR_LEN(str)) { + phpstr_append(str, arg_sep, arg_sep_len); } - /* Simple key=value */ - phpstr_append(formstr, key_prefix, key_prefix_len); - if (key_type == HASH_KEY_IS_STRING) { - ekey = php_url_encode(key, key_len, &ekey_len); - phpstr_append(formstr, ekey, ekey_len); - efree(ekey); - } else { - /* Numeric key */ - if (num_prefix) { - phpstr_append(formstr, num_prefix, num_prefix_len); - } - ekey_len = spprintf(&ekey, 12, "%ld", idx); - phpstr_append(formstr, ekey, ekey_len); - efree(ekey); + phpstr_append(str, PHPSTR_VAL(&new_prefix), PHPSTR_LEN(&new_prefix)); + phpstr_appends(str, "="); + + if (Z_STRLEN_P(val) && Z_STRVAL_P(val)) { + char *encoded_val; + int encoded_len; + + encoded_val = php_url_encode(Z_STRVAL_P(val), Z_STRLEN_P(val), &encoded_len); + phpstr_append(str, encoded_val, encoded_len); + efree(encoded_val); } - phpstr_append(formstr, key_suffix, key_suffix_len); - phpstr_appends(formstr, "="); - switch (Z_TYPE_PP(zdata)) { - case IS_STRING: - ekey = php_url_encode(Z_STRVAL_PP(zdata), Z_STRLEN_PP(zdata), &ekey_len); - break; - case IS_LONG: - case IS_BOOL: - ekey_len = spprintf(&ekey, 12, "%ld", Z_LVAL_PP(zdata)); - break; - case IS_DOUBLE: - ekey_len = spprintf(&ekey, 48, "%.*G", (int) EG(precision), Z_DVAL_PP(zdata)); - break; - default: - /* fall back on convert to string */ - MAKE_STD_ZVAL(copyzval); - *copyzval = **zdata; - zval_copy_ctor(copyzval); - convert_to_string_ex(©zval); - ekey = php_url_encode(Z_STRVAL_P(copyzval), Z_STRLEN_P(copyzval), &ekey_len); - zval_ptr_dtor(©zval); - } - phpstr_append(formstr, ekey, ekey_len); - efree(ekey); + + zval_ptr_dtor(&val); } + phpstr_dtor(&new_prefix); } - return SUCCESS; } /* }}} */