core_server_config *conf = ap_get_module_config(sconf, &core_module);
/* Make it absolute, relative to ServerRoot */
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
- "[mod_vhost_ldap.c] set_document_root: translating DocumentRoot [%s]",
- arg);
arg = ap_server_root_relative(r->pool, arg);
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
- "[mod_vhost_ldap.c] set_document_root: relative DocumentRoot [%s]",
- arg);
+
if (arg == NULL) {
- ap_log_rerror(APLOG_MARK, APLOG_WARNING|APLOG_NOERRNO, 0, r,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
"[mod_vhost_ldap.c] set_document_root: DocumentRoot [%s] must be a directory",
arg);
APR_FILEPATH_TRUENAME, r->pool) != APR_SUCCESS
|| !ap_is_directory(r->pool, arg)) {
- ap_log_rerror(APLOG_MARK, APLOG_STARTUP, 0,
+ ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0,
r,
"[mod_vhost_ldap.c] set_document_root: Warning: DocumentRoot [%s] does not exist",
arg);
char *cgi;
const char *hostname = NULL;
int is_fallback = 0;
+ int sleep = 1;
reqc =
(mod_vhost_ldap_request_t *)apr_pcalloc(r->pool, sizeof(mod_vhost_ldap_request_t));
fallback:
ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
- "[mod_vhost_ldap.c]: translating %s", r->uri);
+ "[mod_vhost_ldap.c]: translating hostname [%s], uri [%s]", hostname, r->uri);
apr_snprintf(filtbuf, FILTER_LENGTH, "(&(%s)(|(apacheServerName=%s)(apacheServerAlias=%s)))", conf->filter, hostname, hostname);
util_ldap_connection_close(ldc);
/* sanity check - if server is down, retry it up to 5 times */
- if (result == LDAP_SERVER_DOWN) {
+ if (AP_LDAP_IS_SERVER_DOWN(result) ||
+ (result == LDAP_TIMEOUT) ||
+ (result == LDAP_CONNECT_ERROR)) {
if (failures++ <= 5) {
+ /* Back-off exponentially */
+ apr_sleep(apr_time_from_sec(sleep));
+ sleep = sleep*2;
goto start_over;
} else {
return HTTP_GATEWAY_TIME_OUT;
}
}
if (cgi) {
- cgi = apr_pstrcat (r->pool, reqc->cgiroot, cgi + strlen("cgi-bin"), NULL);
+ /* Set exact filename for CGI script */
+ cgi = apr_pstrcat(r->pool, reqc->cgiroot, cgi + strlen("cgi-bin"), NULL);
if ((cgi = ap_server_root_relative(r->pool, cgi))) {
ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
"[mod_vhost_ldap.c]: ap_document_root is: %s", ap_document_root(r));
apr_table_setn(r->notes, "alias-forced-type", r->handler);
}
} else if (r->uri[0] == '/') {
- /* r->filename = apr_pstrdup(r->pool, r->uri); */
- /* r->filename = apr_pstrcat (r->pool, reqc->docroot, r->uri, NULL); */
+ /* we don't set r->filename here, and let other modules do it
+ * this allows other modules (mod_rewrite.c) to work as usual
+ */
+ /* r->filename = apr_pstrcat (r->pool, reqc->docroot, r->uri, NULL); */
} else {
+ /* We don't handle non-file requests here */
return DECLINED;
}
top->server->server_admin = apr_pstrdup (top->pool, reqc->admin);
}
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
- "[mod_vhost_ldap.c]: ap_server_root_relative(%s) is: %s", apr_pstrcat(r->pool, reqc->docroot, r->uri), ap_server_root_relative(r->pool, r->filename));
-
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
- "[mod_vhost_ldap.c]: ap_document_root is: %s", ap_document_root(r));
-
reqc->saved_docroot = apr_pstrdup(top->pool, ap_document_root(r));
- if (set_document_root(r, reqc->docroot) != OK)
+ result = set_document_root(r, reqc->docroot);
+ if (result != OK) {
return HTTP_INTERNAL_SERVER_ERROR;
-
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
- "[mod_vhost_ldap.c]: ap_document_root set to: %s", ap_document_root(r));
+ }
// set environment variables
e = top->subprocess_env;
- apr_table_addn (e, "SERVER_ROOT", reqc->docroot);
- apr_table_addn (e, "DOCUMENT_ROOT", reqc->docroot);
+ apr_table_addn(e, "DOCUMENT_ROOT", reqc->docroot);
/* Hack to allow post-processing by other modules (mod_rewrite, mod_alias) */
return DECLINED;
(mod_vhost_ldap_request_t *)ap_get_module_config(r->request_config,
&vhost_ldap_module);
- if (set_document_root(r, reqc->saved_docroot) != OK)
- return HTTP_INTERNAL_SERVER_ERROR;
-
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
- "[mod_vhost_ldap.c]: ap_document_root restored to: %s", ap_document_root(r));
-
- return OK;
+ /* Set ap_document_root back to saved value */
+ return set_document_root(r, reqc->saved_docroot);
}
#ifdef HAVE_UNIX_SUEXEC