perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@hyperreal.org
Subject cvs commit: modperl/t/conf httpd.conf-dist
Date Thu, 19 Nov 1998 16:52:20 GMT
dougm       98/11/19 08:52:19

  Modified:    .        Changes ToDo
               src/modules/perl mod_perl.c perl_config.c
               t/conf   httpd.conf-dist
  Log:
  pod support '=for apache/=end apache' replaced with:
   =over to apache
   #directives for apache
   =back to pod
  
  Revision  Changes    Path
  1.201     +5 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.200
  retrieving revision 1.201
  diff -u -r1.200 -r1.201
  --- Changes	1998/11/19 04:36:27	1.200
  +++ Changes	1998/11/19 16:51:53	1.201
  @@ -8,6 +8,11 @@
   
   =item 1.16_01-dev
   
  +pod support '=for apache/=end apache' replaced with:
  + =over to apache
  + #directives for apache
  + =back to pod
  +
   Apache::FakeRequest now supports Apache::Constants and is documented
   [Andrew Ford <A.Ford@ford-mason.co.uk>]
   
  
  
  
  1.118     +0 -2      modperl/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /export/home/cvs/modperl/ToDo,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -r1.117 -r1.118
  --- ToDo	1998/11/19 04:36:28	1.117
  +++ ToDo	1998/11/19 16:51:53	1.118
  @@ -7,8 +7,6 @@
   
   - <Perl>/%Apache::ReadConfig:: brokeness (My::configure() example, Eric Cholet)
   
  -- sort out =pod configuration directives
  -
   ---------------------------------------------------------------------------
   DOCUMENTATION (areas that *really* need some more or don't have any)
   ---------------------------------------------------------------------------
  
  
  
  1.55      +1 -1      modperl/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- mod_perl.c	1998/11/19 04:33:36	1.54
  +++ mod_perl.c	1998/11/19 16:52:14	1.55
  @@ -88,7 +88,7 @@
       { "</Perl>", perl_end_section, NULL, OR_ALL, NO_ARGS, "End Perl code" },
   #endif
       { "=pod", perl_pod_section, NULL, OR_ALL, RAW_ARGS, "Start of POD" },
  -    { "=end", perl_pod_section, NULL, OR_ALL, RAW_ARGS, "End of =begin" },
  +    { "=back", perl_pod_section, NULL, OR_ALL, RAW_ARGS, "End of =over" },
       { "=cut", perl_pod_end_section, NULL, OR_ALL, NO_ARGS, "End of POD" },
       { "__END__", perl_config_END, NULL, OR_ALL, RAW_ARGS, "Stop reading config" },
       { "PerlFreshRestart", perl_cmd_fresh_restart,
  
  
  
  1.48      +25 -2     modperl/src/modules/perl/perl_config.c
  
  Index: perl_config.c
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/perl_config.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- perl_config.c	1998/11/19 03:28:05	1.47
  +++ perl_config.c	1998/11/19 16:52:14	1.48
  @@ -652,6 +652,7 @@
       return NULL;   
   }
   
  +#if 0
   #define APACHE_POD_FORMAT(s) \
    (strnEQ(s, "httpd", 5) || strnEQ(s, "apache", 6))
   
  @@ -678,6 +679,29 @@
   
       return NULL;   
   }
  +#else
  +#define APACHE_POD_FORMAT(s) \
  + (strstr(s, "httpd") || strstr(s, "apache"))
  +
  +CHAR_P perl_pod_section (cmd_parms *parms, void *dummy, const char *arg)
  +{
  +    char line[MAX_STRING_LEN];
  +
  +    if(arg && strlen(arg) && !(APACHE_POD_FORMAT(arg) || strstr(arg, "pod")))

  +	return "Unknown =back format";
  +
  +    while (!(cfg_getline (line, sizeof(line), cmd_infile))) {
  +	if(strnEQ(line, "=cut", 4))
  +	    break;
  +	if(strnEQ(line, "=over", 5)) {
  +	    if(APACHE_POD_FORMAT(line)) 
  +		break;
  +	}
  +    }
  +
  +    return NULL;   
  +}
  +#endif
   
   static const char perl_pod_end_magic[] = "=cut without =pod";
   
  @@ -871,8 +895,7 @@
   
       if(xsmod && 
          (sdata = get_module_config(cmd->server->module_config, xsmod))) {
  -	void *sobj = 
  -	    perl_perl_create_srv_config(&sdata->obj, CvSTASH(cv), cmd);
  +	(void)perl_perl_create_srv_config(&sdata->obj, CvSTASH(cv), cmd);
   	set_module_config(cmd->server->module_config, xsmod, sdata);
       }
   
  
  
  
  1.19      +14 -3     modperl/t/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/conf/httpd.conf-dist,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- httpd.conf-dist	1998/11/13 21:39:01	1.18
  +++ httpd.conf-dist	1998/11/19 16:52:19	1.19
  @@ -10,6 +10,20 @@
   
   umm, we use this to test mod_perl
   
  +=over to apache
  +
  + #-Tw
  + PerlTaintCheck On
  + PerlWarn On
  +
  +=back to pod
  +
  +=over 4
  +
  +=item Test that mod_perl skips this
  +
  +=back
  +
   =cut
   
   #make sure all regex stuff works
  @@ -32,9 +46,6 @@
   
   #mod_perl stuff
   
  -#-Tw
  -PerlTaintCheck On
  -PerlWarn On
   
   PerlPassEnv TERM EDITOR NOCHANCE USER
   PerlSetEnv KeyForPerlSetEnv OK
  
  
  

Mime
View raw message