stas 01/09/05 22:05:47
Modified: perl-framework/Apache-Test/lib/Apache TestConfigPerl.pm
TestTrace.pm
lib/Apache ParseSource.pm
todo missing_old_features.txt
xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Added: perl-framework/Apache-Test/lib/Apache TestUtil.pm
Log:
Apache-Test/lib/Apache/TestUtil.pm
Revision Changes Path
1.21 +10 -3
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm
Index: TestConfigPerl.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TestConfigPerl.pm 2001/08/27 17:13:26 1.20
+++ TestConfigPerl.pm 2001/09/06 05:05:46 1.21
@@ -245,11 +245,18 @@
my @args;
my $pm = $_;
- my $module = catfile $File::Find::dir, $pm;
- $self->add_module_config($module, \@args);
- $module = abs2rel $module, $dir;
+ my $file = catfile $File::Find::dir, $pm;
+ $self->add_module_config($file, \@args);
+ my $module = abs2rel $file, $dir;
$module =~ s,\.pm$,,;
$module = join '::', splitdir $module;
+
+# require $file;
+# my $configure_sub = \&{$module."::APACHE_TEST_CONFIGURE"};
+# if ($configure_sub) {
+# eval {$self->$configure_sub};
+# warn $@ if $@;
+# }
my($base, $sub) =
map { s/^test//i; $_ } split '::', $module;
1.5 +1 -0 httpd-test/perl-framework/Apache-Test/lib/Apache/TestTrace.pm
Index: TestTrace.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestTrace.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestTrace.pm 2001/08/31 00:47:56 1.4
+++ TestTrace.pm 2001/09/06 05:05:46 1.5
@@ -1,6 +1,7 @@
package Apache::TestTrace;
use strict;
+use warnings FATAL => 'all';
use Exporter ();
our (@Levels, @Utils);
1.1 httpd-test/perl-framework/Apache-Test/lib/Apache/TestUtil.pm
Index: TestUtil.pm
===================================================================
package Apache::TestUtil;
use strict;
use warnings FATAL => 'all';
use File::Find ();
use File::Path ();
use Exporter ();
our $VERSION = '0.01';
our @ISA = qw(Exporter);
our @EXPORT = qw(t_cmp t_write_file t_open_file t_mkdir t_rm_tree);
our %CLEAN = ();
# t_cmp($expect,$received,$comment)
# returns the result of comparison of $expect and $received
# first prints all the arguments for debug.
##################
sub t_cmp {
my ($expect, $received, $comment) = @_;
print "testing : $comment\n" if defined $comment;
print "expected: $expect\n";
print "received: $received\n";
$expect eq $received;
}
# t_write_file($filename,@lines);
# the file will be deleted at the end of the tests run
#################
sub t_write_file {
my $file = shift;
open my $fh, ">", $file or die "can't open $file: $!";
print "writing file: $file\n";
print $fh join '', @_ if @_;
close $fh;
$CLEAN{files}{$file}++;
}
# t_open_file($filename);
# open a file for writing and return the open fh
# the file will be deleted at the end of the tests run
################
sub t_open_file {
my $file = shift;
open my $fh, ">", $file or die "can't open $file: $!";
print "writing file: $file\n";
$CLEAN{files}{$file}++;
return $fh;
}
# t_mkdir($dirname)
# create a dir
# the dir will be deleted at the end of the tests run
############
sub t_mkdir {
my $dir = shift;
mkdir $dir, 0755 unless -d $dir;
print "creating dir: $dir\n";
$CLEAN{dirs}{$dir}++;
}
# deletes the whole tree(s) or just file(s)
# accepts a list of dirs to delete
###############
sub t_rm_tree {
File::Path::rmtree((@_ > 1 ? \@_ : $_[0]), 0, 1);
}
END{
# cleanup first files than dirs
map { unlink $_ } grep {-e $_ && -f _ } keys %{ $CLEAN{files} };
map { t_rm_tree($_) } grep {-e $_ && -d _ } keys %{ $CLEAN{dirs} };
}
1;
__END__
=head1 NAME
Apache::TestUtil - Utilities for writing tests
=head1 SYNOPSIS
=head1 DESCRIPTION
=cut
1.24 +33 -6 modperl-2.0/lib/Apache/ParseSource.pm
Index: ParseSource.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/ParseSource.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ParseSource.pm 2001/08/19 18:51:26 1.23
+++ ParseSource.pm 2001/09/06 05:05:46 1.24
@@ -2,6 +2,7 @@
use strict;
use Apache::Build ();
+use Apache::TestTrace;
use Config ();
our $VERSION = '0.02';
@@ -410,19 +411,41 @@
$file = "$tdir/$subdir/$file";
}
- open my $pm, '>', $file or die "open $file: $!";
+ my $old_dump = '';
+ if (-e $file) {
+ my @old_file = ();
+ open my $old, '<', $file or die "open $file: $!";
+ my $skip = 1;
+ while (<$old>) {
+ if ($skip){
+ $skip = 0 if /^\$Apache/;
+ }
+ else {
+ $skip = 1 if /^\s*\n/;
+ }
+ push @old_file, $_ unless $skip;
+ }
+ close $old;
+ $old_dump = join '', @old_file;
+ }
+
# sort the hashes (including nested ones) for a consistent dump
canonsort(\$data);
my $dump = Data::Dumper->new([$data],
[$name])->Dump;
- my $package = ref($self) || $self;
- my $version = $self->VERSION;
- my $date = scalar localtime;
+ # write the file only if it has been changed
+ if ($dump ne $old_dump) {
- print $pm <<EOF;
+ my $package = ref($self) || $self;
+ my $version = $self->VERSION;
+ my $date = scalar localtime;
+
+ open my $pm, '>', $file or die "open $file: $!";
+
+ print $pm <<EOF;
package $name;
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -435,7 +458,11 @@
1;
EOF
- close $pm;
+ close $pm;
+ }
+ else {
+ warning "$file didn't change, skipping creating of the file";
+ }
}
# canonsort(\$data);
1.4 +1 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- missing_old_features.txt 2001/08/08 07:02:41 1.3
+++ missing_old_features.txt 2001/09/06 05:05:46 1.4
@@ -46,7 +46,7 @@
- mod_perl.pm::import
-- Apache::PerlRun, Apache::{Registry,RegistryNG}, Apache::RegistryLoader
+- Apache::PerlRun, Apache::{Registry, RegistryNG}, Apache::RegistryLoader
- Apache::Status
1.13 +1 -1 modperl-2.0/xs/tables/current/Apache/ConstantsTable.pm
Index: ConstantsTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/ConstantsTable.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ConstantsTable.pm 2001/08/19 18:51:42 1.12
+++ ConstantsTable.pm 2001/09/06 05:05:46 1.13
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sun Aug 19 11:43:53 2001
+# ! Wed Aug 29 00:18:55 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1.15 +429 -22 modperl-2.0/xs/tables/current/Apache/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/FunctionTable.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FunctionTable.pm 2001/08/19 17:31:49 1.14
+++ FunctionTable.pm 2001/09/06 05:05:46 1.15
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sun Aug 19 10:32:09 2001
+# ! Wed Aug 29 00:20:03 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -554,6 +554,26 @@
]
},
{
+ 'return_type' => 'apr_port_t',
+ 'name' => 'ap_default_port_for_request',
+ 'args' => [
+ {
+ 'type' => 'const request_rec *',
+ 'name' => 'r'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_port_t',
+ 'name' => 'ap_default_port_for_scheme',
+ 'args' => [
+ {
+ 'type' => 'const char *',
+ 'name' => 'scheme_str'
+ }
+ ]
+ },
+ {
'return_type' => 'const char *',
'name' => 'ap_default_type',
'args' => [
@@ -589,6 +609,16 @@
},
{
'return_type' => 'int',
+ 'name' => 'ap_directory_walk',
+ 'args' => [
+ {
+ 'type' => 'request_rec *',
+ 'name' => 'r'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'int',
'name' => 'ap_discard_request_body',
'args' => [
{
@@ -717,6 +747,16 @@
]
},
{
+ 'return_type' => 'int',
+ 'name' => 'ap_file_walk',
+ 'args' => [
+ {
+ 'type' => 'request_rec *',
+ 'name' => 'r'
+ }
+ ]
+ },
+ {
'return_type' => 'apr_status_t',
'name' => 'ap_filter_flush',
'args' => [
@@ -1545,6 +1585,11 @@
'args' => []
},
{
+ 'return_type' => 'apr_array_header_t *',
+ 'name' => 'ap_hook_get_map_to_storage',
+ 'args' => []
+ },
+ {
'return_type' => 'void',
'name' => 'ap_hook_get_mgmt_items',
'args' => [
@@ -1755,6 +1800,28 @@
},
{
'return_type' => 'void',
+ 'name' => 'ap_hook_map_to_storage',
+ 'args' => [
+ {
+ 'type' => 'ap_HOOK_map_to_storage_t *',
+ 'name' => 'pf'
+ },
+ {
+ 'type' => 'const char * const *',
+ 'name' => 'aszPre'
+ },
+ {
+ 'type' => 'const char * const *',
+ 'name' => 'aszSucc'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'nOrder'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void',
'name' => 'ap_hook_open_logs',
'args' => [
{
@@ -2194,6 +2261,16 @@
]
},
{
+ 'return_type' => 'int',
+ 'name' => 'ap_location_walk',
+ 'args' => [
+ {
+ 'type' => 'request_rec *',
+ 'name' => 'r'
+ }
+ ]
+ },
+ {
'return_type' => 'void',
'name' => 'ap_log_assert',
'args' => [
@@ -2996,6 +3073,38 @@
]
},
{
+ 'return_type' => 'int',
+ 'name' => 'ap_os_is_path_absolute',
+ 'args' => [
+ {
+ 'type' => 'apr_pool_t *',
+ 'name' => 'p'
+ },
+ {
+ 'type' => 'const char *',
+ 'name' => 'dir'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'int',
+ 'name' => 'ap_parse_hostinfo_components',
+ 'args' => [
+ {
+ 'type' => 'apr_pool_t *',
+ 'name' => 'p'
+ },
+ {
+ 'type' => 'const char *',
+ 'name' => 'hostinfo'
+ },
+ {
+ 'type' => 'uri_components *',
+ 'name' => 'uptr'
+ }
+ ]
+ },
+ {
'return_type' => 'void',
'name' => 'ap_parse_uri',
'args' => [
@@ -3010,6 +3119,24 @@
]
},
{
+ 'return_type' => 'int',
+ 'name' => 'ap_parse_uri_components',
+ 'args' => [
+ {
+ 'type' => 'apr_pool_t *',
+ 'name' => 'p'
+ },
+ {
+ 'type' => 'const char *',
+ 'name' => 'uri'
+ },
+ {
+ 'type' => 'uri_components *',
+ 'name' => 'uptr'
+ }
+ ]
+ },
+ {
'return_type' => 'const char *',
'name' => 'ap_parse_vhost_addrs',
'args' => [
@@ -3417,6 +3544,16 @@
},
{
'return_type' => 'void',
+ 'name' => 'ap_remove_input_filter',
+ 'args' => [
+ {
+ 'type' => 'ap_filter_t *',
+ 'name' => 'f'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void',
'name' => 'ap_remove_loaded_module',
'args' => [
{
@@ -3634,24 +3771,24 @@
'name' => 'level'
},
{
- 'type' => 'apr_status_t status',
- 'name' => 'arg3'
+ 'type' => 'apr_status_t',
+ 'name' => 'status'
},
{
'type' => 'const server_rec *',
'name' => 's'
},
{
- 'type' => 'const request_rec *r',
- 'name' => 'arg5'
+ 'type' => 'const request_rec *',
+ 'name' => 'r'
},
{
'type' => 'apr_pool_t *',
'name' => 'pool'
},
{
- 'type' => 'const char *errstr',
- 'name' => 'arg7'
+ 'type' => 'const char *',
+ 'name' => 'errstr'
}
]
},
@@ -3744,6 +3881,16 @@
]
},
{
+ 'return_type' => 'int',
+ 'name' => 'ap_run_map_to_storage',
+ 'args' => [
+ {
+ 'type' => 'request_rec *',
+ 'name' => 'r'
+ }
+ ]
+ },
+ {
'return_type' => 'void',
'name' => 'ap_run_open_logs',
'args' => [
@@ -4097,7 +4244,7 @@
]
},
{
- 'return_type' => 'const char *',
+ 'return_type' => 'char *',
'name' => 'ap_server_root_relative',
'args' => [
{
@@ -4609,6 +4756,24 @@
]
},
{
+ 'return_type' => 'char *',
+ 'name' => 'ap_unparse_uri_components',
+ 'args' => [
+ {
+ 'type' => 'apr_pool_t *',
+ 'name' => 'p'
+ },
+ {
+ 'type' => 'const uri_components *',
+ 'name' => 'uptr'
+ },
+ {
+ 'type' => 'unsigned',
+ 'name' => 'flags'
+ }
+ ]
+ },
+ {
'return_type' => 'int',
'name' => 'ap_update_child_status',
'args' => [
@@ -7257,6 +7422,42 @@
},
{
'return_type' => 'void',
+ 'name' => 'apr_hook_generic_add',
+ 'args' => [
+ {
+ 'type' => 'const char *',
+ 'name' => 'szName'
+ },
+ {
+ 'type' => 'void (*pfn)(void)',
+ 'name' => 'arg1'
+ },
+ {
+ 'type' => 'const char * const *',
+ 'name' => 'aszPre'
+ },
+ {
+ 'type' => 'const char * const *',
+ 'name' => 'aszSucc'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'nOrder'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_array_header_t *',
+ 'name' => 'apr_hook_generic_get',
+ 'args' => [
+ {
+ 'type' => 'const char *',
+ 'name' => 'szName'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void',
'name' => 'apr_hook_sort_register',
'args' => [
{
@@ -7752,6 +7953,174 @@
},
{
'return_type' => 'apr_status_t',
+ 'name' => 'apr_memory_system_cleanup_register',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'memory_system'
+ },
+ {
+ 'type' => 'void *',
+ 'name' => 'data'
+ },
+ {
+ 'type' => 'apr_status_t (*cleanup_fn)(void *)',
+ 'name' => 'arg2'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_memory_system_cleanup_run',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'memory_system'
+ },
+ {
+ 'type' => 'void *',
+ 'name' => 'data'
+ },
+ {
+ 'type' => 'apr_status_t (*cleanup)(void *)',
+ 'name' => 'arg2'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_memory_system_cleanup_unregister',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'memory_system'
+ },
+ {
+ 'type' => 'void *',
+ 'name' => 'data'
+ },
+ {
+ 'type' => 'apr_status_t (*cleanup)(void *)',
+ 'name' => 'arg2'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_memory_system_t *',
+ 'name' => 'apr_memory_system_create',
+ 'args' => [
+ {
+ 'type' => 'void *',
+ 'name' => 'memory'
+ },
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'parent_memory_system'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_memory_system_destroy',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'memory_system'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_memory_system_free',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'memory_system'
+ },
+ {
+ 'type' => 'void *',
+ 'name' => 'mem'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_memory_system_is_ancestor',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'a'
+ },
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'b'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void *',
+ 'name' => 'apr_memory_system_malloc',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'memory_system'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'size'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void *',
+ 'name' => 'apr_memory_system_realloc',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'memory_system'
+ },
+ {
+ 'type' => 'void *',
+ 'name' => 'mem'
+ },
+ {
+ 'type' => 'apr_size_t',
+ 'name' => 'size'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_memory_system_reset',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'memory_system'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void',
+ 'name' => 'apr_memory_system_threadsafe_lock',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'memory_system'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'void',
+ 'name' => 'apr_memory_system_threadsafe_unlock',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'memory_system'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
'name' => 'apr_mmap_create',
'args' => [
{
@@ -10065,20 +10434,6 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_sms_tracking_create',
- 'args' => [
- {
- 'type' => 'apr_sms_t **',
- 'name' => 'mem_sys'
- },
- {
- 'type' => 'apr_sms_t *',
- 'name' => 'pms'
- }
- ]
- },
- {
- 'return_type' => 'apr_status_t',
'name' => 'apr_sms_trivial_create',
'args' => [
{
@@ -10406,6 +10761,16 @@
},
{
'return_type' => 'apr_status_t',
+ 'name' => 'apr_standard_memory_system_create',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t **',
+ 'name' => 'memory_system'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
'name' => 'apr_stat',
'args' => [
{
@@ -10917,6 +11282,34 @@
]
},
{
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_thread_once',
+ 'args' => [
+ {
+ 'type' => 'apr_thread_once_t *',
+ 'name' => 'control'
+ },
+ {
+ 'type' => 'void (*func)(void)',
+ 'name' => 'arg1'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_thread_once_init',
+ 'args' => [
+ {
+ 'type' => 'apr_thread_once_t **',
+ 'name' => 'control'
+ },
+ {
+ 'type' => 'apr_pool_t *',
+ 'name' => 'p'
+ }
+ ]
+ },
+ {
'return_type' => 'apr_pool_t *',
'name' => 'apr_thread_pool_get',
'args' => [
@@ -11085,6 +11478,20 @@
{
'type' => 'apr_pool_t *',
'name' => 'token_context'
+ }
+ ]
+ },
+ {
+ 'return_type' => 'apr_status_t',
+ 'name' => 'apr_tracking_memory_system_create',
+ 'args' => [
+ {
+ 'type' => 'apr_memory_system_t **',
+ 'name' => 'memory_system'
+ },
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'parent_memory_system'
}
]
},
1.14 +180 -4 modperl-2.0/xs/tables/current/Apache/StructureTable.pm
Index: StructureTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/StructureTable.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StructureTable.pm 2001/08/19 17:31:49 1.13
+++ StructureTable.pm 2001/09/06 05:05:46 1.14
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sun Aug 19 10:32:11 2001
+# ! Wed Aug 29 00:20:05 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -68,6 +68,10 @@
'elts' => []
},
{
+ 'type' => 'ap_HOOK_map_to_storage_t',
+ 'elts' => []
+ },
+ {
'type' => 'ap_HOOK_open_logs_t',
'elts' => []
},
@@ -487,6 +491,31 @@
]
},
{
+ 'type' => 'ap_LINK_map_to_storage_t',
+ 'elts' => [
+ {
+ 'type' => 'ap_HOOK_map_to_storage_t *',
+ 'name' => 'pFunc'
+ },
+ {
+ 'type' => 'const char *',
+ 'name' => 'szName'
+ },
+ {
+ 'type' => 'const char * const *',
+ 'name' => 'aszPredecessors'
+ },
+ {
+ 'type' => 'const char * const *',
+ 'name' => 'aszSuccessors'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'nOrder'
+ }
+ ]
+ },
+ {
'type' => 'ap_LINK_open_logs_t',
'elts' => [
{
@@ -771,6 +800,10 @@
{
'type' => 'const char *',
'name' => 'data'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
}
]
},
@@ -1053,7 +1086,7 @@
'type' => 'apr_bucket',
'elts' => [
{
- 'type' => '_ANON 40',
+ 'type' => '_ANON 62',
'name' => 'link'
},
{
@@ -1073,8 +1106,8 @@
'name' => 'data'
},
{
- 'type' => 'void(*)(void *e)',
- 'name' => 'free'
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
}
]
},
@@ -1105,6 +1138,10 @@
{
'type' => 'apr_pool_t *',
'name' => 'readpool'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
}
]
},
@@ -1122,6 +1159,10 @@
{
'type' => 'apr_size_t',
'name' => 'alloc_len'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
}
]
},
@@ -1135,6 +1176,10 @@
{
'type' => 'apr_mmap_t *',
'name' => 'mmap'
+ },
+ {
+ 'type' => 'apr_sms_t *',
+ 'name' => 'sms'
}
]
},
@@ -1581,6 +1626,68 @@
]
},
{
+ 'type' => 'apr_memory_system_t',
+ 'elts' => [
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'parent_memory_system'
+ },
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'child_memory_system'
+ },
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'sibling_memory_system'
+ },
+ {
+ 'type' => 'apr_memory_system_t **',
+ 'name' => 'ref_memory_system'
+ },
+ {
+ 'type' => 'apr_memory_system_t *',
+ 'name' => 'accounting_memory_system'
+ },
+ {
+ 'type' => 'apr_memory_system_cleanup *',
+ 'name' => 'cleanups'
+ },
+ {
+ 'type' => 'void *(*)(apr_memory_system_t *memory_system, apr_size_t size)',
+ 'name' => 'malloc_fn'
+ },
+ {
+ 'type' => 'void *(*)(apr_memory_system_t *memory_system, void *memory,
+ apr_size_t size)',
+ 'name' => 'realloc_fn'
+ },
+ {
+ 'type' => 'apr_status_t(*)(apr_memory_system_t *memory_system, void
*memory)',
+ 'name' => 'free_fn'
+ },
+ {
+ 'type' => 'apr_status_t(*)(apr_memory_system_t *memory_system)',
+ 'name' => 'reset_fn'
+ },
+ {
+ 'type' => 'void(*)(apr_memory_system_t *memory_system)',
+ 'name' => 'pre_destroy_fn'
+ },
+ {
+ 'type' => 'void(*)(apr_memory_system_t *memory_system)',
+ 'name' => 'destroy_fn'
+ },
+ {
+ 'type' => 'void(*)(apr_memory_system_t *memory_system)',
+ 'name' => 'threadsafe_lock_fn'
+ },
+ {
+ 'type' => 'void(*)(apr_memory_system_t *memory_system)',
+ 'name' => 'threadsafe_unlock_fn'
+ }
+ ]
+ },
+ {
'type' => 'apr_mmap_t',
'elts' => [
{
@@ -1970,6 +2077,10 @@
]
},
{
+ 'type' => 'apr_thread_once_t',
+ 'elts' => []
+ },
+ {
'type' => 'apr_thread_start_t',
'elts' => []
},
@@ -2703,6 +2814,10 @@
},
{
'type' => 'char *',
+ 'name' => 'canonical_filename'
+ },
+ {
+ 'type' => 'char *',
'name' => 'path_info'
},
{
@@ -2887,6 +3002,67 @@
{
'type' => 'int',
'name' => 'suexec_enabled'
+ }
+ ]
+ },
+ {
+ 'type' => 'uri_components',
+ 'elts' => [
+ {
+ 'type' => 'char *',
+ 'name' => 'scheme'
+ },
+ {
+ 'type' => 'char *',
+ 'name' => 'hostinfo'
+ },
+ {
+ 'type' => 'char *',
+ 'name' => 'user'
+ },
+ {
+ 'type' => 'char *',
+ 'name' => 'password'
+ },
+ {
+ 'type' => 'char *',
+ 'name' => 'hostname'
+ },
+ {
+ 'type' => 'char *',
+ 'name' => 'port_str'
+ },
+ {
+ 'type' => 'char *',
+ 'name' => 'path'
+ },
+ {
+ 'type' => 'char *',
+ 'name' => 'query'
+ },
+ {
+ 'type' => 'char *',
+ 'name' => 'fragment'
+ },
+ {
+ 'type' => 'hostent *',
+ 'name' => 'hostent'
+ },
+ {
+ 'type' => 'apr_port_t',
+ 'name' => 'port'
+ },
+ {
+ 'type' => 'unsigned',
+ 'name' => 'is_initialized'
+ },
+ {
+ 'type' => 'unsigned',
+ 'name' => 'dns_looked_up'
+ },
+ {
+ 'type' => 'unsigned',
+ 'name' => 'dns_resolved'
}
]
}
1.21 +1 -1 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- FunctionTable.pm 2001/08/19 17:31:49 1.20
+++ FunctionTable.pm 2001/09/06 05:05:46 1.21
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sun Aug 19 10:32:24 2001
+# ! Wed Aug 29 00:20:17 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
