PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_auth_form: Make sure the optional functions are loaded even when
- the AuthFormProvider isn't specified. PR 56351.
- trunk patch: https://svn.apache.org/r1531672
- 2.4.x patch: trunk patch works, modulo CHANGES
- +1: minfrin, jim, ylavic
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
"Form Authentication", newp->provider_name);
}
- if (!ap_session_load_fn || !ap_session_get_fn || !ap_session_set_fn) {
- ap_session_load_fn = APR_RETRIEVE_OPTIONAL_FN(ap_session_load);
- ap_session_get_fn = APR_RETRIEVE_OPTIONAL_FN(ap_session_get);
- ap_session_set_fn = APR_RETRIEVE_OPTIONAL_FN(ap_session_set);
- if (!ap_session_load_fn || !ap_session_get_fn || !ap_session_set_fn) {
- return "You must load mod_session to enable the mod_auth_form "
- "functions";
- }
- }
-
- if (!ap_request_insert_filter_fn || !ap_request_remove_filter_fn) {
- ap_request_insert_filter_fn = APR_RETRIEVE_OPTIONAL_FN(ap_request_insert_filter);
- ap_request_remove_filter_fn = APR_RETRIEVE_OPTIONAL_FN(ap_request_remove_filter);
- if (!ap_request_insert_filter_fn || !ap_request_remove_filter_fn) {
- return "You must load mod_request to enable the mod_auth_form "
- "functions";
- }
- }
-
/* Add it to the list now. */
if (!conf->providers) {
conf->providers = newp;
{
const char *authname = ap_auth_name(r);
session_rec *z = NULL;
+
ap_session_load_fn(r, &z);
if (user) {
}
+static int authenticate_form_post_config(apr_pool_t *pconf, apr_pool_t *plog,
+ apr_pool_t *ptemp, server_rec *s)
+{
+
+ if (!ap_session_load_fn || !ap_session_get_fn || !ap_session_set_fn) {
+ ap_session_load_fn = APR_RETRIEVE_OPTIONAL_FN(ap_session_load);
+ ap_session_get_fn = APR_RETRIEVE_OPTIONAL_FN(ap_session_get);
+ ap_session_set_fn = APR_RETRIEVE_OPTIONAL_FN(ap_session_set);
+ if (!ap_session_load_fn || !ap_session_get_fn || !ap_session_set_fn) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL, APLOGNO()
+ "You must load mod_session to enable the mod_auth_form "
+ "functions");
+ return !OK;
+ }
+ }
+
+ if (!ap_request_insert_filter_fn || !ap_request_remove_filter_fn) {
+ ap_request_insert_filter_fn = APR_RETRIEVE_OPTIONAL_FN(ap_request_insert_filter);
+ ap_request_remove_filter_fn = APR_RETRIEVE_OPTIONAL_FN(ap_request_remove_filter);
+ if (!ap_request_insert_filter_fn || !ap_request_remove_filter_fn) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, 0, NULL, APLOGNO()
+ "You must load mod_request to enable the mod_auth_form "
+ "functions");
+ return !OK;
+ }
+ }
+
+ return OK;
+}
+
static void register_hooks(apr_pool_t * p)
{
+ ap_hook_post_config(authenticate_form_post_config,NULL,NULL,APR_HOOK_MIDDLE);
+
#if AP_MODULE_MAGIC_AT_LEAST(20080403,1)
ap_hook_check_authn(authenticate_form_authn, NULL, NULL, APR_HOOK_MIDDLE,
AP_AUTH_INTERNAL_PER_CONF);