Bug #2333 » server_name.patch
| mod_fastcgi.c 2012-03-22 11:15:28.000000000 +0800 | ||
|---|---|---|
|
if (con->server_name->used) {
|
||
|
size_t len = con->server_name->used - 1;
|
||
|
char *colon = strchr(con->server_name->ptr, ':');
|
||
|
char *colon;
|
||
|
#ifdef HAVE_IPV6
|
||
|
if (srv_sock->addr.plain.sa_family == AF_INET6 && con->server_name->ptr[0] == '[') {
|
||
|
colon = strstr(con->server_name->ptr, "]:");
|
||
|
if (colon) len = (colon + 1) - con->server_name->ptr;
|
||
|
} else {
|
||
|
colon = strchr(con->server_name->ptr, ':');
|
||
|
if (colon) len = colon - con->server_name->ptr;
|
||
|
}
|
||
|
#else
|
||
|
colon = strchr(con->server_name->ptr, ':');
|
||
|
if (colon) len = colon - con->server_name->ptr;
|
||
|
#endif
|
||
|
FCGI_ENV_ADD_CHECK(fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SERVER_NAME"), con->server_name->ptr, len),con)
|
||
|
} else {
|
||
|
-- mod_cgi.c.orig 2012-03-16 10:50:53.000000000 +0800
|
||
|
++ mod_cgi.c 2012-03-22 11:16:44.000000000 +0800
|
||
| ... | ... | |
|
if (!buffer_is_empty(con->server_name)) {
|
||
|
size_t len = con->server_name->used - 1;
|
||
|
char *colon = strchr(con->server_name->ptr, ':');
|
||
|
char *colon;
|
||
|
#ifdef HAVE_IPV6
|
||
|
if (srv_sock->addr.plain.sa_family == AF_INET6 && con->server_name->ptr[0] == '[') {
|
||
|
colon = strstr(con->server_name->ptr, "]:");
|
||
|
if (colon) len = (colon + 1) - con->server_name->ptr;
|
||
|
} else {
|
||
|
colon = strchr(con->server_name->ptr, ':');
|
||
|
if (colon) len = colon - con->server_name->ptr;
|
||
|
}
|
||
|
#else
|
||
|
colon = strchr(con->server_name->ptr, ':');
|
||
|
if (colon) len = colon - con->server_name->ptr;
|
||
|
#endif
|
||
|
cgi_env_add(&env, CONST_STR_LEN("SERVER_NAME"), con->server_name->ptr, len);
|
||
|
} else {
|
||