cvs commit: modperl-2.0/src/modules/perl mod_perl.h

2000-07-26 Thread dougm 

dougm   00/07/26 00:20:39

  Modified:src/modules/perl mod_perl.h
  Log:
  include apr_strings.h
  
  Revision  ChangesPath
  1.17  +1 -0  modperl-2.0/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_perl.h2000/06/20 16:04:37 1.16
  +++ mod_perl.h2000/07/26 07:20:39 1.17
  @@ -22,6 +22,7 @@
   #include "http_connection.h"
   
   #include "apr_lock.h"
  +#include "apr_strings.h"
   
   extern module MODULE_VAR_EXPORT perl_module;

cvs commit: modperl-2.0/src/modules/perl mod_perl.h modperl_callback.h modperl_config.c modperl_config.h modperl_gtop.c modperl_log.c modperl_log.h modperl_tipool.h

2000-06-20 Thread dougm 

dougm   00/06/20 09:04:53

  Modified:lib/Apache Build.pm
   lib/ModPerl BuildOptions.pm Code.pm
   pod  modperl_dev.pod
   src/modules/perl mod_perl.h modperl_callback.h
modperl_config.c modperl_config.h modperl_gtop.c
modperl_log.c modperl_log.h modperl_tipool.h
  Log:
  add MP_MAINTAINER options and compile clean with it
  
  Revision  ChangesPath
  1.21  +12 -1 modperl-2.0/lib/Apache/Build.pm
  
  Index: Build.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Build.pm  2000/06/12 03:25:04 1.20
  +++ Build.pm  2000/06/20 16:04:21 1.21
  @@ -82,6 +82,9 @@
   $ldopts;
   }
   
  +my $Wall = 
  +  "-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations";
  +
   sub ccopts {
   my($self) = @_;
   
  @@ -91,9 +94,17 @@
   $ccopts .= " -DMP_USE_GTOP";
   }
   
  +if ($self->{MP_MAINTAINER}) {
  +$self->{MP_DEBUG} = 1;
  +if ($self->perl_config('gccversion')) {
  +#same as --with-maintainter-mode
  +$ccopts .= " $Wall -DAP_DEBUG";
  +}
  +}
  +
   if ($self->{MP_DEBUG}) {
   $self->{MP_TRACE} = 1;
  -$ccopts .= " -g -Wall";
  +$ccopts .= " -g";
   }
   
   if ($self->{MP_CCOPTS}) {
  
  
  
  1.2   +2 -1  modperl-2.0/lib/ModPerl/BuildOptions.pm
  
  Index: BuildOptions.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/BuildOptions.pm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BuildOptions.pm   2000/06/09 04:30:11 1.1
  +++ BuildOptions.pm   2000/06/20 16:04:26 1.2
  @@ -135,7 +135,8 @@
   __DATA__
   
   USE_GTOP Link with libgtop and enable libgtop reporting
  -DEBUGTurning on debugging (-g -Wall -lperld) and tracing
  +DEBUGTurning on debugging (-g -lperld) and tracing
  +MAINTAINER   Maintainer mode: DEBUG=1 -DAP_DEBUG -Wall ...
   CCOPTS   Add to compiler flags
   TRACETurn on tracing
   USE_DSO  Build mod_perl as a dso
  
  
  
  1.32  +2 -2  modperl-2.0/lib/ModPerl/Code.pm
  
  Index: Code.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Code.pm   2000/06/19 03:03:32 1.31
  +++ Code.pm   2000/06/20 16:04:28 1.32
  @@ -54,14 +54,14 @@
   PerSrv => {
   args => [{type => 'cmd_parms', name => 'parms'},
{type => 'void', name => 'dummy'},
  - {type => 'char', name => 'arg'}],
  + {type => 'const char', name => 'arg'}],
   cfg  => {get => $scfg_get, name => 'scfg'},
   scope => 'RSRC_CONF',
   },
   PerDir => {
   args => [{type => 'cmd_parms', name => 'parms'},
{type => 'void', name => 'dummy'},
  - {type => 'char', name => 'arg'}],
  + {type => 'const char', name => 'arg'}],
   cfg  => {get => $dcfg_get, name => 'dcfg'},
   scope => 'OR_ALL',
   },
  
  
  
  1.4   +11 -2 modperl-2.0/pod/modperl_dev.pod
  
  Index: modperl_dev.pod
  ===
  RCS file: /home/cvs/modperl-2.0/pod/modperl_dev.pod,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- modperl_dev.pod   2000/06/13 21:05:36 1.3
  +++ modperl_dev.pod   2000/06/20 16:04:33 1.4
  @@ -42,15 +42,24 @@
   
   =item MP_DEBUG
   
  -Turn on debugging (-g -Wall -lperld) and tracing
  +Turn on debugging (-g -lperld) and tracing
   
  +=item MP_MAINTAINER
  +
  +Maintainer compile mode, turn on MP_DEBUG and add gcc flags:
  +
  + -DAP_DEBUG \
  + -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
  +
   =item MP_TRACE
   
   Enable tracing
   
   =item MP_CCOPTS
  +
  +Add to compiler flags, e.g.
   
  -Add to compiler flags
  + MP_CCOPTS = -Werror
   
   =item MP_INST_APACHE2
   
  
  
  
  1.16  +6 -0  modperl-2.0/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- mod_perl.h2000/06/13 21:05:39 1.15
  +++ mod_perl.h2000/06/20 16:04:37 1.16
  @@ -41,6 +41,12 @@
   #include "modperl_directives.h"
   
   void modperl_init(server_rec *s, ap_pool_t *p);
  +void modperl_hook_init(ap_pool_t *pconf, ap_pool_t *plog, 
  +   ap_pool_t *pt

cvs commit: modperl-2.0/src/modules/perl mod_perl.h

2000-04-28 Thread dougm 

dougm   00/04/28 13:07:34

  Modified:src/modules/perl mod_perl.h
  Log:
  fixed in apache-2.0
  
  Revision  ChangesPath
  1.13  +0 -4  modperl-2.0/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mod_perl.h2000/04/25 05:57:48 1.12
  +++ mod_perl.h2000/04/28 20:07:34 1.13
  @@ -12,10 +12,6 @@
   #undef dNOOP
   #define dNOOP extern int __attribute__ ((unused)) Perl___notused
   
  -/*XXX*/
  -#undef TRUE
  -#undef FALSE
  -
   #include "ap_mmn.h"
   #include "httpd.h"
   #include "http_config.h"

cvs commit: modperl-2.0/src/modules/perl mod_perl.h modperl_callback.c modperl_gtop.c

2000-04-24 Thread dougm 

dougm   00/04/24 22:57:49

  Modified:lib/ModPerl Code.pm
   src/modules/perl mod_perl.h modperl_callback.c
modperl_gtop.c
  Log:
  rid -Wall warnings
  
  Revision  ChangesPath
  1.17  +4 -0  modperl-2.0/lib/ModPerl/Code.pm
  
  Index: Code.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Code.pm   2000/04/25 04:38:54 1.16
  +++ Code.pm   2000/04/25 05:57:47 1.17
  @@ -262,6 +262,8 @@
   $i += $i || 1;
   }
   }
  +
  +();
   }
   
   my %trace = (
  @@ -324,6 +326,8 @@
'#define MP_TRACE_dump_flags()',
qq{fprintf(stderr, "mod_perl trace flags dump:\\n");},
@dumper;
  +
  +();
   }
   
   sub ins_underscore {
  
  
  
  1.12  +3 -0  modperl-2.0/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_perl.h2000/04/25 03:59:02 1.11
  +++ mod_perl.h2000/04/25 05:57:48 1.12
  @@ -9,6 +9,9 @@
   #include "perl.h"
   #include "XSUB.h"
   
  +#undef dNOOP
  +#define dNOOP extern int __attribute__ ((unused)) Perl___notused
  +
   /*XXX*/
   #undef TRUE
   #undef FALSE
  
  
  
  1.5   +5 -3  modperl-2.0/src/modules/perl/modperl_callback.c
  
  Index: modperl_callback.c
  ===
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_callback.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- modperl_callback.c2000/04/25 03:48:27 1.4
  +++ modperl_callback.c2000/04/25 05:57:48 1.5
  @@ -282,12 +282,14 @@
   
   int modperl_run_handlers(int idx, request_rec *r, server_rec *s, int type)
   {
  +#ifdef USE_ITHREADS
   pTHX;
  +#endif
   MP_dSCFG(s);
   modperl_handler_t **handlers;
   MpAV *av;
  -int i, status;
  -const char *desc;
  +int i, status = OK;
  +const char *desc = NULL;
   
   if (type == MP_HANDLER_TYPE_DIR) {
   MP_dDCFG;
  @@ -316,7 +318,7 @@
   #endif
   }
   #ifdef USE_ITHREADS
  -else if (s) {
  +else {
   /* Child{Init,Exit} */
   aTHX = scfg->mip->parent->perl;
   }
  
  
  
  1.2   +1 -1  modperl-2.0/src/modules/perl/modperl_gtop.c
  
  Index: modperl_gtop.c
  ===
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_gtop.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- modperl_gtop.c2000/04/17 07:10:35 1.1
  +++ modperl_gtop.c2000/04/25 05:57:48 1.2
  @@ -74,7 +74,7 @@
   void modperl_gtop_proc_mem_size_string(modperl_gtop_t *gtop, int type)
   {
   int is_diff = (type == SS_TYPE_DIFF);
  -glibtop_proc_mem *pm;
  +glibtop_proc_mem *pm = NULL;
   
   if (!is_diff) {
   pm = (type == SS_TYPE_BEFORE) ?

cvs commit: modperl-2.0/src/modules/perl mod_perl.h

2000-04-24 Thread dougm 

dougm   00/04/24 20:59:02

  Modified:src/modules/perl mod_perl.h
  Log:
  #include "http_connection.h"
  
  Revision  ChangesPath
  1.11  +1 -0  modperl-2.0/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_perl.h2000/04/21 05:25:30 1.10
  +++ mod_perl.h2000/04/25 03:59:02 1.11
  @@ -20,6 +20,7 @@
   #include "http_protocol.h"
   #include "http_main.h"
   #include "http_request.h"
  +#include "http_connection.h"
   
   #include "apr_lock.h"

cvs commit: modperl-2.0/src/modules/perl mod_perl.h modperl_config.c

2000-04-17 Thread dougm 

dougm   00/04/17 14:29:42

  Modified:src/modules/perl mod_perl.h modperl_config.c
  Log:
  use server_argv0
  
  Revision  ChangesPath
  1.9   +1 -0  modperl-2.0/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mod_perl.h2000/04/17 21:11:06 1.8
  +++ mod_perl.h2000/04/17 21:29:41 1.9
  @@ -18,6 +18,7 @@
   #include "http_config.h"
   #include "http_log.h"
   #include "http_protocol.h"
  +#include "http_main.h"
   
   #include "apr_lock.h"
   
  
  
  
  1.6   +1 -1  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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- modperl_config.c  2000/04/17 21:11:06 1.5
  +++ modperl_config.c  2000/04/17 21:29:41 1.6
  @@ -20,7 +20,7 @@
   
   scfg->argv = ap_make_array(p, 2, sizeof(char *));
   
  -scfg_push_argv("httpd");
  +scfg_push_argv(ap_server_argv0);
   
   return scfg;
   }

cvs commit: modperl-2.0/src/modules/perl mod_perl.h

2000-04-16 Thread dougm 

dougm   00/04/16 09:57:55

  Modified:src/modules/perl mod_perl.h
  Log:
  incase of -Accflags=...
  
  Revision  ChangesPath
  1.6   +2 -0  modperl-2.0/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_perl.h2000/04/16 00:35:32 1.5
  +++ mod_perl.h2000/04/16 16:57:55 1.6
  @@ -1,7 +1,9 @@
   #ifndef MOD_PERL_H
   #define MOD_PERL_H
   
  +#ifndef PERL_NO_GET_CONTEXT
   #define PERL_NO_GET_CONTEXT
  +#endif
   
   #include "EXTERN.h"
   #include "perl.h"