You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by go...@apache.org on 2004/07/07 00:06:05 UTC
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
gozer 2004/07/06 15:06:05
Modified: . Changes
src/docs/2.0/api/Apache RequestUtil.pod
src/modules/perl modperl_config.c modperl_config.h
xs/Apache/Access Apache__Access.h
xs/Apache/RequestUtil Apache__RequestUtil.h
xs/tables/current/ModPerl FunctionTable.pm
Log:
Removed the deprecated path argument to $r->add_config()
Reviewed by: stas
Revision Changes Path
1.403 +2 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- Changes 5 Jul 2004 22:02:42 -0000 1.402
+++ Changes 6 Jul 2004 22:06:04 -0000 1.403
@@ -12,6 +12,8 @@
=item 1.99_15-dev
+Removed the deprecated path argument to $r->add_config() [Gozer]
+
Created a META.yml for CPAN and friends, including Apache-Test as
a private resource to keep CPAN from installing mod_perl when a
user just wants Apache::Test [Gozer]
1.21 +2 -8 modperl-docs/src/docs/2.0/api/Apache/RequestUtil.pod
Index: RequestUtil.pod
===================================================================
RCS file: /home/cvs/modperl-docs/src/docs/2.0/api/Apache/RequestUtil.pod,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- RequestUtil.pod 5 Jul 2004 04:37:20 -0000 1.20
+++ RequestUtil.pod 6 Jul 2004 22:06:04 -0000 1.21
@@ -101,8 +101,7 @@
Dynamically add Apache configuration at request processing runtime:
$r->add_config($lines);
- $r->add_config($lines, $path);
- $r->add_config($lines, $path, $override);
+ $r->add_config($lines, $override);
=over 4
@@ -114,12 +113,7 @@
An ARRAY reference containing configuration lines per element, without
the new line terminators.
-=item opt arg2: C<$path> ( SCALAR )
-
-This argument is only useful to tell whether a command is being called
-in a dir context. By default C<$r-E<gt>filename> is passed.
-
-=item opt arg3: C<$override> ( C<L<APR::Const status
+=item opt arg2: C<$override> ( C<L<APR::Const status
constant|docs::2.0::api::APR::Const>> )
Which allow-override bits are set
1.80 +3 -2 modperl-2.0/src/modules/perl/modperl_config.c
Index: modperl_config.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- modperl_config.c 16 Jun 2004 03:55:47 -0000 1.79
+++ modperl_config.c 6 Jul 2004 22:06:04 -0000 1.80
@@ -573,15 +573,16 @@
const char *modperl_config_insert_request(pTHX_
request_rec *r,
SV *lines,
- char *path,
int override)
{
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 */
errmsg = modperl_config_insert(aTHX_
r->server, r->pool, r->pool,
- override, path,
+ override, "/",
dconf, lines);
if (errmsg) {
1.34 +0 -1 modperl-2.0/src/modules/perl/modperl_config.h
Index: modperl_config.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- modperl_config.h 4 Mar 2004 06:01:07 -0000 1.33
+++ modperl_config.h 6 Jul 2004 22:06:04 -0000 1.34
@@ -135,7 +135,6 @@
const char *modperl_config_insert_request(pTHX_
request_rec *r,
SV *lines,
- char *path,
int override);
int modperl_config_is_perl_option_enabled(pTHX_ request_rec *r,
1.9 +1 -1 modperl-2.0/xs/Apache/Access/Apache__Access.h
Index: Apache__Access.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/Access/Apache__Access.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Apache__Access.h 4 Mar 2004 06:01:11 -0000 1.8
+++ Apache__Access.h 6 Jul 2004 22:06:04 -0000 1.9
@@ -80,7 +80,7 @@
errmsg =
modperl_config_insert_request(aTHX_ r,
newRV_noinc((SV*)config),
- r->filename, OR_AUTHCFG);
+ OR_AUTHCFG);
if (errmsg) {
Perl_warn(aTHX_ "Can't change %s to '%s'\n", directive, val);
1.23 +2 -2 modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h
Index: Apache__RequestUtil.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Apache__RequestUtil.h 4 Mar 2004 06:01:13 -0000 1.22
+++ Apache__RequestUtil.h 6 Jul 2004 22:06:04 -0000 1.23
@@ -271,10 +271,10 @@
}
static MP_INLINE
-void mpxs_Apache__RequestRec_add_config(pTHX_ request_rec *r, SV *lines, char *path, int override)
+void mpxs_Apache__RequestRec_add_config(pTHX_ request_rec *r, SV *lines, int override)
{
const char *errmsg = modperl_config_insert_request(aTHX_ r, lines,
- path, override);
+ override);
if (errmsg) {
Perl_croak(aTHX_ "$r->add_config() has failed: %s", errmsg);
}
1.168 +0 -4 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- FunctionTable.pm 2 Jul 2004 22:43:17 -0000 1.167
+++ FunctionTable.pm 6 Jul 2004 22:06:04 -0000 1.168
@@ -6151,10 +6151,6 @@
'name' => 'lines'
},
{
- 'type' => 'char *',
- 'name' => 'path'
- },
- {
'type' => 'int',
'name' => 'override'
}