Author: gozer
Date: Tue Jan 17 17:38:08 2006
New Revision: 370001
URL: http://svn.apache.org/viewcvs?rev=370001&view=rev
Log:
$r->add_config() can now take an optionnal 3rd argument that
specifies what pseudo <Location $path> the configuration is
evaluated into
Submitted-By: Torsten Foertsch <[EMAIL PROTECTED]>
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/src/modules/perl/modperl_config.c
perl/modperl/trunk/src/modules/perl/modperl_config.h
perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h
perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h
perl/modperl/trunk/xs/maps/modperl_functions.map
perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=370001&r1=370000&r2=370001&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Tue Jan 17 17:38:08 2006
@@ -12,6 +12,10 @@
=item 2.0.3-dev
+$r->add_config() can now take an optionnal 3rd argument that
+specifies what pseudo <Location $path> the configuration is
+evaluated into [Torsten Foertsch <[EMAIL PROTECTED]>]
+
remove -DAP_HAVE_DESIGNATED_INITIALIZER and -DAP_DEBUG from
MP_MAINTAINER mode to avoid collisions [Joe Orton]
Modified: perl/modperl/trunk/src/modules/perl/modperl_config.c
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_config.c?rev=370001&r1=370000&r2=370001&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_config.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_config.c Tue Jan 17 17:38:08
2006
@@ -578,16 +578,21 @@
const char *modperl_config_insert_request(pTHX_
request_rec *r,
SV *lines,
- int override)
+ int override,
+ char *path)
{
const char *errmsg;
ap_conf_vector_t *dconf = ap_create_per_dir_config(r->pool);
/* The path argument of "/" is only required to be non-NULL
and "/" is as good a default as anything else */
+ if (!path) {
+ path = "/";
+ }
+
errmsg = modperl_config_insert(aTHX_
r->server, r->pool, r->pool,
- override, "/",
+ override, path,
dconf, lines);
if (errmsg) {
Modified: perl/modperl/trunk/src/modules/perl/modperl_config.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_config.h?rev=370001&r1=370000&r2=370001&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_config.h (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_config.h Tue Jan 17 17:38:08
2006
@@ -142,7 +142,8 @@
const char *modperl_config_insert_request(pTHX_
request_rec *r,
SV *lines,
- int override);
+ int override,
+ char *path);
int modperl_config_is_perl_option_enabled(pTHX_ request_rec *r,
server_rec *s, const char *name);
Modified: perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h?rev=370001&r1=370000&r2=370001&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h (original)
+++ perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h Tue Jan 17 17:38:08
2006
@@ -80,7 +80,8 @@
errmsg =
modperl_config_insert_request(aTHX_ r,
newRV_noinc((SV*)config),
- OR_AUTHCFG);
+ OR_AUTHCFG,
+ NULL);
if (errmsg) {
Perl_warn(aTHX_ "Can't change %s to '%s'\n", directive, val);
Modified: perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h?rev=370001&r1=370000&r2=370001&view=diff
==============================================================================
--- perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h (original)
+++ perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h Tue Jan 17
17:38:08 2006
@@ -302,10 +302,11 @@
}
static MP_INLINE
-void mpxs_Apache2__RequestRec_add_config(pTHX_ request_rec *r, SV *lines, int
override)
+void mpxs_Apache2__RequestRec_add_config(pTHX_ request_rec *r, SV *lines,
+ int override, char *path)
{
const char *errmsg = modperl_config_insert_request(aTHX_ r, lines,
- override);
+ override, path);
if (errmsg) {
Perl_croak(aTHX_ "$r->add_config() has failed: %s", errmsg);
}
Modified: perl/modperl/trunk/xs/maps/modperl_functions.map
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/maps/modperl_functions.map?rev=370001&r1=370000&r2=370001&view=diff
==============================================================================
--- perl/modperl/trunk/xs/maps/modperl_functions.map (original)
+++ perl/modperl/trunk/xs/maps/modperl_functions.map Tue Jan 17 17:38:08 2006
@@ -30,7 +30,7 @@
mpxs_Apache2__RequestRec_location
mpxs_Apache2__RequestRec_as_string
mpxs_Apache2__RequestRec_pnotes | | r, key=Nullsv, val=Nullsv
- mpxs_Apache2__RequestRec_add_config | | r, lines, override=OR_AUTHCFG
+ mpxs_Apache2__RequestRec_add_config | | r, lines, override=OR_AUTHCFG,
path=NULL
mpxs_Apache2__RequestRec_document_root | | r, new_root=Nullsv
mpxs_Apache2__RequestRec_child_terminate
Modified: perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm?rev=370001&r1=370000&r2=370001&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm Tue Jan 17
17:38:08 2006
@@ -1417,6 +1417,10 @@
{
'type' => 'int',
'name' => 'override'
+ },
+ {
+ 'type' => 'char *',
+ 'name' => 'path'
}
]
},
@@ -6636,6 +6640,10 @@
{
'type' => 'int',
'name' => 'override'
+ },
+ {
+ 'type' => 'char *',
+ 'name' => 'path'
}
]
},
