stas 01/09/05 22:16:25
Modified: perl-framework/Apache-Test/lib/Apache TestConfigPerl.pm
xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
reverting a stray commit :( sorry
Revision Changes Path
1.22 +3 -10
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TestConfigPerl.pm 2001/09/06 05:05:46 1.21
+++ TestConfigPerl.pm 2001/09/06 05:16:25 1.22
@@ -245,18 +245,11 @@
my @args;
my $pm = $_;
- my $file = catfile $File::Find::dir, $pm;
- $self->add_module_config($file, \@args);
- my $module = abs2rel $file, $dir;
+ my $module = catfile $File::Find::dir, $pm;
+ $self->add_module_config($module, \@args);
+ $module = abs2rel $module, $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.14 +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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ConstantsTable.pm 2001/09/06 05:05:46 1.13
+++ ConstantsTable.pm 2001/09/06 05:16:25 1.14
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Wed Aug 29 00:18:55 2001
+# ! Sun Aug 19 11:43:53 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1.16 +22 -429 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FunctionTable.pm 2001/09/06 05:05:46 1.15
+++ FunctionTable.pm 2001/09/06 05:16:25 1.16
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Wed Aug 29 00:20:03 2001
+# ! Sun Aug 19 10:32:09 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -554,26 +554,6 @@
]
},
{
- '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' => [
@@ -609,16 +589,6 @@
},
{
'return_type' => 'int',
- 'name' => 'ap_directory_walk',
- 'args' => [
- {
- 'type' => 'request_rec *',
- 'name' => 'r'
- }
- ]
- },
- {
- 'return_type' => 'int',
'name' => 'ap_discard_request_body',
'args' => [
{
@@ -747,16 +717,6 @@
]
},
{
- 'return_type' => 'int',
- 'name' => 'ap_file_walk',
- 'args' => [
- {
- 'type' => 'request_rec *',
- 'name' => 'r'
- }
- ]
- },
- {
'return_type' => 'apr_status_t',
'name' => 'ap_filter_flush',
'args' => [
@@ -1585,11 +1545,6 @@
'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' => [
@@ -1800,28 +1755,6 @@
},
{
'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' => [
{
@@ -2261,16 +2194,6 @@
]
},
{
- 'return_type' => 'int',
- 'name' => 'ap_location_walk',
- 'args' => [
- {
- 'type' => 'request_rec *',
- 'name' => 'r'
- }
- ]
- },
- {
'return_type' => 'void',
'name' => 'ap_log_assert',
'args' => [
@@ -3073,38 +2996,6 @@
]
},
{
- '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' => [
@@ -3119,24 +3010,6 @@
]
},
{
- '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' => [
@@ -3544,16 +3417,6 @@
},
{
'return_type' => 'void',
- 'name' => 'ap_remove_input_filter',
- 'args' => [
- {
- 'type' => 'ap_filter_t *',
- 'name' => 'f'
- }
- ]
- },
- {
- 'return_type' => 'void',
'name' => 'ap_remove_loaded_module',
'args' => [
{
@@ -3771,24 +3634,24 @@
'name' => 'level'
},
{
- 'type' => 'apr_status_t',
- 'name' => 'status'
+ 'type' => 'apr_status_t status',
+ 'name' => 'arg3'
},
{
'type' => 'const server_rec *',
'name' => 's'
},
{
- 'type' => 'const request_rec *',
- 'name' => 'r'
+ 'type' => 'const request_rec *r',
+ 'name' => 'arg5'
},
{
'type' => 'apr_pool_t *',
'name' => 'pool'
},
{
- 'type' => 'const char *',
- 'name' => 'errstr'
+ 'type' => 'const char *errstr',
+ 'name' => 'arg7'
}
]
},
@@ -3881,16 +3744,6 @@
]
},
{
- 'return_type' => 'int',
- 'name' => 'ap_run_map_to_storage',
- 'args' => [
- {
- 'type' => 'request_rec *',
- 'name' => 'r'
- }
- ]
- },
- {
'return_type' => 'void',
'name' => 'ap_run_open_logs',
'args' => [
@@ -4244,7 +4097,7 @@
]
},
{
- 'return_type' => 'char *',
+ 'return_type' => 'const char *',
'name' => 'ap_server_root_relative',
'args' => [
{
@@ -4756,24 +4609,6 @@
]
},
{
- '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' => [
@@ -7422,42 +7257,6 @@
},
{
'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' => [
{
@@ -7953,174 +7752,6 @@
},
{
'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' => [
{
@@ -10434,6 +10065,20 @@
},
{
'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' => [
{
@@ -10761,16 +10406,6 @@
},
{
'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' => [
{
@@ -11282,34 +10917,6 @@
]
},
{
- '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' => [
@@ -11478,20 +11085,6 @@
{
'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.15 +4 -180 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StructureTable.pm 2001/09/06 05:05:46 1.14
+++ StructureTable.pm 2001/09/06 05:16:25 1.15
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Wed Aug 29 00:20:05 2001
+# ! Sun Aug 19 10:32:11 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -68,10 +68,6 @@
'elts' => []
},
{
- 'type' => 'ap_HOOK_map_to_storage_t',
- 'elts' => []
- },
- {
'type' => 'ap_HOOK_open_logs_t',
'elts' => []
},
@@ -491,31 +487,6 @@
]
},
{
- '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' => [
{
@@ -800,10 +771,6 @@
{
'type' => 'const char *',
'name' => 'data'
- },
- {
- 'type' => 'apr_sms_t *',
- 'name' => 'sms'
}
]
},
@@ -1086,7 +1053,7 @@
'type' => 'apr_bucket',
'elts' => [
{
- 'type' => '_ANON 62',
+ 'type' => '_ANON 40',
'name' => 'link'
},
{
@@ -1106,8 +1073,8 @@
'name' => 'data'
},
{
- 'type' => 'apr_sms_t *',
- 'name' => 'sms'
+ 'type' => 'void(*)(void *e)',
+ 'name' => 'free'
}
]
},
@@ -1138,10 +1105,6 @@
{
'type' => 'apr_pool_t *',
'name' => 'readpool'
- },
- {
- 'type' => 'apr_sms_t *',
- 'name' => 'sms'
}
]
},
@@ -1159,10 +1122,6 @@
{
'type' => 'apr_size_t',
'name' => 'alloc_len'
- },
- {
- 'type' => 'apr_sms_t *',
- 'name' => 'sms'
}
]
},
@@ -1176,10 +1135,6 @@
{
'type' => 'apr_mmap_t *',
'name' => 'mmap'
- },
- {
- 'type' => 'apr_sms_t *',
- 'name' => 'sms'
}
]
},
@@ -1626,68 +1581,6 @@
]
},
{
- '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' => [
{
@@ -2077,10 +1970,6 @@
]
},
{
- 'type' => 'apr_thread_once_t',
- 'elts' => []
- },
- {
'type' => 'apr_thread_start_t',
'elts' => []
},
@@ -2814,10 +2703,6 @@
},
{
'type' => 'char *',
- 'name' => 'canonical_filename'
- },
- {
- 'type' => 'char *',
'name' => 'path_info'
},
{
@@ -3002,67 +2887,6 @@
{
'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.22 +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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FunctionTable.pm 2001/09/06 05:05:46 1.21
+++ FunctionTable.pm 2001/09/06 05:16:25 1.22
@@ -2,7 +2,7 @@
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Wed Aug 29 00:20:17 2001
+# ! Sun Aug 19 10:32:24 2001
# ! do NOT edit, any changes will be lost !
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
