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");
/* {{{ 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));
}
if (!url->scheme) {
- zval *https = http_get_server_var("HTTPS");
+ zval *https = http_get_server_var("HTTPS", 1);
if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) {
url->scheme = estrndup("https", lenof("https"));
} else switch (url->port) {
url->scheme = estrndup("https", lenof("https"));
break;
-#ifndef HTTP_HAVE_NETDB
+#ifndef HAVE_GETSERVBYPORT
default:
#endif
case 80:
url->scheme = estrndup("http", lenof("http"));
break;
-#ifdef HTTP_HAVE_NETDB
+#ifdef HAVE_GETSERVBYPORT
default:
if ((se = getservbyport(htons(url->port), "tcp")) && se->s_name) {
url->scheme = estrdup(se->s_name);
if (!url->host) {
zval *zhost;
- if ((((zhost = http_get_server_var("HTTP_HOST")) ||
- (zhost = http_get_server_var("SERVER_NAME")))) && Z_STRLEN_P(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->path = estrndup("/", 1);
}
- } else if (url->path[0] != '/' && 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;
-
- if (SG(request_info).request_uri[ulen-1] != '/') {
- for (--ulen; ulen && SG(request_info).request_uri[ulen - 1] != '/'; --ulen);
+ } else if (url->path[0] != '/') {
+ if (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;
+
+ if (SG(request_info).request_uri[ulen-1] != '/') {
+ for (--ulen; ulen && SG(request_info).request_uri[ulen - 1] != '/'; --ulen);
+ }
+
+ path = emalloc(ulen + plen + 1);
+ memcpy(path, SG(request_info).request_uri, ulen);
+ memcpy(path + ulen, url->path, plen);
+ path[ulen + plen] = '\0';
+ STR_SET(url->path, path);
+ } else {
+ size_t plen = strlen(url->path);
+ char *path = emalloc(plen + 1 + 1);
+
+ path[0] = '/';
+ memcpy(&path[1], url->path, plen + 1);
+ STR_SET(url->path, path);
}
-
- path = emalloc(ulen + plen + 1);
- memcpy(path, SG(request_info).request_uri, ulen);
- memcpy(path + ulen, url->path, plen);
- path[ulen + plen] = '\0';
- STR_SET(url->path, path);
}
/* replace directory references if path is not a single slash */
if (url->path[0] && (url->path[0] != '/' || url->path[1])) {
}
}
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);
}
- if (*url->path != '/') {
- strlcat(*url_str, "/", HTTP_URL_MAXLEN);
- }
strlcat(*url_str, url->path, HTTP_URL_MAXLEN);
if (url->query && *url->query) {
/* {{{ 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 (len && key[len - 1] == '\0') {
- --len;
+ if (key.type == HASH_KEY_IS_STRING) {
+ if (!*key.str) {
+ /* only public properties */
+ continue;
+ }
+ 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);
}
{
phpstr_fix(&new_prefix);
}
- if (Z_TYPE_PP(data) == IS_ARRAY) {
+ if (Z_TYPE_PP(data) == IS_ARRAY || Z_TYPE_PP(data) == IS_OBJECT) {
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));
+ status = http_urlencode_hash_recursive(HASH_OF(*data), str, arg_sep, arg_sep_len, PHPSTR_VAL(&new_prefix), PHPSTR_LEN(&new_prefix));
--ht->nApplyCount;
if (SUCCESS != status) {
phpstr_dtor(&new_prefix);