You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/08/02 15:08:06 UTC
svn commit: r1368451 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/aaa/mod_authz_core.c
Author: jim
Date: Thu Aug 2 13:08:05 2012
New Revision: 1368451
URL: http://svn.apache.org/viewvc?rev=1368451&view=rev
Log:
Merge r1351016 from trunk:
pass the provider name to parse_require_line as pool userdata
This allows a single C function to implement several authz providers.
Submitted by: sf
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1351016
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1368451&r1=1368450&r2=1368451&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Aug 2 13:08:05 2012
@@ -88,12 +88,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * authz: pass the provider name to parse_require_line as pool userdata
- This allows a single C function to implement several authz providers.
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1351016
- 2.4.x patch: Trunk patch applies.
- +1: rjung, sf, jim
-
* event: Simplify handling of MaxConnectionsPerChild.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1361766
2.4.x patch: Trunk patch applies.
Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c?rev=1368451&r1=1368450&r2=1368451&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authz_core.c Thu Aug 2 13:08:05 2012
@@ -413,8 +413,14 @@ static const char *add_authz_provider(cm
section->limited = cmd->limited;
if (section->provider->parse_require_line) {
- const char *err = section->provider->parse_require_line(cmd, args,
- §ion->provider_parsed_args);
+ const char *err;
+ apr_pool_userdata_setn(section->provider_name,
+ AUTHZ_PROVIDER_NAME_NOTE,
+ apr_pool_cleanup_null,
+ cmd->temp_pool);
+ err = section->provider->parse_require_line(cmd, args,
+ §ion->provider_parsed_args);
+
if (err)
return err;
}