| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
if (SUCCESS == gethostname(hostname, lenof(hostname))) {
return estrdup(hostname);
}
-#elif defined(HAVE_UNISTD_H)
+#elif defined(HAVE_GETHOSTNAME)
if (SUCCESS == gethostname(hostname, lenof(hostname))) {
+# if defined(HAVE_GETDOMAINNAME)
size_t hlen = strlen(hostname);
-
if (hlen <= lenof(hostname) - lenof("(none)")) {
hostname[hlen++] = '.';
if (SUCCESS == getdomainname(&hostname[hlen], lenof(hostname) - hlen)) {
return estrdup(hostname);
}
}
+# endif
+ if (strcmp(hostname, "(none)")) {
+ return estrdup(hostname);
+ }
}
#endif
- return estrdup("localhost");
+ return estrndup("localhost", lenof("localhost"));
}
PHP_MINIT_FUNCTION(http_url)
HTTP_LONG_CONSTANT("HTTP_URL_STRIP_QUERY", HTTP_URL_STRIP_QUERY);
HTTP_LONG_CONSTANT("HTTP_URL_STRIP_FRAGMENT", HTTP_URL_STRIP_FRAGMENT);
HTTP_LONG_CONSTANT("HTTP_URL_STRIP_ALL", HTTP_URL_STRIP_ALL);
+ HTTP_LONG_CONSTANT("HTTP_URL_FROM_ENV", HTTP_URL_FROM_ENV);
return SUCCESS;
}
-PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC)
+PHP_HTTP_API char *_http_absolute_url_ex(const char *url, int flags TSRMLS_DC)
{
char *abs = NULL;
php_url *purl = NULL;
}
}
- http_build_url(0, purl, NULL, NULL, &abs, NULL);
+ http_build_url(flags, purl, NULL, NULL, &abs, NULL);
if (purl) {
php_url_free(purl);
/* {{{ void http_build_url(int flags, const php_url *, const php_url *, php_url **, char **, size_t *) */
PHP_HTTP_API void _http_build_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)
{
-#ifdef HTTP_HAVE_NETDB
+#if defined(HAVE_GETSERVBYPORT) || defined(HAVE_GETSERVBYNAME)
struct servent *se;
#endif
php_url *url = ecalloc(1, sizeof(php_url));
url->n = __URLSET(new_url,n) ? estrdup(new_url->n) : (__URLSET(old_url,n) ? estrdup(old_url->n) : NULL)
if (!(flags & HTTP_URL_STRIP_PORT)) {
- url->port = (new_url&&new_url->port) ? new_url->port : ((old_url) ? old_url->port : 0);
+ url->port = __URLSET(new_url, port) ? new_url->port : ((old_url) ? old_url->port : 0);
}
if (!(flags & HTTP_URL_STRIP_USER)) {
__URLCPY(user);
}
if (!url->scheme) {
- zval *https = http_get_server_var("HTTPS");
- if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) {
- url->scheme = estrndup("https", lenof("https"));
- } else switch (url->port) {
- case 443:
+ if (flags & HTTP_URL_FROM_ENV) {
+ zval *https = http_get_server_var("HTTPS", 1);
+ if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) {
url->scheme = estrndup("https", lenof("https"));
- break;
+ } else switch (url->port) {
+ case 443:
+ url->scheme = estrndup("https", lenof("https"));
+ break;
-#ifndef HTTP_HAVE_NETDB
- default:
+#ifndef HAVE_GETSERVBYPORT
+ default:
#endif
- case 80:
- url->scheme = estrndup("http", lenof("http"));
- break;
-
-#ifdef HTTP_HAVE_NETDB
- default:
- if ((se = getservbyport(htons(url->port), "tcp")) && se->s_name) {
- url->scheme = estrdup(se->s_name);
- } else {
+ case 80:
+ case 0:
url->scheme = estrndup("http", lenof("http"));
- }
- break;
+ break;
+
+#ifdef HAVE_GETSERVBYPORT
+ 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 {
+ url->scheme = estrndup("http", lenof("http"));
}
}
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));
+ if (flags & HTTP_URL_FROM_ENV) {
+ zval *zhost;
+
+ if ((((zhost = http_get_server_var("HTTP_HOST", 1)) ||
+ (zhost = http_get_server_var("SERVER_NAME", 1)))) && Z_STRLEN_P(zhost)) {
+ url->host = estrndup(Z_STRVAL_P(zhost), Z_STRLEN_P(zhost));
+ } else {
+ url->host = localhostname();
+ }
} else {
- url->host = localhostname();
+ url->host = estrndup("localhost", lenof("localhost"));
}
}
if (!url->path) {
- if (SG(request_info).request_uri && SG(request_info).request_uri[0]) {
+ if ((flags & HTTP_URL_FROM_ENV) && SG(request_info).request_uri && SG(request_info).request_uri[0]) {
const char *q = strchr(SG(request_info).request_uri, '?');
if (q) {
url->path = estrndup("/", 1);
}
} else if (url->path[0] != '/') {
- if (SG(request_info).request_uri && SG(request_info).request_uri[0]) {
+ if ((flags & HTTP_URL_FROM_ENV) && SG(request_info).request_uri && SG(request_info).request_uri[0]) {
size_t ulen = strlen(SG(request_info).request_uri);
size_t plen = strlen(url->path);
char *path;
}
}
memmove(&ptr[1], pos, end - pos);
+ break;
+ } else if (!ptr[3]) {
+ /* .. at the end */
+ ptr[1] = '\0';
}
- break;
+ /* fallthrough */
default:
/* something else */
if (url->port) {
if ( ((url->port == 80) && !strcmp(url->scheme, "http"))
|| ((url->port ==443) && !strcmp(url->scheme, "https"))
-#ifdef HTTP_HAVE_NETDB
+#ifdef HAVE_GETSERVBYNAME
|| ((se = getservbyname(url->scheme, "tcp")) && se->s_port &&
(url->port == ntohs(se->s_port)))
#endif
strlcat(*url_str, url->host, HTTP_URL_MAXLEN);
if (url->port) {
- char port_str[8] = {0};
+ char port_str[8];
- snprintf(port_str, lenof(port_str), "%d", (int) url->port);
+ snprintf(port_str, sizeof(port_str), "%d", (int) url->port);
strlcat(*url_str, ":", HTTP_URL_MAXLEN);
strlcat(*url_str, port_str, HTTP_URL_MAXLEN);
}
/* {{{ 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;
- uint len = 0;
- ulong idx = 0;
+ HashKey key = initHashKey(0);
zval **data = NULL;
HashPosition pos;
return SUCCESS;
}
- FOREACH_HASH_KEYLENVAL(pos, ht, key, len, idx, data) {
+ FOREACH_HASH_KEYVAL(pos, ht, key, data) {
char *encoded_key;
int encoded_len;
phpstr new_prefix;
return FAILURE;
}
- if (key) {
- if (!*key) {
+ if (key.type == HASH_KEY_IS_STRING) {
+ if (!*key.str) {
/* only public properties */
continue;
}
- if (len && key[len - 1] == '\0') {
- --len;
+ if (key.len && key.str[key.len - 1] == '\0') {
+ --key.len;
}
- encoded_key = php_url_encode(key, len, &encoded_len);
- key = NULL;
+ encoded_key = php_url_encode(key.str, key.len, &encoded_len);
} else {
- encoded_len = spprintf(&encoded_key, 0, "%ld", idx);
+ encoded_len = spprintf(&encoded_key, 0, "%ld", key.num);
}
{
return FAILURE;
}
} else {
- zval *val = zval_copy(IS_STRING, *data);
+ zval *val = http_zsep(IS_STRING, *data);
if (PHPSTR_LEN(str)) {
phpstr_append(str, arg_sep, arg_sep_len);
efree(encoded_val);
}
- zval_free(&val);
+ zval_ptr_dtor(&val);
}
phpstr_dtor(&new_prefix);
}
projects / m6w6 / ext-http / blobdiff