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/net/perl tie_table.pl
Date Fri, 13 Nov 1998 03:27:58 GMT
dougm       98/11/12 19:27:57

  Modified:    .        Changes MANIFEST Makefile.PL ToDo
               src/modules/ApacheModulePerl ApacheModulePerl.dsp
               src/modules/perl File.xs Log.xs PerlRunXS.xs Table.xs URI.xs
                        Util.xs perl_config.c
               t/conf   httpd.conf-win32
               t/internal table.t
               t/net/perl tie_table.pl
  Log:
  new-ish xs modules added to win32 build: Apache::Log, Apache::File,
  Apache::Table, Apache::URI, Apache::Util
  
  Revision  Changes    Path
  1.195     +3 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.194
  retrieving revision 1.195
  diff -u -r1.194 -r1.195
  --- Changes	1998/11/12 21:07:33	1.194
  +++ Changes	1998/11/13 03:27:47	1.195
  @@ -8,6 +8,9 @@
   
   =item 1.16_01-dev
   
  +new-ish xs modules added to win32 build: Apache::Log, Apache::File,
  +Apache::Table, Apache::URI, Apache::Util
  + 
   new Apache::Table->new method
   
   two experimental options now on by default: 
  
  
  
  1.50      +0 -1      modperl/MANIFEST
  
  Index: MANIFEST
  ===================================================================
  RCS file: /export/home/cvs/modperl/MANIFEST,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- MANIFEST	1998/11/08 02:13:43	1.49
  +++ MANIFEST	1998/11/13 03:27:48	1.50
  @@ -96,7 +96,6 @@
   src/modules/perl/perl_config.c
   src/modules/perl/Makefile
   src/modules/ApacheModulePerl/ApacheModulePerl.dsp
  -src/modules/ApacheModulePerl/ApacheModulePerl.mak
   src/opcodes.txt
   t/report.PL
   t/README
  
  
  
  1.111     +1 -1      modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /export/home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- Makefile.PL	1998/11/12 20:04:50	1.110
  +++ Makefile.PL	1998/11/13 03:27:48	1.111
  @@ -603,7 +603,7 @@
   }
   for (qw(Log URI Util Connection Server File Table)) {
       my $s = "PERL_".uc($_)."_API";
  -    if($$s) {
  +    if($$s or $Is_Win32) {
   	push @xs_modules, "Apache::$_";
   	$callback_hooks{$s} = 1;
       }
  
  
  
  1.113     +0 -2      modperl/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /export/home/cvs/modperl/ToDo,v
  retrieving revision 1.112
  retrieving revision 1.113
  diff -u -r1.112 -r1.113
  --- ToDo	1998/11/08 01:22:03	1.112
  +++ ToDo	1998/11/13 03:27:48	1.113
  @@ -9,8 +9,6 @@
   
   - Andrew Ford's Apache::FakeRequest patch
   
  -- sync ApacheModulePerl.dsp -> .mak, add Util.c, etc. sources
  -
   - <Perl>/%Apache::ReadConfig:: brokeness (My::configure() example, Eric Cholet)
   
   - sort out =pod configuration directives
  
  
  
  1.4       +20 -0     modperl/src/modules/ApacheModulePerl/ApacheModulePerl.dsp
  
  Index: ApacheModulePerl.dsp
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/ApacheModulePerl/ApacheModulePerl.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheModulePerl.dsp	1998/07/30 15:37:20	1.3
  +++ ApacheModulePerl.dsp	1998/11/13 03:27:50	1.4
  @@ -104,6 +104,26 @@
   # End Source File
   # Begin Source File
   
  +SOURCE=..\perl\File.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\perl\Log.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\perl\URI.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\perl\Util.c
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=..\perl\Table.c
  +# End Source File
  +# Begin Source File
  +
   SOURCE=..\perl\Server.c
   # End Source File
   # Begin Source File
  
  
  
  1.5       +0 -4      modperl/src/modules/perl/File.xs
  
  Index: File.xs
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/File.xs,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- File.xs	1998/11/08 01:15:20	1.4
  +++ File.xs	1998/11/13 03:27:51	1.5
  @@ -1,8 +1,4 @@
  -#ifdef MOD_PERL
   #include "mod_perl.h"
  -#else
  -#include "modules/perl/mod_perl.h"
  -#endif
   
   #define ap_fopen(r, name, mode) \
           ap_pfopen(r->pool, name, mode)
  
  
  
  1.7       +0 -4      modperl/src/modules/perl/Log.xs
  
  Index: Log.xs
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/Log.xs,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Log.xs	1998/11/12 14:56:25	1.6
  +++ Log.xs	1998/11/13 03:27:51	1.7
  @@ -1,8 +1,4 @@
  -#ifdef MOD_PERL
   #include "mod_perl.h"
  -#else
  -#include "modules/perl/mod_perl.h"
  -#endif
   
   #if MODULE_MAGIC_NUMBER >= MMN_132
   #define HAVE_LOG_RERROR 1
  
  
  
  1.7       +0 -4      modperl/src/modules/perl/PerlRunXS.xs
  
  Index: PerlRunXS.xs
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/PerlRunXS.xs,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PerlRunXS.xs	1998/10/01 20:26:18	1.6
  +++ PerlRunXS.xs	1998/11/13 03:27:51	1.7
  @@ -55,11 +55,7 @@
    *
    */
   
  -#ifdef MOD_PERL
   #include "mod_perl.h"
  -#else
  -#include "modules/perl/mod_perl.h"
  -#endif
   
   static const char c2x_table[] = "0123456789abcdef";
   
  
  
  
  1.4       +2 -2      modperl/src/modules/perl/Table.xs
  
  Index: Table.xs
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/Table.xs,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Table.xs	1998/11/12 21:07:35	1.3
  +++ Table.xs	1998/11/13 03:27:52	1.4
  @@ -223,7 +223,7 @@
       SV *sv;
   
       CODE:
  -    table_modify(self, key, sv, table_add);
  +    table_modify(self, key, sv, (void*)table_add);
   
   void
   merge(self, key, sv)
  @@ -232,7 +232,7 @@
       SV *sv
   
       CODE:
  -    table_modify(self, key, sv, table_merge);
  +    table_modify(self, key, sv, (void*)table_merge);
   
   void
   do(self, cv, ...)
  
  
  
  1.5       +0 -5      modperl/src/modules/perl/URI.xs
  
  Index: URI.xs
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/URI.xs,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- URI.xs	1998/10/26 20:58:24	1.4
  +++ URI.xs	1998/11/13 03:27:52	1.5
  @@ -1,10 +1,5 @@
  -#ifdef MOD_PERL
   #include "mod_perl.h"
   #include "mod_perl_xs.h"
  -#else
  -#include "modules/perl/mod_perl.h"
  -#include "modules/perl/mod_perl_xs.h"
  -#endif  
   
   typedef struct {
       uri_components uri;
  
  
  
  1.8       +0 -5      modperl/src/modules/perl/Util.xs
  
  Index: Util.xs
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/Util.xs,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Util.xs	1998/10/26 23:14:30	1.7
  +++ Util.xs	1998/11/13 03:27:52	1.8
  @@ -1,9 +1,4 @@
  -#ifdef MOD_PERL
   #include "mod_perl.h"
  -#else
  -#include "modules/perl/mod_perl.h"
  -#endif 
  -
   #include "util_date.h"
   
   #define TIME_NOW time(NULL)
  
  
  
  1.44      +0 -7      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.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- perl_config.c	1998/11/12 19:49:56	1.43
  +++ perl_config.c	1998/11/13 03:27:52	1.44
  @@ -373,13 +373,6 @@
   CHAR_P perl_cmd_push_handlers(char *hook, PERL_CMD_TYPE **cmd, char *arg, pool *p)
   { 
       SV *sva;
  -#if !APACHE_SSL_12X && !defined(WIN32)
  -    if(!PERL_RUNNING()) { 
  -        MP_TRACE_d(fprintf(stderr, "perl_cmd_push_handlers: perl not running, skipping
push\n")); 
  -	return NULL; 
  -    } 
  -#endif
  -
       mp_preload_module(&arg);
       sva = newSVpv(arg,0); 
       if(!*cmd) { 
  
  
  
  1.8       +2 -6      modperl/t/conf/httpd.conf-win32
  
  Index: httpd.conf-win32
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/conf/httpd.conf-win32,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- httpd.conf-win32	1998/10/01 03:21:47	1.7
  +++ httpd.conf-win32	1998/11/13 03:27:56	1.8
  @@ -6,15 +6,10 @@
   
   #PerlFreshRestart On
   
  -
   #Configuration directives specific to mod_perl
   
   ServerRoot "./t"
   
  -User nobody
  -
  -Group nogroup
  -
   Port 8529
   
   ServerName localhost
  @@ -26,6 +21,7 @@
   
   LoadModule perl_module modules/ApacheModulePerl.dll
   
  +PerlRequire docs/startup.pl
   
   #-Tw
   
  @@ -42,8 +38,8 @@
   
   PerlTransHandler PerlTransHandler
   
  +
   
  -PerlScript docs/startup.pl
   
   
   Alias /perl/ ./t/net/perl/
  
  
  
  1.2       +0 -2      modperl/t/internal/table.t
  
  Index: table.t
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/internal/table.t,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- table.t	1998/10/30 02:01:34	1.1
  +++ table.t	1998/11/13 03:27:56	1.2
  @@ -1,5 +1,3 @@
   use Apache::test;
   
  -skip_test unless $net::callback_hooks{PERL_TABLE_API};
  -
   print fetch "$PERL_DIR/tie_table.pl";
  
  
  
  1.11      +5 -1      modperl/t/net/perl/tie_table.pl
  
  Index: tie_table.pl
  ===================================================================
  RCS file: /export/home/cvs/modperl/t/net/perl/tie_table.pl,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- tie_table.pl	1998/11/12 21:07:35	1.10
  +++ tie_table.pl	1998/11/13 03:27:57	1.11
  @@ -1,10 +1,14 @@
   use Apache::test;
  -use Apache::Table ();
   
   use strict;
   my $r = shift;
   
   $r->send_http_header("text/plain");
  +
  +unless(have_module "Apache::Table") {
  +    print "1..0\n";
  +    return;
  +}
   
   my $i = 0;
   my $tests = 32;
  
  
  

Mime
View raw message