cvs commit: modperl-2.0 .cvsignore

2000-04-24 Thread dougm

dougm   00/04/24 23:00:02

  Added:   ..cvsignore
  Log:
  ignore
  
  Revision  ChangesPath
  1.1  modperl-2.0/.cvsignore
  
  Index: .cvsignore
  ===
  Makefile
  blib
  pm_to_blib
  
  
  



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/lib/Apache Build.pm

2000-04-24 Thread dougm

dougm   00/04/24 22:16:08

  Modified:.00README_FIRST Makefile.PL
   lib/Apache Build.pm
  Log:
  if MP_USE_DSO=1 build libmodperl.so, else build libmodperl.a
  get rid of Apache::Build::AUTOLOAD
  
  Revision  ChangesPath
  1.5   +3 -3  modperl-2.0/00README_FIRST
  
  Index: 00README_FIRST
  ===
  RCS file: /home/cvs/modperl-2.0/00README_FIRST,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 00README_FIRST2000/04/21 20:10:00 1.4
  +++ 00README_FIRST2000/04/25 05:16:07 1.5
  @@ -18,7 +18,7 @@
   
   to build mod_perl static:
   
  -% perl Makefile.PL && make libmodperl.a
  +% perl Makefile.PL && make
   
   % cd ../apache-2.0/src
   % ./configure --prefix=$HOME/apache-2.0 --with-mpm=mpmt_pthread
  @@ -27,7 +27,7 @@
   
   to build mod_perl dynamic:
   
  -% perl Makefile.PL && make libmodperl.so
  +% perl Makefile.PL MP_USE_DSO=1 && make
   
   (note the dso-link-hack.pat is need for my suse-6.1, might be
   different for your platform)
  @@ -64,4 +64,4 @@
   warn "hey, it works!";
   }
   
  ---dougm 04/21
  +--dougm 04/24
  
  
  
  1.15  +9 -17 modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Makefile.PL   2000/04/25 04:25:41 1.14
  +++ Makefile.PL   2000/04/25 05:16:07 1.15
  @@ -56,6 +56,10 @@
   $code->generate;
   
   $build->write_src_makefile;
  +
  +printf "Will build mod_perl %s as %s\n",
  +  $build->is_dynamic ? "shared" : "static",
  +$build->{"MODPERL_LIB"};
   }
   
   sub echo_cmd {
  @@ -152,18 +156,14 @@
   sub MY::top_targets {
   my $self = shift;
   my $string = $self->MM::top_targets;
  -
  -for (qw(SHARED STATIC)) {
  -$string .= <{"MODPERL_LIB_$_"}:
  - @(cd \$(MODPERL_SRC) && \$(MAKE) \$\@);
   
  -EOF
  -}
  +$build->mm_add_dep(\$string, pure_all => 'modperl_lib');
   
   $string .= <<'EOF';
   
  +modperl_lib:
  + @(cd $(MODPERL_SRC) && $(MAKE));
  +
   modperl_src_clean:
@(cd $(MODPERL_SRC) && $(MAKE) clean);
   
  @@ -175,19 +175,11 @@
   sub MY::clean {
   my $self = shift;
   my $string = $self->MM::clean(@_);
  -$string =~ s/(clean\s+::)/$1 modperl_src_clean /;
  +$build->mm_add_dep(\$string, clean => 'modperl_src_clean');
   $string;
   }
   
   sub MY::postamble {
  -my $i = 0;
  -print "you may now run:\n";
  -
  -for (qw(SHARED STATIC)) {
  -print qq(make $build->{"MODPERL_LIB_$_"}\n);
  -print " - or - \n" unless $i++;
  -}
  -
   '';
   }
   
  
  
  
  1.13  +14 -13modperl-2.0/lib/Apache/Build.pm
  
  Index: Build.pm
  ===
  RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Build.pm  2000/04/25 04:38:53 1.12
  +++ Build.pm  2000/04/25 05:16:07 1.13
  @@ -22,7 +22,7 @@
   my $build = $self->build_config;
   my $apxs;
   my @trys = ($Apache::Build::APXS,
  - $build->APXS);
  + $build->{MP_APXS});
   
   unless (IS_MOD_PERL_BUILD) {
#if we are building mod_perl via apxs, apxs should already be known
  @@ -363,7 +363,7 @@
   
   sub is_dynamic {
   my $self = shift;
  -$self->USE_DSO;
  +$self->{MP_USE_DSO} || $self->{MP_USE_APXS};
   }
   
   sub default_dir {
  @@ -406,14 +406,6 @@
   return $self->{dir} = $dir;
   }
   
  -our $AUTOLOAD;
  -
  -sub AUTOLOAD {
  -my $self = shift;
  -(my $name = $AUTOLOAD) =~ s/.*::(\w+)$/$1/;
  -return $self->{$name} || $self->{lc $name};
  -}
  -
   #--- finding apache *.h files ---
   
   sub find {
  @@ -620,9 +612,11 @@
   print $fh $self->canon_make_attr($method, @{ $code->$method() });
   }
   
  -print $fh <<'EOF';
  +print $fh $self->canon_make_attr('lib', $self->is_dynamic ?
  + $self->{MODPERL_LIB_SHARED} :
  + $self->{MODPERL_LIB_STATIC});
   
  -MODPERL_LIB=$(MODPERL_LIBNAME)$(MODPERL_LIB_EXT)
  +print $fh <<'EOF';
   
   all: lib
   
  @@ -722,7 +716,7 @@
   my $ssl_dir = "$src/../ssl/include";
   unless (-d $ssl_dir) {
   my $build = $self->build_config;
  - $ssl_dir = join '/', $self->SSL_BASE || '', 'include';
  + $ssl_dir = join '/', $self->{MP_SSL_BASE} || '', 'include';
   }
   push @inc, "-I$ssl_dir" if -d $ssl_dir;
   
  @@ -742,6 +736,13 @@
   my $self = shift;
   
   return "";
  +}
  +
  +#--- tweak MakeMaker ---
  +
  +sub mm_add_dep {
  +my($self, $string, $targ, $add) = @_;
  +$$string =~ s/($targ\s+::)/$1 $add /;
   }
   
   

cvs commit: modperl-site/embperl index.html

2000-04-24 Thread richter

richter 00/04/24 21:57:48

  Modified:embperl  index.html
  Log:
  Embperl Webpages - Changes
  
  Revision  ChangesPath
  1.99  +5 -0  modperl-site/embperl/index.html
  
  Index: index.html
  ===
  RCS file: /home/cvs/modperl-site/embperl/index.html,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- index.html2000/04/25 04:26:24 1.98
  +++ index.html2000/04/25 04:57:48 1.99
  @@ -140,6 +140,11 @@
 
 
   
  +25. Apr 2000
  +http://www.perlmonth.com/index.html?issue=11">Perlmonth starts a new article 
series about Embperl
  +  
  +  
  +
   16. Apr 2000
   Added page about syntaxfiles for various editors
 
  @@ -272,7 +277,7 @@
   
 
 HTML::Embperl - Copyright (c) 1997-2000 Gerald Richter / ECOS 
<[EMAIL PROTECTED]>
  -  Last Update $Id: index.html,v 1.98 2000/04/25 04:26:24 richter Exp $   
 
  +  Last Update $Id: index.html,v 1.99 2000/04/25 04:57:48 richter Exp $   
 
   
   
   
  
  
  



cvs commit: modperl-2.0/lib/ModPerl Code.pm

2000-04-24 Thread dougm

dougm   00/04/24 21:38:54

  Modified:lib/Apache Build.pm
   lib/ModPerl Code.pm
  Log:
  .h dependencies
  
  Revision  ChangesPath
  1.12  +3 -2  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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Build.pm  2000/04/25 04:25:40 1.11
  +++ Build.pm  2000/04/25 04:38:53 1.12
  @@ -616,7 +616,7 @@
   print $fh $self->canon_make_attr($method, $self->$method());
   }
   
  -for my $method (qw(c_files o_files o_pic_files)) {
  +for my $method (qw(c_files o_files o_pic_files h_files)) {
   print $fh $self->canon_make_attr($method, @{ $code->$method() });
   }
   
  @@ -670,7 +670,8 @@
$(MODPERL_RM_F) $(MODPERL_O_PIC_FILES)
$(MODPERL_RM_F) $(MODPERL_CLEAN_FILES)
   
  -$(MODPERL_O_FILES): Makefile
  +$(MODPERL_O_FILES): $(MODPERL_H_FILES) Makefile
  +$(MODPERL_O_PIC_FILES): $(MODPERL_H_FILES) Makefile
   EOF
   
   close $fh;
  
  
  
  1.16  +6 -4  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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Code.pm   2000/04/25 03:48:26 1.15
  +++ Code.pm   2000/04/25 04:38:54 1.16
  @@ -380,12 +380,14 @@
   
   my @c_src_names = qw(interp log config callback gtop);
   my @g_c_names = map { "modperl_$_" } qw(hooks directives xsinit);
  -my @c_names   = ('mod_perl', (map "modperl_$_", @c_src_names), @g_c_names);
  -sub c_files { [map { "$_.c" } @c_names] }
  -sub o_files { [map { "$_.o" } @c_names] }
  -sub o_pic_files { [map { "$_.lo" } @c_names] }
  +my @c_names   = ('mod_perl', (map "modperl_$_", @c_src_names));
  +sub c_files { [map { "$_.c" } @c_names, @g_c_names] }
  +sub o_files { [map { "$_.o" } @c_names, @g_c_names] }
  +sub o_pic_files { [map { "$_.lo" } @c_names, @g_c_names] }
   
   my @g_h_names = map { "modperl_$_" } qw(hooks directives flags trace);
  +my @h_names = @c_names;
  +sub h_files { [map { "$_.h" } @h_names, @g_h_names] }
   
   sub clean_files {
   [(map { "$_.c" } @g_c_names), (map { "$_.h" } @g_h_names)];
  
  
  



cvs commit: modperl-site/embperl Changes.pod.1.html Changes.pod.2.html Changes.pod.cont.html EmbperlObject.pod.2.html index.html

2000-04-24 Thread richter

richter 00/04/24 21:26:25

  Modified:embperl  Changes.pod.1.html Changes.pod.2.html
Changes.pod.cont.html EmbperlObject.pod.2.html
index.html
  Log:
  Embperl Webpages - Changes
  
  Revision  ChangesPath
  1.150 +9 -11 modperl-site/embperl/Changes.pod.1.html
  
  Index: Changes.pod.1.html
  ===
  RCS file: /home/cvs/modperl-site/embperl/Changes.pod.1.html,v
  retrieving revision 1.149
  retrieving revision 1.150
  diff -u -r1.149 -r1.150
  --- Changes.pod.1.html2000/04/22 20:18:27 1.149
  +++ Changes.pod.1.html2000/04/25 04:26:22 1.150
  @@ -1,6 +1,6 @@
   
   
  -1.3b3_dev -- That's what currently under developement
  +1.3b3  25.04.2000
   mailto:[EMAIL PROTECTED]">
   
   
  @@ -8,7 +8,7 @@
   
 
   
  -1.3b3_dev -- That's what currently under 
developement
  +1.3b3 (BETA)  25.04.2000
 
   
   
  @@ -18,14 +18,6 @@
 
   [HOME]   [CONTENT]   [PREV (Revision History - Content)]   [NEXT (1.3b2 (BETA) 11. Feb 2000)]   
   
  -Last Update: Sat Apr 22 22:18:15 2000 (MET)
  -
  -
  -NOTE: This version is only available via "CVS"
  -
  -
  -
  -
  - Fixed SIGSEGV which occurs in cleanup with Perl 5.6. Spotted by 
Aaron Johnson.
  - Changed make test so it works correctly with new error messages of
  @@ -57,7 +49,13 @@
  - Added tests for EmbperlObject
  - Fixed a SIGSEGV that occured when Embperl found [*] inside
a page. Spotted by Barrie Slaymaker.
  -  
  +   - Added epchar.c.min which contains translation tables which
  + let's all chars above 128 untouched. This is usefull for
  + processing two byte charsets. Patch from Sangmook Yi.
  +   - The searchpath (EMBPERL_PATH) now uses semikolons (';') instead 
  + of colons (':') to avoid problems with Windows drive letters.
  + Colons still work on Unix.
  +
   
   [HOME]   [CONTENT]   [PREV (Revision History - Content)]   [NEXT (1.3b2 (BETA) 11. Feb 2000)]   
   ___
  
  
  
  1.38  +2 -2  modperl-site/embperl/Changes.pod.2.html
  
  Index: Changes.pod.2.html
  ===
  RCS file: /home/cvs/modperl-site/embperl/Changes.pod.2.html,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Changes.pod.2.html2000/04/14 12:28:20 1.37
  +++ Changes.pod.2.html2000/04/25 04:26:22 1.38
  @@ -16,7 +16,7 @@
   
   
 
  -[HOME]   [CONTENT]   [PREV (1.3b3_dev -- That's what currently under 
developement)]   [NEXT (1.2.1  5. Jan 
2000)]   
  +[HOME]   [CONTENT]   [PREV (1.3b3 (BETA)  25.04.2000)]   [NEXT (1.2.1  5. Jan 2000)]   
   
  - added new mod_perl handler EmbperlObject, which helps to build whole
pages out of small objects, which can be overwritten in "derived"
  @@ -35,7 +35,7 @@
to zero. Now if debug is zero, no logfile will be opened. Spotted
by Jason Bodnar and Christian Gilmore.   
   
  -[HOME]   [CONTENT]   [PREV (1.3b3_dev -- That's what currently under 
developement)]   [NEXT (1.2.1  5. Jan 
2000)]   
  +[HOME]   [CONTENT]   [PREV (1.3b3 (BETA)  25.04.2000)]   [NEXT (1.2.1  5. Jan 2000)]   
   ___
   HTML::Embperl - Copyright (c) 1997-2000 Gerald Richter / http://www.ecos.de/">ecos gmbh
   
  
  
  
  1.38  +3 -3  modperl-site/embperl/Changes.pod.cont.html
  
  Index: Changes.pod.cont.html
  ===
  RCS file: /home/cvs/modperl-site/embperl/Changes.pod.cont.html,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Changes.pod.cont.html 2000/04/14 12:28:23 1.37
  +++ Changes.pod.cont.html 2000/04/25 04:26:22 1.38
  @@ -16,7 +16,7 @@
   
   
 
  -[HOME]   [CONTENT]   [NEXT (1.3b3_dev -- That's what currently under 
developement)]   
  +[HOME]   [CONTENT]   [NEXT (1.3b3 (BETA)  25.04.2000)]   
   
   Revision History - Content
   mailto:[EMAIL PROTECTED]">
  @@ -28,7 +28,7 @@
   
   
   
  - 1.3b3_dev - 
That's what currently under developement
  + 1.3b3 (BETA)  
25.04.2000
1.3b2 (BETA) 11. Feb 
2000
1.2.1  5. Jan 2000
1.2.0  17 Nov 1999
  @@ -70,7 +70,7 @@
0.10beta Jan 18 
1997
   
   
  -[HOME]   [CONTENT]   [NEXT (1.3b3_dev -- That's what currently under 
developement)]   
  +[HOME]   [CONTENT]   [NEXT (1.3b3 (BETA)  25.04.2000)]   
   ___
   HTML::Embperl - Copyright (c) 1997-2000 Gerald Richter / http://www.ecos.de/">ecos gmbh
   
  
  
  
  1.3   +2 -1  modperl-site/embperl/EmbperlObject.pod.2.html
  
  Index: EmbperlObject.pod.2.html
  =

cvs commit: modperl-2.0 Makefile.PL

2000-04-24 Thread dougm

dougm   00/04/24 21:25:42

  Modified:lib/Apache Build.pm
   .Makefile.PL
  Log:
  workaround MakeMaker braindeadness
  
  Revision  ChangesPath
  1.11  +5 -2  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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Build.pm  2000/04/21 19:43:34 1.10
  +++ Build.pm  2000/04/25 04:25:40 1.11
  @@ -341,16 +341,19 @@
   (my $obj = $self->freeze) =~ s/^//;
   open my $fh, '>', $file or die "open $file: $!";
   
  +#work around autosplit braindeadness
  +my $package = 'package Apache::BuildConfig';
  +
   print $fh < $VERSION,
   macro => {
   MODPERL_SRC => $code->path,
  +PERL => $build->perl_config('perl5'),
   },
   clean => {
   FILES => "@{ clean_files() }",
  
  
  



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 modperl_callback.c

2000-04-24 Thread dougm

dougm   00/04/24 20:48:27

  Modified:lib/ModPerl Code.pm
   src/modules/perl modperl_callback.c
  Log:
  hookup connection handlers
  
  Revision  ChangesPath
  1.15  +4 -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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Code.pm   2000/04/21 19:43:36 1.14
  +++ Code.pm   2000/04/25 03:48:26 1.15
  @@ -14,7 +14,7 @@
 Access Authen Authz
 Type Fixup Response
 Log Cleanup)],
  -Connection => [qw(PreConnection PostConnection)],
  +Connection => [qw(PreConnection ProcessConnection)],
   );
   
   my %hooks = (
  @@ -27,7 +27,9 @@
   Authz => 'auth_checker',
   Type => 'type_checker',
   Fixup => 'fixups',
  -Log => 'log_transaction'
  +Log => 'log_transaction',
  +PreConnection => 'pre_connection',
  +ProcessConnection => 'process_connection',
   );
   
   my %hook_proto = (
  
  
  
  1.4   +2 -1  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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- modperl_callback.c2000/04/21 07:12:42 1.3
  +++ modperl_callback.c2000/04/25 03:48:27 1.4
  @@ -347,7 +347,8 @@
   
   int modperl_connection_callback(int idx, conn_rec *c)
   {
  -return DECLINED;
  +return modperl_run_handlers(idx, NULL, c->base_server,
  +MP_HANDLER_TYPE_SRV);
   }
   
   void modperl_process_callback(int idx, ap_pool_t *p, server_rec *s)
  
  
  



cvs commit: modperl-2.0 Makefile.PL

2000-04-24 Thread dougm

dougm   00/04/24 20:47:32

  Modified:.Makefile.PL
  Log:
  fix 'make clean'
  
  Revision  ChangesPath
  1.13  +12 -4 modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Makefile.PL   2000/04/21 20:18:09 1.12
  +++ Makefile.PL   2000/04/25 03:47:31 1.13
  @@ -24,6 +24,9 @@
   WriteMakefile(
   NAME => 'mod_perl',
   VERSION => $VERSION,
  +macro => {
  +MODPERL_SRC => $code->path,
  +},
   clean => {
   FILES => "@{ clean_files() }",
   },
  @@ -148,25 +151,30 @@
   sub MY::top_targets {
   my $self = shift;
   my $string = $self->MM::top_targets;
  -my $path = $code->path;
   
   for (qw(SHARED STATIC)) {
   $string .= <{"MODPERL_LIB_$_"}:
  - @(cd $path && \$(MAKE) \$\@);
  + @(cd \$(MODPERL_SRC) && \$(MAKE) \$\@);
   
   EOF
   }
   
  +$string .= <<'EOF';
  +
  +modperl_src_clean:
  + @(cd $(MODPERL_SRC) && $(MAKE) clean);
  +
  +EOF
  +
   $string;
   }
   
   sub MY::clean {
   my $self = shift;
   my $string = $self->MM::clean(@_);
  -my $path = $code->path;
  -$string .= "\t-cd $path && \$(MAKE) clean\n";
  +$string =~ s/(clean\s+::)/$1 modperl_src_clean /;
   $string;
   }
   
  
  
  



cvs commit: modperl-site index.html

2000-04-24 Thread ask

ask 00/04/24 19:29:14

  Modified:.index.html
  Log:
  don't include release numbers when we don't update it anyway
  
  Revision  ChangesPath
  1.52  +5 -4  modperl-site/index.html
  
  Index: index.html
  ===
  RCS file: /home/cvs/modperl-site/index.html,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- index.html2000/04/12 21:18:14 1.51
  +++ index.html2000/04/25 02:29:14 1.52
  @@ -46,10 +46,11 @@
   
   
   
  -Latest stable release is 1.22, get it from this site 
  -or from http://www.cpan.org/modules/by-module/Apache">CPAN. 
  -The latest CVS snapshot is available from http://perl.apache.org/from-cvs/modperl/">here (updated every 6 hours).
  +Get the latest stable release from this site or
  +from http://www.cpan.org/modules/by-module/Apache">CPAN.
  +The latest CVS snapshot is available
  +from http://perl.apache.org/from-cvs/modperl/">here
  +(updated every 6 hours).