}
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) {
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();
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);
}