Return-Path: Delivered-To: apmail-modperl-cvs-archive@apache.org Received: (qmail 47712 invoked by uid 500); 16 Sep 2002 19:14:18 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@perl.apache.org Delivered-To: mailing list modperl-cvs@apache.org Received: (qmail 47700 invoked by uid 500); 16 Sep 2002 19:14:18 -0000 Delivered-To: apmail-modperl-2.0-cvs@apache.org Date: 16 Sep 2002 19:14:17 -0000 Message-ID: <20020916191417.53628.qmail@icarus.apache.org> From: dougm@apache.org To: modperl-2.0-cvs@apache.org Subject: cvs commit: modperl-2.0/todo missing_old_features.txt X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dougm 2002/09/16 12:14:17 Modified: . Changes src/modules/perl mod_perl.c modperl_cmd.c modperl_cmd.h t/directive .cvsignore todo missing_old_features.txt Log: Submitted by: Philippe M. Chiasson Reviewed by: dougm add support for pod directives (=pod,=back,=cut) and __END__ directive Revision Changes Path 1.45 +3 -0 modperl-2.0/Changes Index: Changes =================================================================== RCS file: /home/cvs/modperl-2.0/Changes,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- Changes 11 Sep 2002 00:50:31 -0000 1.44 +++ Changes 16 Sep 2002 19:14:16 -0000 1.45 @@ -10,6 +10,9 @@ =item 1.99_06-dev +add support for pod directives (=pod,=back,=cut) and __END__ directive +[Philippe M. Chiasson ] + tweaks to support Test.pm 1.21 [Philippe M. Chiasson ] add $r->add_config method to add dynamic configuration at request time 1.140 +6 -0 modperl-2.0/src/modules/perl/mod_perl.c Index: mod_perl.c =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- mod_perl.c 15 Sep 2002 23:30:06 -0000 1.139 +++ mod_perl.c 16 Sep 2002 19:14:16 -0000 1.140 @@ -633,6 +633,12 @@ MP_CMD_DIR_TAKE2("PerlSetEnv", set_env, "PerlSetEnv"), MP_CMD_SRV_TAKE1("PerlPassEnv", pass_env, "PerlPassEnv"), MP_CMD_SRV_RAW_ARGS("config_file)) { + if (strEQ(line, "=cut")) { + break; + } + if (strnEQ(line, "=over", 5) && MP_POD_FORMAT(line)) { + break; + } + } + + return NULL; +} + +MP_CMD_SRV_DECLARE(pod_cut) +{ + return "=cut without =pod"; +} + +MP_CMD_SRV_DECLARE(END) +{ + char line[MAX_STRING_LEN]; + + while (!ap_cfg_getline(line, sizeof(line), parms->config_file)) { + /* soak up rest of the file */ + } + + return NULL; +} + /* * XXX: the name of this directive may or may not stay. * need a way to note that a module has config directives. 1.19 +7 -0 modperl-2.0/src/modules/perl/modperl_cmd.h Index: modperl_cmd.h =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_cmd.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- modperl_cmd.h 27 Aug 2002 04:26:54 -0000 1.18 +++ modperl_cmd.h 16 Sep 2002 19:14:16 -0000 1.19 @@ -27,6 +27,9 @@ MP_CMD_SRV_DECLARE(options); MP_CMD_SRV_DECLARE(init_handlers); MP_CMD_SRV_DECLARE(perl); +MP_CMD_SRV_DECLARE(pod); +MP_CMD_SRV_DECLARE(pod_cut); +MP_CMD_SRV_DECLARE(END); MP_CMD_SRV_DECLARE(load_module); #ifdef MP_COMPAT_1X @@ -106,5 +109,9 @@ #define MP_CMD_DIR_FLAG(name, item, desc) \ AP_INIT_FLAG( name, modperl_cmd_##item, NULL, \ OR_ALL, desc ) + +#define MP_CMD_DIR_RAW_ARGS_ON_READ(name, item, desc) \ + AP_INIT_RAW_ARGS( name, modperl_cmd_##item, NULL, \ + OR_ALL|EXEC_ON_READ, desc ) #endif /* MODPERL_CMD_H */ 1.2 +2 -0 modperl-2.0/t/directive/.cvsignore Index: .cvsignore =================================================================== RCS file: /home/cvs/modperl-2.0/t/directive/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Nov 2001 00:13:55 -0000 1.1 +++ .cvsignore 16 Sep 2002 19:14:17 -0000 1.2 @@ -1 +1,3 @@ env.t +loadmodule.t +pod.t 1.21 +0 -2 modperl-2.0/todo/missing_old_features.txt Index: missing_old_features.txt =================================================================== RCS file: /home/cvs/modperl-2.0/todo/missing_old_features.txt,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- missing_old_features.txt 28 Aug 2002 03:28:35 -0000 1.20 +++ missing_old_features.txt 16 Sep 2002 19:14:17 -0000 1.21 @@ -6,8 +6,6 @@ - PerlModule, PerlRequire, Perl{Set,Add}Var in .htaccess is missing -- pod directives (=pod,=back,=cut) and __END__ - - modperl_include #perl - PerlOpCodeMask (experimental in 1.xx)