entrouvert
/
modmellon
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Change implementation of am_get_endpoint_url to use ap_construct_url 

ap_construct_url() use the ServerName directive to reconstruct an
absolute URL. It allows to force the use of an https:// URL (when you
are behind an SSL proxy it is needed) by configuring your VirtualHost
like that:

ServerName https://example.com

git-svn-id: https://modmellon.googlecode.com/svn/trunk/mod_mellon2@110 a716ebb1-153a-0410-b759-cfb97c6a1b53
This commit is contained in:
benjamin.dauvergne 2010-10-21 13:07:50 +00:00
parent 808bb7f277
commit f0ca39b15e
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
auth_mellon_util.c
View File

@ -802,32 +802,9 @@ char *am_htmlencode(request_rec *r, const char *str)
*/
char *am_get_endpoint_url(request_rec *r)
{
static APR_OPTIONAL_FN_TYPE(ssl_is_https) *am_is_https = NULL;
am_dir_cfg_rec *cfg = am_get_dir_cfg(r);
apr_pool_t *p = r->pool;
server_rec *s = r->server;
apr_port_t default_port;
char *port;
char *scheme;
am_is_https = APR_RETRIEVE_OPTIONAL_FN(ssl_is_https);
if (am_is_https && am_is_https(r->connection)) {
scheme = "https://";
default_port = DEFAULT_HTTPS_PORT;
} else {
scheme = "http://";
default_port = DEFAULT_HTTP_PORT;
}
if (s->addrs->host_port != default_port)
port = apr_psprintf(p, ":%d", s->addrs->host_port);
else
port = "";
return apr_psprintf(p, "%s%s%s%s", scheme,
s->server_hostname,
port, cfg->endpoint_path);
return ap_construct_url(r->pool, cfg->endpoint_path, r);
}
/*