cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 02/03/09 16:17:05
Modified:xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.22 +4 -3 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ConstantsTable.pm 20 Jan 2002 18:35:26 - 1.21
+++ ConstantsTable.pm 10 Mar 2002 00:17:05 - 1.22
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sun Jan 20 10:13:22 2002
+# ! Sat Mar 9 16:13:55 2002
# ! do NOT edit, any changes will be lost !
# !!
@@ -133,8 +133,9 @@
'HTTP_NOT_EXTENDED'
],
'filter_type' => [
- 'AP_FTYPE_CONTENT',
- 'AP_FTYPE_HTTP_HEADER',
+ 'AP_FTYPE_RESOURCE',
+ 'AP_FTYPE_CONTENT_SET',
+ 'AP_FTYPE_PROTOCOL',
'AP_FTYPE_TRANSCODE',
'AP_FTYPE_CONNECTION',
'AP_FTYPE_NETWORK'
1.34 +334 -146 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- FunctionTable.pm 30 Jan 2002 03:29:38 - 1.33
+++ FunctionTable.pm 10 Mar 2002 00:17:05 - 1.34
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Tue Jan 29 19:27:23 2002
+# ! Sat Mar 9 16:14:02 2002
# ! do NOT edit, any changes will be lost !
# !!
@@ -848,7 +848,7 @@
'name' => 'ap_explode_recent_gmt',
'args' => [
{
-'type' => 'apr_exploded_time_t *',
+'type' => 'apr_time_exp_t *',
'name' => 'tm'
},
{
@@ -862,7 +862,7 @@
'name' => 'ap_explode_recent_localtime',
'args' => [
{
-'type' => 'apr_exploded_time_t *',
+'type' => 'apr_time_exp_t *',
'name' => 'tm'
},
{
@@ -1158,6 +1158,16 @@
]
},
{
+'return_type' => 'ap_filter_rec_t *',
+'name' => 'ap_get_input_filter_handle',
+'args' => [
+ {
+'type' => 'const char *',
+'name' => 'name'
+ }
+]
+ },
+ {
'return_type' => 'apr_off_t',
'name' => 'ap_get_limit_req_body',
'args' => [
@@ -1202,6 +1212,16 @@
]
},
{
+'return_type' => 'ap_filter_rec_t *',
+'name' => 'ap_get_output_filter_handle',
+'args' => [
+ {
+'type' => 'const char *',
+'name' => 'name'
+ }
+]
+ },
+ {
'return_type' => 'const char *',
'name' => 'ap_get_remote_host',
'args' => [
@@ -1505,11 +1525,6 @@
]
},
{
-'return_type' => 'int',
-'name' => 'ap_graceful_stop_signalled',
-'args' => []
- },
- {
'return_type' => 'void',
'name' => 'ap_hook_access_checker',
'args' => [
@@ -1599,6 +1614,28 @@
},
{
'return_type' => 'void',
+'name' => 'ap_hook_create_connection',
+'args' => [
+ {
+'type' => 'ap_HOOK_create_connection_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_create_request',
'args' => [
{
@@ -1707,6 +1744,11 @@
},
{
'return_type' => 'apr_array_header_t *',
+'name' => 'ap_hook_get_create_connection',
+'args' => []
+ },
+ {
+'return_type' => 'apr_array_header_t *',
'name' => 'ap_hook_get_create_request',
'args' => []
},
@@ -1757,11 +1799,6 @@
},
{
'return_type' => 'apr_array_header_t *',
-'name' => 'ap_hook_get_install_transport_filters',
-'args' => []
- },
- {
-'return_type' => 'apr_array_header_t *',
'name' => 'ap_hook_get_log_transaction',
'args' => []
},
@@ -1959,28 +1996,6 @@
},
{
'return_type' => 'void',
-'name' => 'ap_hook_install_transport_filters',
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 02/01/29 19:29:38
Modified:xs/tables/current/Apache FunctionTable.pm StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.33 +42 -1 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- FunctionTable.pm 29 Jan 2002 05:35:34 - 1.32
+++ FunctionTable.pm 30 Jan 2002 03:29:38 - 1.33
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Mon Jan 28 20:30:40 2002
+# ! Tue Jan 29 19:27:23 2002
# ! do NOT edit, any changes will be lost !
# !!
@@ -1757,6 +1757,11 @@
},
{
'return_type' => 'apr_array_header_t *',
+'name' => 'ap_hook_get_install_transport_filters',
+'args' => []
+ },
+ {
+'return_type' => 'apr_array_header_t *',
'name' => 'ap_hook_get_log_transaction',
'args' => []
},
@@ -1954,6 +1959,28 @@
},
{
'return_type' => 'void',
+'name' => 'ap_hook_install_transport_filters',
+'args' => [
+ {
+'type' => 'ap_HOOK_install_transport_filters_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_log_transaction',
'args' => [
{
@@ -4121,6 +4148,20 @@
{
'type' => 'request_rec *',
'name' => 'r'
+ }
+]
+ },
+ {
+'return_type' => 'int',
+'name' => 'ap_run_install_transport_filters',
+'args' => [
+ {
+'type' => 'conn_rec *',
+'name' => 'c'
+ },
+ {
+'type' => 'apr_socket_t *',
+'name' => 'csd'
}
]
},
1.29 +34 -5 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- StructureTable.pm 29 Jan 2002 05:35:34 - 1.28
+++ StructureTable.pm 30 Jan 2002 03:29:38 - 1.29
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Mon Jan 28 20:30:43 2002
+# ! Tue Jan 29 19:27:25 2002
# ! do NOT edit, any changes will be lost !
# !!
@@ -64,6 +64,10 @@
'elts' => []
},
{
+'type' => 'ap_HOOK_install_transport_filters_t',
+'elts' => []
+ },
+ {
'type' => 'ap_HOOK_log_transaction_t',
'elts' => []
},
@@ -466,6 +470,31 @@
]
},
{
+'type' => 'ap_LINK_install_transport_filters_t',
+'elts' => [
+ {
+'type' => 'ap_HOOK_install_transport_filters_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_log_transaction_t',
'elts' => [
{
@@ -2425,10 +2454,6 @@
'name' => 'vhost_lookup_data'
},
{
-'type' => 'apr_socket_t *',
-'name' => 'client_socket'
- },
- {
'type' => 'apr_sockaddr_t *',
'name' => 'local_addr'
},
@@ -2497,6 +2522,10 @@
'name' => 'sbh'
}
]
+ },
+ {
+'type' => 'core_net_rec',
+'elts' => []
},
{
'type' => 'htaccess_result',
1.58 +15 -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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- FunctionTable.pm 25 Jan 2002 04:04:12 - 1.57
+++ F
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 02/01/24 20:04:12
Modified:xs/tables/current/Apache FunctionTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.31 +72 -6 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- FunctionTable.pm 20 Jan 2002 18:35:26 - 1.30
+++ FunctionTable.pm 25 Jan 2002 04:04:12 - 1.31
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sun Jan 20 10:18:13 2002
+# ! Thu Jan 24 19:50:33 2002
# ! do NOT edit, any changes will be lost !
# !!
@@ -1048,7 +1048,7 @@
'name' => 'block'
},
{
-'type' => 'apr_off_t *',
+'type' => 'apr_off_t',
'name' => 'readbytes'
}
]
@@ -,7 +,7 @@
'name' => 'block'
},
{
-'type' => 'apr_off_t *',
+'type' => 'apr_off_t',
'name' => 'readbytes'
}
]
@@ -3782,7 +3782,7 @@
]
},
{
-'return_type' => 'int',
+'return_type' => 'apr_status_t',
'name' => 'ap_rgetline',
'args' => [
{
@@ -3790,10 +3790,14 @@
'name' => 's'
},
{
-'type' => 'int',
+'type' => 'apr_size_t',
'name' => 'n'
},
{
+'type' => 'apr_size_t *',
+'name' => 'read'
+ },
+ {
'type' => 'request_rec *',
'name' => 'r'
},
@@ -5452,6 +5456,24 @@
},
{
'return_type' => 'apr_status_t',
+'name' => 'apr_brigade_flatten',
+'args' => [
+ {
+'type' => 'apr_bucket_brigade *',
+'name' => 'bb'
+ },
+ {
+'type' => 'char *',
+'name' => 'c'
+ },
+ {
+'type' => 'apr_off_t *',
+'name' => 'len'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
'name' => 'apr_brigade_length',
'args' => [
{
@@ -5488,6 +5510,28 @@
},
{
'return_type' => 'apr_status_t',
+'name' => 'apr_brigade_pflatten',
+'args' => [
+ {
+'type' => 'apr_bucket_brigade *',
+'name' => 'bb'
+ },
+ {
+'type' => 'char **',
+'name' => 'c'
+ },
+ {
+'type' => 'apr_off_t *',
+'name' => 'len'
+ },
+ {
+'type' => 'apr_pool_t *',
+'name' => 'pool'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
'name' => 'apr_brigade_printf',
'args' => [
{
@@ -5594,6 +5638,28 @@
},
{
'return_type' => 'apr_status_t',
+'name' => 'apr_brigade_split_line',
+'args' => [
+ {
+'type' => 'apr_bucket_brigade *',
+'name' => 'bbOut'
+ },
+ {
+'type' => 'apr_bucket_brigade *',
+'name' => 'bbIn'
+ },
+ {
+'type' => 'apr_read_type_e',
+'name' => 'block'
+ },
+ {
+'type' => 'apr_off_t',
+'name' => 'maxbytes'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
'name' => 'apr_brigade_to_iovec',
'args' => [
{
@@ -6773,7 +6839,7 @@
'name' => 'apr_file_dup2',
'args' => [
{
-'type' => 'apr_file_t **',
+'type' => 'apr_file_t *',
'name' => 'new_file'
},
{
1.57 +25 -32modperl-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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- FunctionTable.pm 20 Jan 2002 18:35:26 - 1.56
+++ FunctionTable.pm 25 Jan 2002 04:04:12 - 1.57
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sun Jan 20 10:18:42 2002
+# ! Thu Jan 24 20:01:03 2002
# ! do NOT edit, any changes will be lost !
# !!
@@ -2079,7 +2079,11 @@
'name' => 'mode'
},
{
-'type' => 'apr_off_t *',
+'type' => 'apr_read_type_e',
+'name' => 'block'
+ },
+ {
+'type' => 'apr_off_t',
'name' => 'readbytes'
}
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 02/01/20 10:35:26
Modified:xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.21 +6 -4 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ConstantsTable.pm 31 Dec 2001 12:16:37 - 1.20
+++ ConstantsTable.pm 20 Jan 2002 18:35:26 - 1.21
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Mon Dec 31 20:02:32 2001
+# ! Sun Jan 20 10:13:22 2002
# ! do NOT edit, any changes will be lost !
# !!
@@ -76,9 +76,11 @@
'APLOG_STARTUP'
],
'input_mode' => [
- 'AP_MODE_BLOCKING',
- 'AP_MODE_NONBLOCKING',
- 'AP_MODE_PEEK',
+ 'AP_MODE_READBYTES',
+ 'AP_MODE_GETLINE',
+ 'AP_MODE_EATCRLF',
+ 'AP_MODE_SPECULATIVE',
+ 'AP_MODE_EXHAUSTIVE',
'AP_MODE_INIT'
],
'http' => [
1.30 +183 -521 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- FunctionTable.pm 31 Dec 2001 12:16:37 - 1.29
+++ FunctionTable.pm 20 Jan 2002 18:35:26 - 1.30
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Mon Dec 31 19:58:28 2001
+# ! Sun Jan 20 10:18:13 2002
# ! do NOT edit, any changes will be lost !
# !!
@@ -563,8 +563,8 @@
'name' => 'ap_create_sb_handle',
'args' => [
{
-'type' => 'void **',
-'name' => 'new_handle'
+'type' => 'ap_sb_handle_t **',
+'name' => 'new_sbh'
},
{
'type' => 'apr_pool_t *',
@@ -1044,6 +1044,10 @@
'name' => 'mode'
},
{
+'type' => 'apr_read_type_e',
+'name' => 'block'
+ },
+ {
'type' => 'apr_off_t *',
'name' => 'readbytes'
}
@@ -1068,12 +1072,7 @@
]
},
{
-'return_type' => 'global_score *',
-'name' => 'ap_get_global_scoreboard',
-'args' => []
- },
- {
-'return_type' => 'unsigned long',
+'return_type' => 'apr_off_t',
'name' => 'ap_get_limit_req_body',
'args' => [
{
@@ -1117,16 +1116,6 @@
]
},
{
-'return_type' => 'process_score *',
-'name' => 'ap_get_parent_scoreboard',
-'args' => [
- {
-'type' => 'int',
-'name' => 'x'
- }
-]
- },
- {
'return_type' => 'const char *',
'name' => 'ap_get_remote_host',
'args' => [
@@ -1159,6 +1148,49 @@
]
},
{
+'return_type' => 'void **',
+'name' => 'ap_get_request_note',
+'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ },
+ {
+'type' => 'apr_size_t',
+'name' => 'note_num'
+ }
+]
+ },
+ {
+'return_type' => 'global_score *',
+'name' => 'ap_get_scoreboard_global',
+'args' => []
+ },
+ {
+'return_type' => 'process_score *',
+'name' => 'ap_get_scoreboard_process',
+'args' => [
+ {
+'type' => 'int',
+'name' => 'x'
+ }
+]
+ },
+ {
+'return_type' => 'worker_score *',
+'name' => 'ap_get_scoreboard_worker',
+'args' => [
+ {
+'type' => 'int',
+'name' => 'x'
+ },
+ {
+'type' => 'int',
+'name' => 'y'
+ }
+]
+ },
+ {
'return_type' => 'const char *',
'name' => 'ap_get_server_built',
'args' => []
@@ -1189,20 +1221,6 @@
'args' => []
},
{
-'return_type' => 'worker_score *',
-'name' => 'ap_get_servers_scoreboard',
-'args' => [
- {
-'type' => 'int',
-'name' => 'x'
- },
- {
-'type' => 'int',
-'name' => 'y'
- }
-]
- },
- {
'return_type' => 'const char *',
'name' => 'ap_get_status_line',
'args' => [
@@ -2200,6 +2218,10 @@
'name' => 'mode'
},
{
+'type'
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
stas01/12/31 04:16:37
Modified:xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync to the latest httpd/apr
Revision ChangesPath
1.20 +10 -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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ConstantsTable.pm 15 Dec 2001 23:51:43 - 1.19
+++ ConstantsTable.pm 31 Dec 2001 12:16:37 - 1.20
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sat Dec 15 15:39:22 2001
+# ! Mon Dec 31 20:02:32 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -221,6 +221,13 @@
'APR_POLLHUP',
'APR_POLLNVAL'
],
+'lockmech' => [
+ 'APR_LOCK_FCNTL',
+ 'APR_LOCK_FLOCK',
+ 'APR_LOCK_SYSVSEM',
+ 'APR_LOCK_PROC_PTHREAD',
+ 'APR_LOCK_DEFAULT'
+],
'limit' => [
'APR_LIMIT_CPU',
'APR_LIMIT_MEM',
@@ -347,6 +354,8 @@
'APR_ENETUNREACH',
'APR_EFTYPE',
'APR_EPIPE',
+ 'APR_EXDEV',
+ 'APR_ENOTEMPTY',
'APR_END'
],
'common' => [
1.29 +508 -60 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- FunctionTable.pm 15 Dec 2001 23:51:43 - 1.28
+++ FunctionTable.pm 31 Dec 2001 12:16:37 - 1.29
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sat Dec 15 15:39:32 2001
+# ! Mon Dec 31 19:58:28 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -347,6 +347,11 @@
},
{
'return_type' => 'int',
+'name' => 'ap_calc_scoreboard_size',
+'args' => []
+ },
+ {
+'return_type' => 'int',
'name' => 'ap_cfg_closefile',
'args' => [
{
@@ -555,6 +560,28 @@
},
{
'return_type' => 'void',
+'name' => 'ap_create_sb_handle',
+'args' => [
+ {
+'type' => 'void **',
+'name' => 'new_handle'
+ },
+ {
+'type' => 'apr_pool_t *',
+'name' => 'p'
+ },
+ {
+'type' => 'int',
+'name' => 'child_num'
+ },
+ {
+'type' => 'int',
+'name' => 'thread_num'
+ }
+]
+ },
+ {
+'return_type' => 'void',
'name' => 'ap_create_scoreboard',
'args' => [
{
@@ -2197,12 +2224,8 @@
'name' => 'ap_increment_counts',
'args' => [
{
-'type' => 'int',
-'name' => 'child_num'
- },
- {
-'type' => 'int',
-'name' => 'thread_num'
+'type' => 'void *',
+'name' => 'sbh'
},
{
'type' => 'request_rec *',
@@ -2236,6 +2259,11 @@
},
{
'return_type' => 'void',
+'name' => 'ap_init_scoreboard',
+'args' => []
+ },
+ {
+'return_type' => 'void',
'name' => 'ap_init_vhost_config',
'args' => [
{
@@ -3866,6 +3894,10 @@
{
'type' => 'int',
'name' => 'conn_id'
+ },
+ {
+'type' => 'void *',
+'name' => 'sbh'
}
]
},
@@ -3906,24 +3938,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'
}
]
},
@@ -4979,6 +5011,24 @@
'name' => 'ap_update_child_status',
'args' => [
{
+'type' => 'void *',
+'name' => 'sbh'
+ },
+ {
+'type' => 'int',
+
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/12/17 17:55:52
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.54 +34 -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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- FunctionTable.pm 2001/12/15 23:51:43 1.53
+++ FunctionTable.pm 2001/12/18 01:55:52 1.54
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sat Dec 15 15:39:57 2001
+# ! Mon Dec 17 17:56:17 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -3335,6 +3335,39 @@
{
'type' => 'void *',
'name' => 'cfg'
+ }
+]
+ },
+ {
+'return_type' => 'int',
+'name' => 'modperl_spawn_proc_prog',
+'attr' => [
+ 'static'
+],
+'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ },
+ {
+'type' => 'const char *',
+'name' => 'command'
+ },
+ {
+'type' => 'const char ***',
+'name' => 'argv'
+ },
+ {
+'type' => 'apr_file_t **',
+'name' => 'script_in'
+ },
+ {
+'type' => 'apr_file_t **',
+'name' => 'script_out'
+ },
+ {
+'type' => 'apr_file_t **',
+'name' => 'script_err'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/12/15 15:51:43
Modified:xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.19 +2 -2 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ConstantsTable.pm 2001/11/19 22:40:12 1.18
+++ ConstantsTable.pm 2001/12/15 23:51:43 1.19
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Mon Nov 19 14:57:24 2001
+# ! Sat Dec 15 15:39:22 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -291,6 +291,7 @@
'APR_APPEND',
'APR_TRUNCATE',
'APR_BINARY',
+ 'APR_EXCL',
'APR_BUFFERED',
'APR_DELONCLOSE'
],
@@ -346,7 +347,6 @@
'APR_ENETUNREACH',
'APR_EFTYPE',
'APR_EPIPE',
- 'APR_EXCL',
'APR_END'
],
'common' => [
1.28 +168 -61 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- FunctionTable.pm 2001/11/19 22:40:12 1.27
+++ FunctionTable.pm 2001/12/15 23:51:43 1.28
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Mon Nov 19 14:57:32 2001
+# ! Sat Dec 15 15:39:32 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -1041,6 +1041,11 @@
]
},
{
+'return_type' => 'global_score *',
+'name' => 'ap_get_global_scoreboard',
+'args' => []
+ },
+ {
'return_type' => 'unsigned long',
'name' => 'ap_get_limit_req_body',
'args' => [
@@ -3718,6 +3723,28 @@
},
{
'return_type' => 'int',
+'name' => 'ap_rgetline',
+'args' => [
+ {
+'type' => 'char **',
+'name' => 's'
+ },
+ {
+'type' => 'int',
+'name' => 'n'
+ },
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ },
+ {
+'type' => 'int',
+'name' => 'fold'
+ }
+]
+ },
+ {
+'return_type' => 'int',
'name' => 'ap_rind',
'args' => [
{
@@ -3999,7 +4026,7 @@
]
},
{
-'return_type' => 'void',
+'return_type' => 'int',
'name' => 'ap_run_open_logs',
'args' => [
{
@@ -4026,7 +4053,7 @@
'args' => []
},
{
-'return_type' => 'void',
+'return_type' => 'int',
'name' => 'ap_run_post_config',
'args' => [
{
@@ -6258,6 +6285,32 @@
]
},
{
+'return_type' => 'void',
+'name' => 'apr_dbm_get_usednames_ex',
+'args' => [
+ {
+'type' => 'apr_pool_t *',
+'name' => 'pool'
+ },
+ {
+'type' => 'const char *',
+'name' => 'type'
+ },
+ {
+'type' => 'const char *',
+'name' => 'pathname'
+ },
+ {
+'type' => 'const char **',
+'name' => 'used1'
+ },
+ {
+'type' => 'const char **',
+'name' => 'used2'
+ }
+]
+ },
+ {
'return_type' => 'char *',
'name' => 'apr_dbm_geterror',
'args' => [
@@ -6321,6 +6374,36 @@
},
{
'return_type' => 'apr_status_t',
+'name' => 'apr_dbm_open_ex',
+'args' => [
+ {
+'type' => 'apr_dbm_t **',
+'name' => 'dbm'
+ },
+ {
+'type' => 'const char*',
+'name' => 'type'
+ },
+ {
+'type' => 'const char *',
+'name' => 'name'
+ },
+ {
+'type' => 'apr_int32_t',
+'name' => 'mode'
+ },
+ {
+'type' => 'apr_fileperms_t',
+'name' => 'perm'
+ },
+ {
+'type' => 'apr_pool_t *',
+'name' => 'cntxt'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
'name' => 'apr_dbm_store',
'args' => [
{
@@ -7265,6 +7348,24 @@
},
{
'return_type' => 'apr_status_t',
+'name' => 'apr_get_groupid',
+'args' => [
+ {
+'type'
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/19 15:32:00
Modified:xs/Apache/ServerUtil Apache__ServerUtil.h
xs/maps apache_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
fix Apache::server_root_relative arguments to be the same as apache api
use modperl_sv2pool() to find the apr_pool_t *
Revision ChangesPath
1.7 +3 -11 modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h
Index: Apache__ServerUtil.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Apache__ServerUtil.h 2001/11/12 22:42:28 1.6
+++ Apache__ServerUtil.h 2001/11/19 23:32:00 1.7
@@ -43,18 +43,10 @@
modperl_global_get_server_rec()
static MP_INLINE char *mpxs_ap_server_root_relative(pTHX_
-const char *fname,
-apr_pool_t *p)
+SV *sv,
+const char *fname)
{
-if (!fname) {
-fname = "";
-}
+apr_pool_t *p = modperl_sv2pool(aTHX_ sv);
-if (!p) {
-/* XXX: should do something better if called at request time
- * without a pool
- */
-p = modperl_global_get_pconf();
-}
return ap_server_root_relative(p, fname);
}
1.38 +1 -1 modperl-2.0/xs/maps/apache_functions.map
Index: apache_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- apache_functions.map 2001/11/12 22:42:28 1.37
+++ apache_functions.map 2001/11/19 23:32:00 1.38
@@ -152,7 +152,7 @@
ap_get_server_built
ap_get_server_version
ap_psignature | | r,prefix
- ap_server_root_relative | mpxs_ | fname=NULL, p=NULL
+ ap_server_root_relative | mpxs_ | SV *:p, fname=""
MODULE=Apache::Connection PACKAGE=guess
ap_get_remote_host
1.52 +5 -5 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- FunctionTable.pm 2001/11/19 22:40:12 1.51
+++ FunctionTable.pm 2001/11/19 23:32:00 1.52
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Mon Nov 19 14:57:48 2001
+# ! Mon Nov 19 15:11:46 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -4827,12 +4827,12 @@
'name' => 'my_perl'
},
{
-'type' => 'const char *',
-'name' => 'fname'
+'type' => 'SV *',
+'name' => 'sv'
},
{
-'type' => 'apr_pool_t *',
-'name' => 'p'
+'type' => 'const char *',
+'name' => 'fname'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/19 14:40:12
Modified:xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.18 +3 -2 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ConstantsTable.pm 2001/11/15 17:52:00 1.17
+++ ConstantsTable.pm 2001/11/19 22:40:12 1.18
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Thu Nov 15 09:53:52 2001
+# ! Mon Nov 19 14:57:24 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -78,7 +78,8 @@
'input_mode' => [
'AP_MODE_BLOCKING',
'AP_MODE_NONBLOCKING',
- 'AP_MODE_PEEK'
+ 'AP_MODE_PEEK',
+ 'AP_MODE_INIT'
],
'http' => [
'HTTP_CONTINUE',
1.27 +6 -6 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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- FunctionTable.pm 2001/11/15 17:52:00 1.26
+++ FunctionTable.pm 2001/11/19 22:40:12 1.27
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Thu Nov 15 09:45:53 2001
+# ! Mon Nov 19 14:57:32 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -580,7 +580,7 @@
'name' => 'status'
},
{
-'type' => 'char *',
+'type' => 'const char *',
'name' => 'string'
}
]
@@ -2340,12 +2340,12 @@
]
},
{
-'return_type' => 'apr_status_t',
+'return_type' => 'void',
'name' => 'ap_lingering_close',
'args' => [
{
-'type' => 'void *',
-'name' => 'dummy'
+'type' => 'conn_rec *',
+'name' => 'c'
}
]
},
@@ -3361,7 +3361,7 @@
]
},
{
-'return_type' => 'void',
+'return_type' => 'int',
'name' => 'ap_process_child_status',
'args' => [
{
1.51 +69 -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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- FunctionTable.pm 2001/11/15 18:19:56 1.50
+++ FunctionTable.pm 2001/11/19 22:40:12 1.51
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Thu Nov 15 10:29:32 2001
+# ! Mon Nov 19 14:57:48 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -678,6 +678,24 @@
},
{
'return_type' => 'const char *',
+'name' => 'modperl_cmd_pass_env',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'parms'
+ },
+ {
+'type' => 'void *',
+'name' => 'mconfig'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg'
+ }
+]
+ },
+ {
+'return_type' => 'const char *',
'name' => 'modperl_cmd_perl',
'args' => [
{
@@ -840,6 +858,28 @@
},
{
'return_type' => 'const char *',
+'name' => 'modperl_cmd_set_env',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'parms'
+ },
+ {
+'type' => 'void *',
+'name' => 'mconfig'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg1'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg2'
+ }
+]
+ },
+ {
+'return_type' => 'const char *',
'name' => 'modperl_cmd_set_var',
'args' => [
{
@@ -1198,6 +1238,34 @@
{
'type' => 'PerlInterpreter *',
'name' => 'my_perl'
+ }
+]
+ },
+ {
+'return_type' => 'void',
+'name' => 'modperl_env_configure_request',
+'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ }
+]
+ },
+ {
+'r
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/15 10:19:56
Modified:xs/maps apache_structures.map modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
implement an Apache::Connection::client_socket method now that it has moved out of
conn_rec
Revision ChangesPath
1.11 +0 -1 modperl-2.0/xs/maps/apache_structures.map
Index: apache_structures.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_structures.map,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apache_structures.map 2001/10/05 23:39:31 1.10
+++ apache_structures.map 2001/11/15 18:19:56 1.11
@@ -98,7 +98,6 @@
pool
base_server
> vhost_lookup_data
- client_socket
local_addr
remote_addr
remote_ip
1.29 +3 -0 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- modperl_functions.map 2001/11/13 17:42:49 1.28
+++ modperl_functions.map 2001/11/15 18:19:56 1.29
@@ -53,6 +53,9 @@
PACKAGE=Apache
server_rec *:DEFINE_server | | SV *:classname=Nullsv
+MODULE=Apache::Connection
+ mpxs_Apache__Connection_client_socket | | c, s=NULL
+
MODULE=Apache::Filter
modperl_filter_attributes | MPXS_ | ... | MODIFY_CODE_ATTRIBUTES
1.50 +19 -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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- FunctionTable.pm 2001/11/15 17:52:00 1.49
+++ FunctionTable.pm 2001/11/15 18:19:56 1.50
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Thu Nov 15 09:46:16 2001
+# ! Thu Nov 15 10:29:32 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -4006,6 +4006,24 @@
{
'type' => 'SV *',
'name' => 'portsv'
+ }
+]
+ },
+ {
+'return_type' => 'apr_socket_t *',
+'name' => 'mpxs_Apache__Connection_client_socket',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'conn_rec *',
+'name' => 'c'
+ },
+ {
+'type' => 'apr_socket_t *',
+'name' => 's'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/15 09:52:00
Modified:xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.17 +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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ConstantsTable.pm 2001/11/12 22:17:02 1.16
+++ ConstantsTable.pm 2001/11/15 17:52:00 1.17
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Mon Nov 12 14:22:14 2001
+# ! Thu Nov 15 09:53:52 2001
# ! do NOT edit, any changes will be lost !
# !!
1.26 +119 -1modperl-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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- FunctionTable.pm 2001/11/12 22:17:02 1.25
+++ FunctionTable.pm 2001/11/15 17:52:00 1.26
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Mon Nov 12 14:22:23 2001
+# ! Thu Nov 15 09:45:53 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -1463,6 +1463,28 @@
},
{
'return_type' => 'void',
+'name' => 'ap_hook_create_connection',
+'args' => [
+ {
+'type' => 'ap_HOOK_create_connection_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_create_request',
'args' => [
{
@@ -1571,6 +1593,11 @@
},
{
'return_type' => 'apr_array_header_t *',
+'name' => 'ap_hook_get_create_connection',
+'args' => []
+ },
+ {
+'return_type' => 'apr_array_header_t *',
'name' => 'ap_hook_get_create_request',
'args' => []
},
@@ -2323,6 +2350,11 @@
]
},
{
+'return_type' => 'void',
+'name' => 'ap_listen_pre_config',
+'args' => []
+ },
+ {
'return_type' => 'int',
'name' => 'ap_location_walk',
'args' => [
@@ -3789,6 +3821,28 @@
]
},
{
+'return_type' => 'conn_rec *',
+'name' => 'ap_run_create_connection',
+'args' => [
+ {
+'type' => 'apr_pool_t *',
+'name' => 'p'
+ },
+ {
+'type' => 'server_rec *',
+'name' => 'server'
+ },
+ {
+'type' => 'apr_socket_t *',
+'name' => 'csd'
+ },
+ {
+'type' => 'int',
+'name' => 'conn_id'
+ }
+]
+ },
+ {
'return_type' => 'int',
'name' => 'ap_run_create_request',
'args' => [
@@ -4449,6 +4503,42 @@
},
{
'return_type' => 'const char *',
+'name' => 'ap_set_listenbacklog',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'cmd'
+ },
+ {
+'type' => 'void *',
+'name' => 'dummy'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg'
+ }
+]
+ },
+ {
+'return_type' => 'const char *',
+'name' => 'ap_set_listener',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'cmd'
+ },
+ {
+'type' => 'void *',
+'name' => 'dummy'
+ },
+ {
+'type' => 'const char *',
+'name' => 'ips'
+ }
+]
+ },
+ {
+'return_type' => 'const char *',
'name' => 'ap_set_name_virtual_host',
'args' => [
{
@@ -4467,6 +4557,24 @@
},
{
'return_type' => 'const char *',
+'name' => 'ap_set_send_buffer_size',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'cmd'
+ },
+ {
+'type' => 'void *',
+'name' => 'dummy'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg'
+ }
+]
+ },
+ {
+'return_type' => 'const char *',
'name' => 'ap_set_string
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/13 09:42:49
Modified:t/response/TestAPI request_rec.pm
todo api.txt
xs/Apache/RequestUtil Apache__RequestUtil.h
xs/maps modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
implement $r->pnotes
Submitted by: Philippe M. Chiasson <[EMAIL PROTECTED]>
Reviewed by: dougm
Revision ChangesPath
1.10 +11 -1 modperl-2.0/t/response/TestAPI/request_rec.pm
Index: request_rec.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/request_rec.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- request_rec.pm2001/10/29 01:19:16 1.9
+++ request_rec.pm2001/11/13 17:42:49 1.10
@@ -11,7 +11,7 @@
sub handler {
my $r = shift;
-plan $r, tests => 49;
+plan $r, tests => 54;
#Apache->request($r); #PerlOptions +GlobalRequest takes care
my $gr = Apache->request;
@@ -78,6 +78,16 @@
ok $r->subprocess_env;
ok $r->notes;
+
+ok $r->pnotes;
+
+ok t_cmp('pnotes_bar', $r->pnotes('pnotes_foo','pnotes_bar'),
qq{\$r->pnotes(key,val)});
+
+ok t_cmp("pnotes_bar", $r->pnotes('pnotes_foo') , qq{\$r->pnotes(key)});
+
+ok t_cmp('HASH', ref($r->pnotes), qq{ref($r->pnotes)});
+
+ok t_cmp('pnotes_bar', $r->pnotes()->{'pnotes_foo'}, qq{\$r->pnotes()->{}});
ok $r->content_type;
1.16 +0 -3 modperl-2.0/todo/api.txt
Index: api.txt
===
RCS file: /home/cvs/modperl-2.0/todo/api.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- api.txt 2001/11/08 03:19:48 1.15
+++ api.txt 2001/11/13 17:42:49 1.16
@@ -10,9 +10,6 @@
need apr_finfo_t <-> struct stat conversion (might already be there,
haven't looked close enough yet)
-$r->pnotes:
-not yet implemented
-
$r->subprocess_env:
in void context should populate %ENV as 1.x does
1.11 +32 -0 modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h
Index: Apache__RequestUtil.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Apache__RequestUtil.h 2001/11/07 03:39:08 1.10
+++ Apache__RequestUtil.h 2001/11/13 17:42:49 1.11
@@ -172,6 +172,38 @@
return retval;
}
+static MP_INLINE
+SV *mpxs_Apache__RequestRec_pnotes(pTHX_ request_rec *r, SV *key, SV *val)
+{
+MP_dRCFG;
+SV *retval = NULL;
+
+if (!rcfg) {
+return &PL_sv_undef;
+}
+if (!rcfg->pnotes) {
+rcfg->pnotes = newHV();
+}
+
+if (key) {
+STRLEN len;
+char *k = SvPV(key, len);
+
+if (val) {
+retval = *hv_store(rcfg->pnotes, k, len,
+ SvREFCNT_inc(val), 0);
+}
+else if (hv_exists(rcfg->pnotes, k, len)) {
+retval = *hv_fetch(rcfg->pnotes, k, len, FALSE);
+}
+}
+else {
+retval = newRV_inc((SV *)rcfg->pnotes);
+}
+
+return retval ? SvREFCNT_inc(retval) : &PL_sv_undef;
+}
+
#define mpxs_Apache__RequestRec_dir_config(r, key, sv_val) \
modperl_dir_config(aTHX_ r, r->server, key, sv_val)
1.28 +1 -0 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- modperl_functions.map 2001/11/07 04:03:07 1.27
+++ modperl_functions.map 2001/11/13 17:42:49 1.28
@@ -13,6 +13,7 @@
mpxs_Apache__RequestRec_set_handlers
mpxs_Apache__RequestRec_get_handlers
mpxs_Apache__RequestRec_location
+ mpxs_Apache__RequestRec_pnotes | | r, key=Nullsv, val=Nullsv
#protocol module helpers
mpxs_Apache__RequestRec_location_merge
1.48 +23 -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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- FunctionTable.pm 2001/11/12 22:38:27 1.47
+++ FunctionTable.pm 2001/11/13 17:42:49 1.48
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Mon Nov 12 14:44:40 2001
+# ! Tue Nov 13
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/12 14:38:28
Modified:xs/Apache/ServerUtil Apache__ServerUtil.h
xs/maps apache_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
switch order of Apache::server_root_relative args
default pool to the server startup pool
Revision ChangesPath
1.5 +13 -0 modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h
Index: Apache__ServerUtil.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Apache__ServerUtil.h 2001/11/07 03:39:08 1.4
+++ Apache__ServerUtil.h 2001/11/12 22:38:27 1.5
@@ -41,3 +41,16 @@
#define mpxs_Apache_server(classname) \
modperl_global_get_server_rec()
+
+static MP_INLINE char *mpxs_ap_server_root_relative(pTHX_
+const char *fname,
+apr_pool_t *p)
+{
+if (!p) {
+/* XXX: should do something better if called at request time
+ * without a pool
+ */
+p = modperl_global_get_pconf();
+}
+return ap_server_root_relative(p, fname);
+}
1.36 +1 -1 modperl-2.0/xs/maps/apache_functions.map
Index: apache_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- apache_functions.map 2001/11/06 18:41:46 1.35
+++ apache_functions.map 2001/11/12 22:38:27 1.36
@@ -152,7 +152,7 @@
ap_get_server_built
ap_get_server_version
ap_psignature | | r,prefix
- ap_server_root_relative
+ ap_server_root_relative | mpxs_ | fname, p=NULL
MODULE=Apache::Connection PACKAGE=guess
ap_get_remote_host
1.47 +23 -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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- FunctionTable.pm 2001/11/07 04:03:07 1.46
+++ FunctionTable.pm 2001/11/12 22:38:27 1.47
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Tue Nov 6 19:57:54 2001
+# ! Mon Nov 12 14:44:40 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -4698,6 +4698,28 @@
{
'type' => 'SV **',
'name' => 'sp'
+ }
+]
+ },
+ {
+'return_type' => 'char *',
+'name' => 'mpxs_ap_server_root_relative',
+'attr' => [
+ 'static',
+ '__inline__'
+],
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'const char *',
+'name' => 'fname'
+ },
+ {
+'type' => 'apr_pool_t *',
+'name' => 'p'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/06 20:03:07
Modified:todo api.txt
xs/Apache/RequestIO Apache__RequestIO.h
xs/maps modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
add Apache::RequestRec::GETC method
Revision ChangesPath
1.14 +1 -1 modperl-2.0/todo/api.txt
Index: api.txt
===
RCS file: /home/cvs/modperl-2.0/todo/api.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- api.txt 2001/11/06 18:41:46 1.13
+++ api.txt 2001/11/07 04:03:07 1.14
@@ -3,7 +3,7 @@
--
tied filehandle interface:
- -CLOSE, GETC, READLINE
+ -CLOSE, READLINE
$r->finfo:
need apr_finfo_t <-> struct stat conversion (might already be there,
1.22 +16 -0 modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h
Index: Apache__RequestIO.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Apache__RequestIO.h 2001/11/07 03:39:08 1.21
+++ Apache__RequestIO.h 2001/11/07 04:03:07 1.22
@@ -189,6 +189,22 @@
}
static MP_INLINE
+SV *mpxs_Apache__RequestRec_GETC(pTHX_ request_rec *r)
+{
+char c[1] = "\0";
+
+if (mpxs_setup_client_block(r) == APR_SUCCESS) {
+if (mpxs_should_client_block(r)) {
+if (ap_get_client_block(r, c, 1) == 1) {
+return newSVpvn((char *)&c, 1);
+}
+}
+}
+
+return &PL_sv_undef;
+}
+
+static MP_INLINE
apr_status_t mpxs_Apache__RequestRec_sendfile(request_rec *r,
const char *filename,
apr_off_t offset,
1.27 +1 -0 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- modperl_functions.map 2001/11/06 18:41:46 1.26
+++ modperl_functions.map 2001/11/07 04:03:07 1.27
@@ -35,6 +35,7 @@
mpxs_Apache__RequestRec_print | | ...
apr_ssize_t:DEFINE_WRITE | | \
request_rec *:r, SV *:buffer, apr_ssize_t:bufsiz=-1, int:offset=0
+ mpxs_Apache__RequestRec_GETC
MODULE=Apache::Response PACKAGE=Apache::RequestRec
DEFINE_send_cgi_header | | request_rec *:r, SV *:buffer
1.46 +19 -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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- FunctionTable.pm 2001/11/07 03:39:09 1.45
+++ FunctionTable.pm 2001/11/07 04:03:07 1.46
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Tue Nov 6 19:34:31 2001
+# ! Tue Nov 6 19:57:54 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -3955,6 +3955,10 @@
],
'args' => [
{
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
'type' => 'SV *',
'name' => 'tsv'
}
@@ -4101,6 +4105,20 @@
{
'type' => 'char *',
'name' => 'name'
+ }
+]
+ },
+ {
+'return_type' => 'SV *',
+'name' => 'mpxs_Apache__RequestRec_GETC',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'request_rec *',
+'name' => 'r'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/06 19:39:09
Modified:xs/APR/Bucket APR__Bucket.h
xs/APR/Table APR__Table.h
xs/APR/URI APR__URI.h
xs/Apache/Module Apache__Module.h
xs/Apache/RequestIO Apache__RequestIO.h
xs/Apache/RequestUtil Apache__RequestUtil.h
xs/Apache/ServerUtil Apache__ServerUtil.h
xs/ModPerl/Global ModPerl__Global.h
xs/tables/current/ModPerl FunctionTable.pm
Log:
rid dTHX; usage
Revision ChangesPath
1.3 +1 -3 modperl-2.0/xs/APR/Bucket/APR__Bucket.h
Index: APR__Bucket.h
===
RCS file: /home/cvs/modperl-2.0/xs/APR/Bucket/APR__Bucket.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- APR__Bucket.h 2001/04/19 17:38:12 1.2
+++ APR__Bucket.h 2001/11/07 03:39:08 1.3
@@ -1,10 +1,8 @@
#include "modperl_bucket.h"
-static apr_bucket *mpxs_APR__Bucket_new(SV *classname, SV *sv,
+static apr_bucket *mpxs_APR__Bucket_new(pTHX_ SV *classname, SV *sv,
int offset, int len)
{
-dTHX; /*XXX*/
-
if (!len) {
(void)SvPV(sv, len);
}
1.6 +3 -4 modperl-2.0/xs/APR/Table/APR__Table.h
Index: APR__Table.h
===
RCS file: /home/cvs/modperl-2.0/xs/APR/Table/APR__Table.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- APR__Table.h 2001/09/28 17:20:32 1.5
+++ APR__Table.h 2001/11/07 03:39:08 1.6
@@ -104,9 +104,8 @@
((apr_table_entry_t *) \
apr_table_elts(t)->elts)[mpxs_apr_table_iterix(sv)++].key
-static MP_INLINE const char *mpxs_APR__Table_NEXTKEY(SV *tsv, SV *key)
+static MP_INLINE const char *mpxs_APR__Table_NEXTKEY(pTHX_ SV *tsv, SV *key)
{
-dTHX;
apr_table_t *t = mp_xs_sv2_APR__Table(tsv);
if (apr_is_empty_table(t)) {
@@ -120,11 +119,11 @@
return NULL;
}
-static MP_INLINE const char *mpxs_APR__Table_FIRSTKEY(SV *tsv)
+static MP_INLINE const char *mpxs_APR__Table_FIRSTKEY(pTHX_ SV *tsv)
{
mpxs_apr_table_iterix(tsv) = 0; /* reset iterator index */
-return mpxs_APR__Table_NEXTKEY(tsv, Nullsv);
+return mpxs_APR__Table_NEXTKEY(aTHX_ tsv, Nullsv);
}
static XS(MPXS_apr_table_get)
1.3 +1 -2 modperl-2.0/xs/APR/URI/APR__URI.h
Index: APR__URI.h
===
RCS file: /home/cvs/modperl-2.0/xs/APR/URI/APR__URI.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- APR__URI.h2001/08/19 17:33:32 1.2
+++ APR__URI.h2001/11/07 03:39:08 1.3
@@ -36,9 +36,8 @@
}
static MP_INLINE
-char *mpxs_APR__URI_port(apr_uri_t *uri, SV *portsv)
+char *mpxs_APR__URI_port(pTHX_ apr_uri_t *uri, SV *portsv)
{
-dTHX; /*XXX*/
char *port_str = uri->port_str;
if (portsv) {
1.4 +1 -2 modperl-2.0/xs/Apache/Module/Apache__Module.h
Index: Apache__Module.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/Module/Apache__Module.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Apache__Module.h 2001/10/06 01:03:27 1.3
+++ Apache__Module.h 2001/11/07 03:39:08 1.4
@@ -1,7 +1,7 @@
#define mpxs_Apache__Module_top_module(CLASS) \
(CLASS ? ap_top_module : ap_top_module)
-static MP_INLINE int mpxs_Apache__Module_loaded(char *name)
+static MP_INLINE int mpxs_Apache__Module_loaded(pTHX_ char *name)
{
char nameptr[256];
char *base;
@@ -34,7 +34,6 @@
return 0;
}
else {
-dTHX; /*XXX*/
return modperl_perl_module_loaded(aTHX_ name);
}
}
1.21 +6 -6 modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h
Index: Apache__RequestIO.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Apache__RequestIO.h 2001/11/07 03:12:50 1.20
+++ Apache__RequestIO.h 2001/11/07 03:39:08 1.21
@@ -88,14 +88,14 @@
}
/* alias */
-#define mpxs_Apache__RequestRec_WRITE mpxs_Apache__RequestRec_write
+#define mpxs_Apache__RequestRec_WRITE(r, buffer, bufsiz, offset) \
+mpxs_Apache__RequestRec_write(aTHX_ r, buffer, bufsiz, offset)
static MP_INLINE
-apr_ssize_t mpxs_Apache__RequestRec_write(request_rec *r,
+apr_ssize_t mpxs_Apache__RequestRec_write(pTHX_ request_rec *r,
SV *buffer, apr_ssize_t bufsiz,
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/06 19:13:21
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.44 +11 -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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- FunctionTable.pm 2001/11/06 18:41:59 1.43
+++ FunctionTable.pm 2001/11/07 03:13:21 1.44
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Tue Nov 6 10:53:09 2001
+# ! Tue Nov 6 19:24:25 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -5058,6 +5058,16 @@
{
'type' => 'apr_read_type_e',
'name' => 'block'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'mpxs_setup_client_block',
+'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'r'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/06 10:41:59
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.43 +55 -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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- FunctionTable.pm 2001/11/06 18:26:13 1.42
+++ FunctionTable.pm 2001/11/06 18:41:59 1.43
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Tue Nov 6 10:38:34 2001
+# ! Tue Nov 6 10:53:09 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -2854,6 +2854,38 @@
},
{
'return_type' => 'void',
+'name' => 'modperl_perl_destruct',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'perl'
+ }
+]
+ },
+ {
+'return_type' => 'void',
+'name' => 'modperl_perl_do_sprintf',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'SV *',
+'name' => 'sv'
+ },
+ {
+'type' => 'I32',
+'name' => 'len'
+ },
+ {
+'type' => 'SV **',
+'name' => 'sarg'
+ }
+]
+ },
+ {
+'return_type' => 'void',
'name' => 'modperl_perl_exit',
'args' => [
{
@@ -4536,6 +4568,28 @@
{
'type' => 'request_rec *',
'name' => 'r'
+ }
+]
+ },
+ {
+'return_type' => 'apr_size_t',
+'name' => 'mpxs_ap_rprintf',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'I32',
+'name' => 'items'
+ },
+ {
+'type' => 'SV **',
+'name' => 'mark'
+ },
+ {
+'type' => 'SV **',
+'name' => 'sp'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/06 10:26:13
Modified:xs/tables/current/Apache FunctionTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.24 +23 -1 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- FunctionTable.pm 2001/10/27 16:54:20 1.23
+++ FunctionTable.pm 2001/11/06 18:26:13 1.24
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sat Oct 27 10:00:40 2001
+# ! Tue Nov 6 10:36:44 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -8992,6 +8992,28 @@
{
'return_type' => 'apr_status_t',
'name' => 'apr_pool_userdata_set',
+'args' => [
+ {
+'type' => 'const void *',
+'name' => 'data'
+ },
+ {
+'type' => 'const char *',
+'name' => 'key'
+ },
+ {
+'type' => 'apr_status_t (*cleanup)(void *)',
+'name' => 'arg2'
+ },
+ {
+'type' => 'apr_pool_t *',
+'name' => 'cont'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'apr_pool_userdata_setn',
'args' => [
{
'type' => 'const void *',
1.42 +25 -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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- FunctionTable.pm 2001/11/01 22:19:49 1.41
+++ FunctionTable.pm 2001/11/06 18:26:13 1.42
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Thu Nov 1 14:22:34 2001
+# ! Tue Nov 6 10:38:34 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -1073,9 +1073,33 @@
]
},
{
+'return_type' => 'apr_status_t',
+'name' => 'modperl_config_req_cleanup',
+'args' => [
+ {
+'type' => 'void *',
+'name' => 'data'
+ }
+]
+ },
+ {
'return_type' => 'modperl_config_req_t *',
'name' => 'modperl_config_req_new',
'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'modperl_config_request_cleanup',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
{
'type' => 'request_rec *',
'name' => 'r'
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/11/01 14:19:49
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
add missing table entry for $r->location
Revision ChangesPath
1.41 +11 -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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- FunctionTable.pm 2001/10/22 17:25:39 1.40
+++ FunctionTable.pm 2001/11/01 22:19:49 1.41
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Mon Oct 22 10:35:51 2001
+# ! Thu Nov 1 14:22:34 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -4043,6 +4043,16 @@
{
'type' => 'const char *',
'name' => 'name'
+ }
+]
+ },
+ {
+'return_type' => 'char *',
+'name' => 'mpxs_Apache__RequestRec_location',
+'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'r'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/22 10:25:39
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.40 +25 -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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- FunctionTable.pm 2001/10/21 06:51:07 1.39
+++ FunctionTable.pm 2001/10/22 17:25:39 1.40
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sun Oct 21 00:00:29 2001
+# ! Mon Oct 22 10:35:51 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -1338,6 +1338,16 @@
},
{
'return_type' => 'void *',
+'name' => 'modperl_get_perl_module_config',
+'args' => [
+ {
+'type' => 'ap_conf_vector_t *',
+'name' => 'cv'
+ }
+]
+ },
+ {
+'return_type' => 'void *',
'name' => 'modperl_global_get',
'args' => [
{
@@ -3168,6 +3178,20 @@
{
'type' => 'apr_pool_t *',
'name' => 'p'
+ }
+]
+ },
+ {
+'return_type' => 'void',
+'name' => 'modperl_set_perl_module_config',
+'args' => [
+ {
+'type' => 'ap_conf_vector_t *',
+'name' => 'cv'
+ },
+ {
+'type' => 'void *',
+'name' => 'cfg'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/20 23:51:07
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.39 +1 -29 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- FunctionTable.pm 2001/10/21 05:48:13 1.38
+++ FunctionTable.pm 2001/10/21 06:51:07 1.39
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sat Oct 20 22:58:03 2001
+# ! Sun Oct 21 00:00:29 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -2122,40 +2122,12 @@
]
},
{
-'return_type' => 'void',
-'name' => 'modperl_interp_pool_add',
-'args' => [
- {
-'type' => 'modperl_interp_pool_t *',
-'name' => 'mip'
- },
- {
-'type' => 'modperl_interp_t *',
-'name' => 'interp'
- }
-]
- },
- {
'return_type' => 'apr_status_t',
'name' => 'modperl_interp_pool_destroy',
'args' => [
{
'type' => 'void *',
'name' => 'data'
- }
-]
- },
- {
-'return_type' => 'void',
-'name' => 'modperl_interp_pool_remove',
-'args' => [
- {
-'type' => 'modperl_interp_pool_t *',
-'name' => 'mip'
- },
- {
-'type' => 'modperl_interp_t *',
-'name' => 'interp'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/20 22:48:13
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.38 +1 -43 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- FunctionTable.pm 2001/10/21 05:05:50 1.37
+++ FunctionTable.pm 2001/10/21 05:48:13 1.38
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sat Oct 20 22:13:10 2001
+# ! Sat Oct 20 22:58:03 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -2955,48 +2955,6 @@
{
'type' => 'U32',
'name' => 'hash'
- }
-]
- },
- {
-'return_type' => 'void',
-'name' => 'modperl_perl_ids_get',
-'args' => [
- {
-'type' => 'modperl_perl_ids_t *',
-'name' => 'ids'
- }
-]
- },
- {
-'return_type' => 'void',
-'name' => 'modperl_perl_init_ids',
-'args' => [
- {
-'type' => 'PerlInterpreter *',
-'name' => 'my_perl'
- },
- {
-'type' => 'modperl_perl_ids_t *',
-'name' => 'ids'
- }
-]
- },
- {
-'return_type' => 'apr_status_t',
-'name' => 'modperl_perl_init_ids_mip',
-'args' => [
- {
-'type' => 'PerlInterpreter *',
-'name' => 'my_perl'
- },
- {
-'type' => 'modperl_interp_pool_t *',
-'name' => 'mip'
- },
- {
-'type' => 'void *',
-'name' => 'data'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/20 22:05:50
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync to include attr info
Revision ChangesPath
1.37 +216 -1modperl-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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- FunctionTable.pm 2001/10/21 04:54:25 1.36
+++ FunctionTable.pm 2001/10/21 05:05:50 1.37
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sat Oct 20 22:03:43 2001
+# ! Sat Oct 20 22:13:10 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -64,6 +64,10 @@
{
'return_type' => 'apr_status_t',
'name' => 'modperl_bucket_read',
+'attr' => [
+ 'static',
+ '__inline__'
+],
'args' => [
{
'type' => 'apr_bucket *',
@@ -262,6 +266,9 @@
{
'return_type' => 'int',
'name' => 'modperl_cgi_header_parse',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'request_rec *',
@@ -1134,6 +1141,9 @@
{
'return_type' => 'SV *',
'name' => 'modperl_dir_config',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -1249,6 +1259,10 @@
{
'return_type' => 'U32 *',
'name' => 'modperl_filter_attributes',
+'attr' => [
+ 'static',
+ '__inline__'
+],
'args' => [
{
'type' => 'SV *',
@@ -1852,6 +1866,9 @@
{
'return_type' => 'SV *',
'name' => 'modperl_hash_tie',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -1874,6 +1891,9 @@
{
'return_type' => 'void *',
'name' => 'modperl_hash_tied_object',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -2180,6 +2200,9 @@
{
'return_type' => 'void',
'name' => 'modperl_io_handle_tie',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -2202,6 +2225,9 @@
{
'return_type' => 'int',
'name' => 'modperl_io_handle_tied',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -2220,6 +2246,9 @@
{
'return_type' => 'void',
'name' => 'modperl_io_handle_untie',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -2234,6 +2263,9 @@
{
'return_type' => 'GV *',
'name' => 'modperl_io_tie_stdin',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -2248,6 +2280,9 @@
{
'return_type' => 'GV *',
'name' => 'modperl_io_tie_stdout',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -2579,6 +2614,9 @@
{
'return_type' => 'SV *',
'name' => 'modperl_newSVsv_obj',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -2669,6 +2707,9 @@
{
'return_type' => 'apr_status_t',
'name' => 'modperl_output_filter_flush',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'modperl_filter_t *',
@@ -2693,6 +2734,9 @@
{
'return_type' => 'apr_ssize_t',
'name' => 'modperl_output_filter_read',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -2735,6 +2779,9 @@
{
'return_type' => 'apr_status_t',
'name' => 'modperl_output_filter_write',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'modperl_filter_t *',
@@ -2753,6 +2800,9 @@
{
'return_type' => 'void',
'name' => 'modperl_perl_av_push_elts_ref',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -2963,6 +3013,9 @@
{
'return_type' => 'int',
'name' => 'modperl_perl_module_loaded',
+'attr' => [
+ '__inline__'
+],
'args' => [
{
'type' => 'PerlInterpreter *',
@@ -3047,6 +3100,9 @@
{
'return_type' => 'SV *',
'name' => 'modperl_ptr2obj',
+'attr' => [
+
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/20 21:54:25
Modified:xs/tables/current/Apache FunctionTable.pm StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.22 +55 -23modperl-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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FunctionTable.pm 2001/10/05 23:38:56 1.21
+++ FunctionTable.pm 2001/10/21 04:54:25 1.22
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Fri Oct 5 16:35:58 2001
+# ! Sat Oct 20 22:03:27 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -586,28 +586,6 @@
]
},
{
-'return_type' => 'apr_status_t',
-'name' => 'ap_dechunk_filter',
-'args' => [
- {
-'type' => 'ap_filter_t *',
-'name' => 'f'
- },
- {
-'type' => 'apr_bucket_brigade *',
-'name' => 'b'
- },
- {
-'type' => 'ap_input_mode_t',
-'name' => 'mode'
- },
- {
-'type' => 'apr_off_t *',
-'name' => 'readbytes'
- }
-]
- },
- {
'return_type' => 'const char *',
'name' => 'ap_default_type',
'args' => [
@@ -8313,6 +8291,38 @@
},
{
'return_type' => 'apr_status_t',
+'name' => 'apr_os_proc_mutex_get',
+'args' => [
+ {
+'type' => 'apr_os_proc_mutex_t *',
+'name' => 'ospmutex'
+ },
+ {
+'type' => 'apr_proc_mutex_t *',
+'name' => 'pmutex'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'apr_os_proc_mutex_put',
+'args' => [
+ {
+'type' => 'apr_proc_mutex_t **',
+'name' => 'pmutex'
+ },
+ {
+'type' => 'apr_os_proc_mutex_t *',
+'name' => 'ospmutex'
+ },
+ {
+'type' => 'apr_pool_t *',
+'name' => 'cont'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
'name' => 'apr_os_sock_get',
'args' => [
{
@@ -10813,6 +10823,24 @@
},
{
'return_type' => 'apr_status_t',
+'name' => 'apr_thread_cond_timedwait',
+'args' => [
+ {
+'type' => 'apr_thread_cond_t *',
+'name' => 'cond'
+ },
+ {
+'type' => 'apr_thread_mutex_t *',
+'name' => 'mutex'
+ },
+ {
+'type' => 'apr_interval_time_t',
+'name' => 'timeout'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
'name' => 'apr_thread_cond_wait',
'args' => [
{
@@ -10936,6 +10964,10 @@
{
'type' => 'apr_thread_mutex_t **',
'name' => 'mutex'
+ },
+ {
+'type' => 'unsigned int',
+'name' => 'flags'
},
{
'type' => 'apr_pool_t *',
1.21 +14 -1 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- StructureTable.pm 2001/10/05 23:38:56 1.20
+++ StructureTable.pm 2001/10/21 04:54:25 1.21
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Fri Oct 5 16:36:01 2001
+# ! Sat Oct 20 22:03:29 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -1706,6 +1706,19 @@
},
{
'type' => 'apr_os_lock_t',
+'elts' => [
+ {
+'type' => 'int',
+'name' => 'crossproc'
+ },
+ {
+'type' => 'pthread_mutex_t *',
+'name' => 'intraproc'
+ }
+]
+ },
+ {
+'type' => 'apr_os_proc_mutex_t',
'elts' => [
{
'type' => 'int',
1.36 +55 -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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- FunctionTable.pm 2001/10/09 17:58:44 1.35
+++ FunctionTable.pm 2001/10/21 04:54:25 1.36
@@ -2,7 +2,7 @@
# !!!
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/09 10:58:44
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.35 +25 -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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- FunctionTable.pm 2001/10/08 17:58:16 1.34
+++ FunctionTable.pm 2001/10/09 17:58:44 1.35
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Mon Oct 8 11:03:58 2001
+# ! Tue Oct 9 09:27:24 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -2755,6 +2755,30 @@
{
'type' => 'const char *',
'name' => 'name'
+ }
+]
+ },
+ {
+'return_type' => 'void',
+'name' => 'modperl_perl_core_global_init',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ }
+]
+ },
+ {
+'return_type' => 'void',
+'name' => 'modperl_perl_exit',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'int',
+'name' => 'status'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/08 10:58:17
Modified:lib/Apache compat.pm
xs/maps modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
integrate ModPerl::Util and add Apache::untaint compat functionality
Revision ChangesPath
1.19 +3 -0 modperl-2.0/lib/Apache/compat.pm
Index: compat.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- compat.pm 2001/10/08 17:33:02 1.18
+++ compat.pm 2001/10/08 17:58:16 1.19
@@ -40,6 +40,9 @@
}
sub untaint {
+shift;
+require ModPerl::Util;
+ModPerl::Util::untaint(@_);
}
sub module {
1.22 +3 -0 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- modperl_functions.map 2001/10/07 23:02:41 1.21
+++ modperl_functions.map 2001/10/08 17:58:16 1.22
@@ -1,5 +1,8 @@
#modperl specfic functions
+MODULE=ModPerl::Util
+ mpxs_ModPerl__Util_untaint | | ...
+
MODULE=ModPerl::Global
mpxs_ModPerl__Global_special_list_call
mpxs_ModPerl__Global_special_list_clear
1.34 +23 -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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- FunctionTable.pm 2001/10/08 17:39:54 1.33
+++ FunctionTable.pm 2001/10/08 17:58:16 1.34
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Mon Oct 8 10:46:14 2001
+# ! Mon Oct 8 11:03:58 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -4192,6 +4192,28 @@
{
'type' => 'SV *',
'name' => 'package'
+ }
+]
+ },
+ {
+'return_type' => 'void',
+'name' => 'mpxs_ModPerl__Util_untaint',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'I32',
+'name' => 'items'
+ },
+ {
+'type' => 'SV **',
+'name' => 'mark'
+ },
+ {
+'type' => 'SV **',
+'name' => 'sp'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/08 10:39:54
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.33 +10 -2 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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- FunctionTable.pm 2001/10/07 23:02:41 1.32
+++ FunctionTable.pm 2001/10/08 17:39:54 1.33
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sun Oct 7 15:51:20 2001
+# ! Mon Oct 8 10:46:14 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -4712,8 +4712,16 @@
'name' => 'mpxs_special_list_do',
'args' => [
{
-'type' => '',
+'type' => 'PerlInterpreter *',
'name' => 'my_perl'
+ },
+ {
+'type' => 'const char *',
+'name' => 'name'
+ },
+ {
+'type' => 'SV *',
+'name' => 'package'
},
{
'type' => 'mpxs_special_list_do_t',
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/07 16:02:41
Modified:xs/maps modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Added: xs/ModPerl/Global ModPerl__Global.h
Log:
add ModPerl::Global module with functions to call/clear special lists (END,etc)
Revision ChangesPath
1.1 modperl-2.0/xs/ModPerl/Global/ModPerl__Global.h
Index: ModPerl__Global.h
===
typedef void (*mpxs_special_list_do_t)(pTHX_ modperl_modglobal_key_t *,
const char *, I32);
static int mpxs_special_list_do(pTHX_ const char *name,
SV *package,
mpxs_special_list_do_t func)
{
STRLEN packlen;
modperl_modglobal_key_t *gkey = modperl_modglobal_lookup(aTHX_ name);
if (!gkey) {
return FALSE;
}
SvPV_force(package, packlen);
func(aTHX_ gkey, SvPVX(package), packlen);
return TRUE;
}
static
MP_INLINE int mpxs_ModPerl__Global_special_list_call(const char *name,
SV *package)
{
dTHX; /* XXX */
return mpxs_special_list_do(aTHX_ name, package,
modperl_perl_global_avcv_call);
}
static
MP_INLINE int mpxs_ModPerl__Global_special_list_clear(const char *name,
SV *package)
{
dTHX; /* XXX */
return mpxs_special_list_do(aTHX_ name, package,
modperl_perl_global_avcv_clear);
}
1.21 +4 -0 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- modperl_functions.map 2001/09/28 20:11:02 1.20
+++ modperl_functions.map 2001/10/07 23:02:41 1.21
@@ -1,5 +1,9 @@
#modperl specfic functions
+MODULE=ModPerl::Global
+ mpxs_ModPerl__Global_special_list_call
+ mpxs_ModPerl__Global_special_list_clear
+
MODULE=Apache::RequestUtil PACKAGE=guess
mpxs_Apache__RequestRec_push_handlers
mpxs_Apache__RequestRec_set_handlers
1.32 +43 -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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- FunctionTable.pm 2001/10/07 22:11:56 1.31
+++ FunctionTable.pm 2001/10/07 23:02:41 1.32
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sun Oct 7 15:18:16 2001
+# ! Sun Oct 7 15:51:20 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -4168,6 +4168,34 @@
]
},
{
+'return_type' => 'int',
+'name' => 'mpxs_ModPerl__Global_special_list_call',
+'args' => [
+ {
+'type' => 'const char *',
+'name' => 'name'
+ },
+ {
+'type' => 'SV *',
+'name' => 'package'
+ }
+]
+ },
+ {
+'return_type' => 'int',
+'name' => 'mpxs_ModPerl__Global_special_list_clear',
+'args' => [
+ {
+'type' => 'const char *',
+'name' => 'name'
+ },
+ {
+'type' => 'SV *',
+'name' => 'package'
+ }
+]
+ },
+ {
'return_type' => 'void',
'name' => 'mpxs_ap_allow_methods',
'args' => [
@@ -4676,6 +4704,20 @@
{
'type' => 'apr_read_type_e',
'name' => 'block'
+ }
+]
+ },
+ {
+'return_type' => 'int',
+'name' => 'mpxs_special_list_do',
+'args' => [
+ {
+'type' => '',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'mpxs_special_list_do_t',
+'name' => 'func'
}
]
}
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/07 15:11:56
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.31 +124 -8modperl-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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- FunctionTable.pm 2001/10/06 01:03:27 1.30
+++ FunctionTable.pm 2001/10/07 22:11:56 1.31
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Fri Oct 5 17:52:47 2001
+# ! Sun Oct 7 15:18:16 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -122,6 +122,10 @@
'name' => 'p'
},
{
+'type' => 'request_rec *',
+'name' => 'r'
+ },
+ {
'type' => 'server_rec *',
'name' => 's'
},
@@ -433,6 +437,24 @@
},
{
'return_type' => 'const char *',
+'name' => 'modperl_cmd_init_handlers',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'parms'
+ },
+ {
+'type' => 'void *',
+'name' => 'mconfig'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg'
+ }
+]
+ },
+ {
+'return_type' => 'const char *',
'name' => 'modperl_cmd_input_filter_handlers',
'args' => [
{
@@ -2513,6 +2535,20 @@
]
},
{
+'return_type' => 'modperl_modglobal_key_t *',
+'name' => 'modperl_modglobal_lookup',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'const char *',
+'name' => 'name'
+ }
+]
+ },
+ {
'return_type' => 'SV *',
'name' => 'modperl_newSVsv_obj',
'args' => [
@@ -2688,34 +2724,114 @@
},
{
'return_type' => 'void',
-'name' => 'modperl_perl_global_restore',
+'name' => 'modperl_perl_av_push_elts_ref',
'args' => [
{
'type' => 'PerlInterpreter *',
'name' => 'my_perl'
},
{
-'type' => 'modperl_perl_globals_t *',
-'name' => 'globals'
+'type' => 'AV *',
+'name' => 'dst'
+ },
+ {
+'type' => 'AV *',
+'name' => 'src'
}
]
},
{
'return_type' => 'void',
-'name' => 'modperl_perl_global_save',
+'name' => 'modperl_perl_call_list',
'args' => [
{
'type' => 'PerlInterpreter *',
'name' => 'my_perl'
},
+ {
+'type' => 'AV *',
+'name' => 'subs'
+ },
{
-'type' => 'modperl_perl_globals_t *',
-'name' => 'globals'
+'type' => 'const char *',
+'name' => 'name'
}
]
},
{
'return_type' => 'void',
+'name' => 'modperl_perl_global_avcv_call',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'modperl_modglobal_key_t *',
+'name' => 'gkey'
+ },
+ {
+'type' => 'const char *',
+'name' => 'package'
+ },
+ {
+'type' => 'I32',
+'name' => 'packlen'
+ }
+]
+ },
+ {
+'return_type' => 'void',
+'name' => 'modperl_perl_global_avcv_clear',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'modperl_modglobal_key_t *',
+'name' => 'gkey'
+ },
+ {
+'type' => 'const char *',
+'name' => 'package'
+ },
+ {
+'type' => 'I32',
+'name' => 'packlen'
+ }
+]
+ },
+ {
+'return_type' => 'void',
+'name' => 'modperl_perl_global_request_restore',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ }
+]
+ },
+ {
+'return_type' => 'void',
+'name' => 'modperl_perl_global_request_save',
+'args' => [
+ {
+'type' => 'PerlInterpreter *',
+'name' => 'my_perl'
+ },
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ }
+]
+ },
+ {
+'return_type' => 'void',
'name' => 'modperl_perl_ids_get',
'args' => [
{
@@ -3068,7 +3184,7 @@
'name' => 'sv_val'
},
{
-
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/05 18:03:28
Modified:lib/Apache compat.pm
src/modules/perl modperl_util.c modperl_util.h
t/response/TestAPI module.pm
todo api.txt
xs/Apache/Module Apache__Module.h
xs/maps apache_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
add Apache::Module::loaded function
and Apache::module wrapper in Apache::compat
Submitted by: Philippe M . Chiasson <[EMAIL PROTECTED]>
Reviewed by: dougm
Revision ChangesPath
1.16 +5 -0 modperl-2.0/lib/Apache/compat.pm
Index: compat.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- compat.pm 2001/10/01 09:04:10 1.15
+++ compat.pm 2001/10/06 01:03:26 1.16
@@ -42,6 +42,11 @@
sub untaint {
}
+sub module {
+require Apache::Module;
+return Apache::Module::loaded($_[1]);
+}
+
package Apache::Constants;
use Apache::Const ();
1.20 +5 -0 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- modperl_util.c2001/09/28 20:11:01 1.19
+++ modperl_util.c2001/10/06 01:03:27 1.20
@@ -443,3 +443,8 @@
return RETVAL;
}
+
+MP_INLINE int modperl_perl_module_loaded(pTHX_ const char *name)
+{
+return gv_stashpv(name, FALSE) ? 1 : 0;
+}
1.20 +2 -0 modperl-2.0/src/modules/perl/modperl_util.h
Index: modperl_util.h
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- modperl_util.h2001/09/28 20:11:01 1.19
+++ modperl_util.h2001/10/06 01:03:27 1.20
@@ -72,4 +72,6 @@
SV *modperl_table_get_set(pTHX_ apr_table_t *table, char *key,
SV *sv_val, bool do_taint);
+MP_INLINE int modperl_perl_module_loaded(pTHX_ const char *name);
+
#endif /* MODPERL_UTIL_H */
1.2 +65 -9 modperl-2.0/t/response/TestAPI/module.pm
Index: module.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/module.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- module.pm 2001/04/04 05:45:48 1.1
+++ module.pm 2001/10/06 01:03:27 1.2
@@ -4,32 +4,88 @@
use warnings FATAL => 'all';
use Apache::Test;
+use Apache::TestConfig;
+use Apache::TestUtil;
use Apache::Module ();
use DynaLoader ();
sub handler {
my $r = shift;
-plan $r, tests => 6;
+my $cfg = Apache::Test::config();
+plan $r, tests => 14;
+
my $top_module = Apache::Module->top_module;
ok $top_module;
+
+ok t_cmp($cfg->{httpd_info}->{MODULE_MAGIC_NUMBER},
+ $top_module->version . ':0',
+ q{$top_module->version});
+
+ok t_cmp(scalar keys %{ $cfg->{modules} },
+ $top_module->module_index,
+ q{$top_module->module_index});
+
+#XXX: some of these tests will fail if modperl is linked static
+#rather than dso. also no promise that mod_perl will be the top_module
+
+ok t_cmp('mod_perl.c', $top_module->name(), q{$top_module->name});
-ok $top_module->version;
+my $cmd = $top_module->cmds;
-ok $top_module->module_index;
+ok defined $cmd;
-ok $top_module->name;
+ok UNIVERSAL::isa($cmd, 'Apache::Command');
-ok $top_module->cmds;
+{
+local $cfg->{modules}->{'mod_perl.c'} = 1;
+my $modules = {};
-for (my $modp = $top_module; $modp; $modp = $modp->next) {
-if ($modp->name eq 'mod_perl.c') {
-ok 1;
-last;
+for (my $modp = $top_module; $modp; $modp = $modp->next) {
+if ($modp && $modp->name) {
+$modules->{$modp->name} = 1;
+}
}
+
+my %alias = (
+'sapi_apache2.c' => 'mod_php4.c',
+);
+
+while (my($key, $val) = each %alias) {
+next unless $modules->{$key};
+delete $modules->{$key};
+$modules->{$val} = 1;
+}
+
+ok t_cmp($cfg->{modules}, $modules, "Modules list");
}
+
+#.c
+ok t_cmp(1, Apache::Module::loaded('mod_perl.c'),
+ "Apache::Module::loaded('mod_perl.c')");
+
+ok t_cmp(0, Apache::Module::loaded('Apache__Module_foo.
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/10/05 16:38:56
Modified:xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.15 +5 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ConstantsTable.pm 2001/09/06 05:16:25 1.14
+++ ConstantsTable.pm 2001/10/05 23:38:56 1.15
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sun Aug 19 11:43:53 2001
+# ! Fri Oct 5 16:35:50 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -187,6 +187,10 @@
'APR_URI_UNP_REVEALPASSWORD',
'APR_URI_UNP_OMITPATHINFO',
'APR_URI_UNP_OMITQUERY'
+],
+'table' => [
+ 'APR_OVERLAP_TABLES_SET',
+ 'APR_OVERLAP_TABLES_MERGE'
],
'socket' => [
'APR_SO_LINGER',
1.21 +55 -443 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- FunctionTable.pm 2001/09/25 18:02:39 1.20
+++ FunctionTable.pm 2001/10/05 23:38:56 1.21
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Tue Sep 25 10:58:26 2001
+# ! Fri Oct 5 16:35:58 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -8891,6 +8891,20 @@
},
{
'return_type' => 'void',
+'name' => 'apr_pool_lock',
+'args' => [
+ {
+'type' => 'apr_pool_t *',
+'name' => 'p'
+ },
+ {
+'type' => 'int',
+'name' => 'writeprotect'
+ }
+]
+ },
+ {
+'return_type' => 'void',
'name' => 'apr_pool_note_subprocess',
'args' => [
{
@@ -9121,6 +9135,16 @@
]
},
{
+'return_type' => 'apr_pool_t *',
+'name' => 'apr_proc_mutex_pool_get',
+'args' => [
+ {
+'type' => 'apr_proc_mutex_t *',
+'name' => 'ob'
+ }
+]
+ },
+ {
'return_type' => 'apr_status_t',
'name' => 'apr_proc_mutex_trylock',
'args' => [
@@ -10089,448 +10113,6 @@
]
},
{
-'return_type' => 'apr_status_t',
-'name' => 'apr_sms_blocks_create',
-'args' => [
- {
-'type' => 'apr_sms_t **',
-'name' => 'sms'
- },
- {
-'type' => 'apr_sms_t *',
-'name' => 'pms'
- },
- {
-'type' => 'apr_size_t',
-'name' => 'block_size'
- }
-]
- },
- {
-'return_type' => 'void *',
-'name' => 'apr_sms_calloc',
-'args' => [
- {
-'type' => 'apr_sms_t *',
-'name' => 'sms'
- },
- {
-'type' => 'apr_size_t',
-'name' => 'size'
- }
-]
- },
- {
-'return_type' => 'apr_status_t',
-'name' => 'apr_sms_cleanup_register',
-'args' => [
- {
-'type' => 'apr_sms_t *',
-'name' => 'sms'
- },
- {
-'type' => 'apr_int32_t',
-'name' => 'type'
- },
- {
-'type' => 'const void *',
-'name' => 'data'
- },
- {
-'type' => 'apr_status_t (*cleanup_fn)(void *)',
-'name' => 'arg3'
- }
-]
- },
- {
-'return_type' => 'apr_status_t',
-'name' => 'apr_sms_cleanup_run',
-'args' => [
- {
-'type' => 'apr_sms_t *',
-'name' => 'sms'
- },
- {
-'type' => 'apr_int32_t',
-'name' => 'type'
- },
- {
-'type' => 'const void *',
-'name' => 'data'
- },
- {
-'type' => 'apr_status_t (*cleanup)(void *)',
-'name' => 'arg3'
- }
-]
- },
- {
-'return_type' => 'apr_status_t',
-'name' => 'apr_sms_cleanup_run_type',
-'args' => [
- {
-'type' => 'apr_sms_t *',
-'name' => 'sms'
- },
- {
-'type' => 'apr_int32_t',
-'name' => 'type'
- }
-]
- },
- {
-'return_type' => 'apr_status_t',
-'name' => 'apr_sms_cleanup_unregister',
-'args'
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/09/25 12:44:03
Modified:lib/ModPerl WrapXS.pm
src/modules/perl modperl_perl_includes.h modperl_util.c
modperl_util.h
t/response/TestAPR table.pm
todo api.txt
xs modperl_xs_util.h typemap
xs/APR/Table APR__Table.h
xs/maps apr_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
add APR::Table tied interface support
Submitted by: Philippe M . Chiasson <[EMAIL PROTECTED]>
Reviewed by: dougm
Revision ChangesPath
1.22 +1 -0 modperl-2.0/lib/ModPerl/WrapXS.pm
Index: WrapXS.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/WrapXS.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WrapXS.pm 2001/09/13 02:37:37 1.21
+++ WrapXS.pm 2001/09/25 19:44:02 1.22
@@ -506,6 +506,7 @@
my %typemap = (
'Apache::RequestRec' => 'T_APACHEOBJ',
'apr_time_t' => 'T_APR_TIME',
+'APR::Table' => 'T_HASHOBJ',
);
sub write_typemap {
1.6 +4 -0 modperl-2.0/src/modules/perl/modperl_perl_includes.h
Index: modperl_perl_includes.h
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_includes.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- modperl_perl_includes.h 2001/09/25 17:30:32 1.5
+++ modperl_perl_includes.h 2001/09/25 19:44:02 1.6
@@ -51,4 +51,8 @@
# define G_METHOD 64
#endif
+#ifndef PERL_MAGIC_tied
+# define PERL_MAGIC_tied 'P'
+#endif
+
#endif /* MODPERL_PERL_INCLUDES_H */
1.18 +47 -0 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- modperl_util.c2001/08/08 16:20:32 1.17
+++ modperl_util.c2001/09/25 19:44:02 1.18
@@ -339,3 +339,50 @@
return uri;
}
+MP_INLINE SV *modperl_hash_tie(pTHX_
+ const char *classname,
+ SV *tsv, void *p)
+{
+SV *hv = (SV*)newHV();
+SV *rsv = newSViv(0);
+
+sv_setref_pv(rsv, classname, p);
+sv_magic(hv, rsv, PERL_MAGIC_tied, Nullch, 0);
+
+return SvREFCNT_inc(sv_bless(sv_2mortal(newRV_noinc(hv)),
+ gv_stashpv(classname, TRUE)));
+}
+
+MP_INLINE void *modperl_hash_tied_object(pTHX_
+ const char *classname,
+ SV *tsv)
+{
+if (sv_derived_from(tsv, classname)) {
+if (SVt_PVHV == SvTYPE(SvRV(tsv))) {
+SV *hv = SvRV(tsv);
+MAGIC *mg;
+
+if (SvMAGICAL(hv)) {
+if ((mg = mg_find(hv, PERL_MAGIC_tied))) {
+return (void *)MgObjIV(mg);
+}
+else {
+Perl_warn(aTHX_ "Not a tied hash: (magic=%c)", mg);
+}
+}
+else {
+Perl_warn(aTHX_ "SV is not tied");
+}
+}
+else {
+return (void *)SvObjIV(tsv);
+}
+}
+else {
+Perl_croak(aTHX_
+ "argument is not a blessed reference "
+ "(expecting an %s derived object)", classname);
+}
+
+return NULL;
+}
1.17 +9 -0 modperl-2.0/src/modules/perl/modperl_util.h
Index: modperl_util.h
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modperl_util.h2001/08/08 07:02:41 1.16
+++ modperl_util.h2001/09/25 19:44:02 1.17
@@ -19,6 +19,7 @@
#endif
#define SvObjIV(o) SvIV((SV*)SvRV(o))
+#define MgObjIV(m) SvIV((SV*)SvRV(m->mg_obj))
MP_INLINE server_rec *modperl_sv2server_rec(pTHX_ SV *sv);
MP_INLINE request_rec *modperl_sv2request_rec(pTHX_ SV *sv);
@@ -49,5 +50,13 @@
modperl_cleanup_data_t *modperl_cleanup_data_new(apr_pool_t *p, void *data);
MP_INLINE modperl_uri_t *modperl_uri_new(apr_pool_t *p);
+
+/* tie %hash */
+MP_INLINE SV *modperl_hash_tie(pTHX_ const char *classname,
+ SV *tsv, void *p);
+
+/* tied %hash */
+MP_INLINE void *modperl_hash_tied_object(pTHX_ const char *classname,
+ SV *tsv);
#endif /* MODPERL_UTIL_H */
1.3 +29 -2 modperl-2.0/
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/09/25 11:02:39
Modified:xs/tables/current/Apache FunctionTable.pm StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.20 +167 -1modperl-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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FunctionTable.pm 2001/09/15 17:53:12 1.19
+++ FunctionTable.pm 2001/09/25 18:02:39 1.20
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Sat Sep 15 10:57:55 2001
+# ! Tue Sep 25 10:58:26 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -188,6 +188,24 @@
]
},
{
+'return_type' => 'void',
+'name' => 'ap_allow_standard_methods',
+'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ },
+ {
+'type' => 'int',
+'name' => 'reset'
+ },
+ {
+'type' => '...',
+'name' => 'arg2'
+ }
+]
+ },
+ {
'return_type' => 'const char *',
'name' => 'ap_auth_name',
'args' => [
@@ -736,6 +754,34 @@
},
{
'return_type' => 'apr_status_t',
+'name' => 'ap_explode_recent_gmt',
+'args' => [
+ {
+'type' => 'apr_exploded_time_t *',
+'name' => 'tm'
+ },
+ {
+'type' => 'apr_time_t',
+'name' => 't'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'ap_explode_recent_localtime',
+'args' => [
+ {
+'type' => 'apr_exploded_time_t *',
+'name' => 'tm'
+ },
+ {
+'type' => 'apr_time_t',
+'name' => 't'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
'name' => 'ap_fflush',
'args' => [
{
@@ -6557,6 +6603,24 @@
},
{
'return_type' => 'apr_status_t',
+'name' => 'apr_file_mktemp',
+'args' => [
+ {
+'type' => 'apr_file_t **',
+'name' => 'fp'
+ },
+ {
+'type' => 'char *',
+'name' => 'tmplt'
+ },
+ {
+'type' => 'apr_pool_t *',
+'name' => 'p'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
'name' => 'apr_file_name_get',
'args' => [
{
@@ -8979,6 +9043,104 @@
]
},
{
+'return_type' => 'apr_status_t',
+'name' => 'apr_proc_mutex_child_init',
+'args' => [
+ {
+'type' => 'apr_proc_mutex_t **',
+'name' => 'mutex'
+ },
+ {
+'type' => 'const char *',
+'name' => 'fname'
+ },
+ {
+'type' => 'apr_pool_t *',
+'name' => 'pool'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'apr_proc_mutex_create',
+'args' => [
+ {
+'type' => 'apr_proc_mutex_t **',
+'name' => 'mutex'
+ },
+ {
+'type' => 'const char *',
+'name' => 'fname'
+ },
+ {
+'type' => 'apr_pool_t *',
+'name' => 'pool'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'apr_proc_mutex_create_np',
+'args' => [
+ {
+'type' => 'apr_proc_mutex_t **',
+'name' => 'mutex'
+ },
+ {
+'type' => 'const char *',
+'name' => 'fname'
+ },
+ {
+'type' => 'apr_lockmech_e_np',
+'name' => 'mech'
+ },
+ {
+'type' => 'apr_pool_t *',
+'name' => 'pool'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'apr_proc_mutex_destroy',
+'args' => [
+ {
+'type' => 'apr_proc_mutex_t *',
+'name' => 'mutex'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'apr_proc_mutex_lock',
+'args' => [
+ {
+'type' => 'apr_proc_mutex_t *',
+'name' => 'mutex'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'apr_proc_mutex_trylock',
+'args' => [
+ {
+'type' => 'apr_proc_mutex_t *',
+'name' => 'mutex'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'apr_proc_mutex_unlock',
+'args' => [
+ {
+'type' => 'apr_proc_mutex_t *',
+'name' => 'mutex'
+ }
+]
+ },
+ {
'return_type' => 'void',
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/09/15 11:17:31
Modified:lib/ModPerl TypeMap.pm
t/response/TestAPR table.pm
todo api.txt
xs/maps apr_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Added: xs/APR/Table APR__Table.h
Log:
implement APR::Table->do
Submitted by: Philippe M . Chiasson <[EMAIL PROTECTED]>
Reviewed by: dougm
Revision ChangesPath
1.10 +1 -0 modperl-2.0/lib/ModPerl/TypeMap.pm
Index: TypeMap.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/TypeMap.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TypeMap.pm2001/09/10 05:35:10 1.9
+++ TypeMap.pm2001/09/15 18:17:31 1.10
@@ -396,6 +396,7 @@
Apache__RequestRec => 'r',
Apache__Server => 'server',
Apache__Connection => 'connection',
+APR__Table => 'table',
APR__UUID => 'uuid',
apr_status_t => 'status',
);
1.2 +54 -1 modperl-2.0/t/response/TestAPR/table.pm
Index: table.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/table.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- table.pm 2001/09/12 16:40:27 1.1
+++ table.pm 2001/09/15 18:17:31 1.2
@@ -8,10 +8,13 @@
use Apache::Const -compile => 'OK';
use APR::Table ();
+my $filter_count;
+my $TABLE_SIZE = 20;
+
sub handler {
my $r = shift;
-plan $r, tests => 5;
+plan $r, tests => 9;
my $table = APR::Table::make($r->pool, 16);
@@ -25,7 +28,57 @@
ok not defined $table->get('foo');
+for (1..$TABLE_SIZE) {
+$table->set(chr($_+97), $_);
+}
+
+#Simple filtering
+$filter_count = 0;
+$table->do("my_filter");
+ok $filter_count == $TABLE_SIZE;
+
+#Filtering aborting in the middle
+$filter_count = 0;
+$table->do("my_filter_stop");
+ok $filter_count == int($TABLE_SIZE)/2;
+
+#Filtering with anon sub
+$filter_count=0;
+$table->do(sub {
+my ($key,$value) = @_;
+$filter_count++;
+unless ($key eq chr($value+97)) {
+die "arguments I recieved are bogus($key,$value)";
+}
+return 1;
+});
+
+ok $filter_count == $TABLE_SIZE;
+
+$filter_count = 0;
+$table->do("my_filter", "c", "b", "e");
+ok $filter_count == 3;
+
Apache::OK;
+}
+
+sub my_filter {
+my ($key,$value) = @_;
+$filter_count++;
+unless ($key eq chr($value+97)) {
+die "arguments I recieved are bogus($key,$value)";
+}
+return 1;
+}
+
+sub my_filter_stop {
+my ($key,$value) = @_;
+$filter_count++;
+unless ($key eq chr($value+97)) {
+die "arguments I recieved are bogus($key,$value)";
+}
+return 0 if ($filter_count == int($TABLE_SIZE)/2);
+return 1;
}
1;
1.4 +0 -2 modperl-2.0/todo/api.txt
Index: api.txt
===
RCS file: /home/cvs/modperl-2.0/todo/api.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- api.txt 2001/09/15 17:57:25 1.3
+++ api.txt 2001/09/15 18:17:31 1.4
@@ -9,8 +9,6 @@
$r->headers_out->{KEY} is not currently supported
might want to make this optional, disabled by default
-missing: APR::Table->do
-
$r->finfo:
need apr_finfo_t <-> struct stat conversion (might already be there,
haven't looked close enough yet)
1.1 modperl-2.0/xs/APR/Table/APR__Table.h
Index: APR__Table.h
===
typedef struct {
SV *cv;
apr_table_t *filter; /*XXX: or maybe a mgv ? */
} mpxs_table_do_cb_data_t;
typedef int (*mpxs_apr_table_do_cb_t)(void *, const char *, const char *);
static int mpxs_apr_table_do_cb(void *data,
const char *key, const char *val)
{
dTHX; /*XXX*/
dSP;
int rv = 0;
mpxs_table_do_cb_data_t *tdata = (mpxs_table_do_cb_data_t *)data;
/* Skip completely if something is wrong */
if (!(tdata && tdata->cv && key && val)) {
return 0;
}
/* Skip entries if not in our filter list */
if (tdata->filter) {
if (!apr_table_get(tdata->filter, key)) {
return 1;
}
}
ENTER;
SAVETMPS;
PUSHMARK(sp);
XPUSHs(sv_2mortal(newSVpv(key,0)));
XPUSHs(sv_2mortal(newSVpv(val,0)));
PUTBACK;
rv = call_sv(tdata->cv, 0);
SPAGAIN;
rv = (1 == rv) ? POPi : 1;
PUTBACK;
FREETMPS;
LEAVE;
/
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/09/15 10:57:25
Modified:lib/Apache compat.pm
t/response/TestAPI request_rec.pm
todo api.txt
xs/Apache/RequestIO Apache__RequestIO.h
xs/maps modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
implement $r->print
Submitted by: Philippe M . Chiasson <[EMAIL PROTECTED]>
Reviewed by: dougm
Revision ChangesPath
1.12 +0 -2 modperl-2.0/lib/Apache/compat.pm
Index: compat.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- compat.pm 2001/09/13 04:41:44 1.11
+++ compat.pm 2001/09/15 17:57:25 1.12
@@ -111,8 +111,6 @@
#XXX resolve '.' in @INC to basename $r->filename
}
-*print = \&puts;
-
sub finfo {
my $r = shift;
stat $r->filename;
1.6 +10 -1 modperl-2.0/t/response/TestAPI/request_rec.pm
Index: request_rec.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/request_rec.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- request_rec.pm2001/09/08 18:26:46 1.5
+++ request_rec.pm2001/09/15 17:57:25 1.6
@@ -8,7 +8,7 @@
sub handler {
my $r = shift;
-plan $r, tests => 37;
+plan $r, tests => 40;
#Apache->request($r); #PerlOptions +GlobalRequest takes care
my $gr = Apache->request;
@@ -88,6 +88,15 @@
#no_cache
ok $r->no_cache || 1;
+
+{
+local $| = 0;
+ok 9 == $r->print("buffered\n");
+ok 0 == $r->print();
+local $| = 1;
+ok 13 == $r->print('n','o','t',' ','b','u','f','f','e','r','e','d',"\n");
+}
+
#no_local_copy
1.3 +0 -3 modperl-2.0/todo/api.txt
Index: api.txt
===
RCS file: /home/cvs/modperl-2.0/todo/api.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- api.txt 2001/09/08 18:26:46 1.2
+++ api.txt 2001/09/15 17:57:25 1.3
@@ -68,9 +68,6 @@
however, $r->sendfile is a new function that opens the file for you
and calls ap_send_fd() underneath.
-$r->print:
-does not yet honor $|
-
$r->{hard,reset,soft,kill}_timeout:
do not exist in 2.0. should be deprecated. consider adding noops in
Apache::compat
1.13 +29 -16modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h
Index: Apache__RequestIO.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Apache__RequestIO.h 2001/06/20 23:59:37 1.12
+++ Apache__RequestIO.h 2001/09/15 17:57:25 1.13
@@ -1,17 +1,8 @@
#define mpxs_Apache__RequestRec_TIEHANDLE(stashsv, sv) \
modperl_newSVsv_obj(aTHX_ stashsv, sv)
-#define mpxs_Apache__RequestRec_PRINT mpxs_ap_rvputs
+#define mpxs_Apache__RequestRec_PRINT mpxs_Apache__RequestRec_print
-#if 0
-#define MP_USE_AP_RWRITE
-#endif
-
-#ifdef MP_USE_AP_RWRITE
-
-#define mpxs_call_rwrite(r,buf,len) \
-ap_rwrite(buf, len, r)
-
#define mpxs_rwrite_loop(func,obj) \
while (MARK <= SP) { \
STRLEN len; \
@@ -21,8 +12,6 @@
MARK++; \
}
-#endif
-
static MP_INLINE apr_size_t mpxs_ap_rvputs(pTHX_ I32 items,
SV **MARK, SV **SP)
{
@@ -39,11 +28,7 @@
MP_START_TIMES();
-#ifdef MP_USE_AP_RWRITE
-mpxs_rwrite_loop(mpxs_call_rwrite, r);
-#else
mpxs_write_loop(modperl_wbucket_write, &rcfg->wbucket);
-#endif
MP_END_TIMES();
MP_PRINT_TIMES("r->puts");
@@ -52,6 +37,34 @@
return bytes;
}
+
+static MP_INLINE
+apr_size_t mpxs_Apache__RequestRec_print(pTHX_ I32 items,
+ SV **MARK, SV **SP)
+{
+modperl_config_srv_t *scfg;
+modperl_config_req_t *rcfg;
+request_rec *r;
+
+/* bytes must be called bytes */
+apr_size_t bytes = 0;
+
+/* this also magically assings to r ;-) */
+mpxs_usage_va_1(r, "$r->print(...)");
+
+rcfg = modperl_config_req_get(r);
+scfg = modperl_config_srv_get(r->server);
+
+mpxs_write_loop(modperl_wbucket_write, &rcfg->wbucket);
+
+/* if ($|) */
+if (IoFLUSH(PL_defoutgv)){
+modperl_wbucket_flush(&rcfg->wbucket);
+ap_rflush(r);
+}
+
+return bytes;
+}
/* alias */
#define mpxs_Apache__RequestRec_WRITE mpxs_Apache__RequestRec_write
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/09/12 21:41:44
Modified:lib/Apache compat.pm
xs/Apache/Response Apache__Response.h
xs/maps modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
move send_http_header to xs so we can turn off PerlOptions +ParseHeaders
Revision ChangesPath
1.11 +0 -7 modperl-2.0/lib/Apache/compat.pm
Index: compat.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- compat.pm 2001/05/08 18:22:43 1.10
+++ compat.pm 2001/09/13 04:41:44 1.11
@@ -97,13 +97,6 @@
return $r->parse_args($buf)
}
-sub send_http_header {
-my($r, $type) = @_;
-if ($type) {
-$r->content_type($type);
-}
-}
-
sub clear_rgy_endav {
}
1.4 +13 -0 modperl-2.0/xs/Apache/Response/Apache__Response.h
Index: Apache__Response.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/Response/Apache__Response.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Apache__Response.h2001/05/08 21:08:53 1.3
+++ Apache__Response.h2001/09/13 04:41:44 1.4
@@ -12,3 +12,16 @@
modperl_cgi_header_parse(r, SvPV(sv,len), &bodytext); \
rcfg->wbucket.header_parse = 0; \
}
+
+/* XXX: should only be part of Apache::compat */
+static MP_INLINE void
+mpxs_Apache__RequestRec_send_http_header(request_rec *r, const char *type)
+{
+MP_dRCFG;
+
+if (type) {
+r->content_type = apr_pstrdup(r->pool, type);
+}
+
+rcfg->wbucket.header_parse = 0; /* turn off PerlOptions +ParseHeaders */
+}
1.18 +1 -0 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- modperl_functions.map 2001/09/08 18:26:46 1.17
+++ modperl_functions.map 2001/09/13 04:41:44 1.18
@@ -26,6 +26,7 @@
MODULE=Apache::Response PACKAGE=Apache::RequestRec
DEFINE_send_cgi_header | | request_rec *:r, SV *:buffer
+ mpxs_Apache__RequestRec_send_http_header | | r, type=NULL
MODULE=Apache::ServerUtil PACKAGE=guess
mpxs_Apache__Server_push_handlers
1.24 +15 -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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- FunctionTable.pm 2001/09/08 18:26:46 1.23
+++ FunctionTable.pm 2001/09/13 04:41:44 1.24
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sat Sep 8 11:16:43 2001
+# ! Wed Sep 12 21:41:47 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -3436,6 +3436,20 @@
{
'type' => 'int',
'name' => 'offset'
+ }
+]
+ },
+ {
+'return_type' => '',
+'name' => 'mpxs_Apache__RequestRec_send_http_header',
+'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ },
+ {
+'type' => 'const char *',
+'name' => 'type'
}
]
},
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/09/08 11:26:46
Modified:t/response/TestAPI request_rec.pm
todo api.txt
xs/Apache/RequestUtil Apache__RequestUtil.h
xs/maps apache_functions.map apache_structures.map
modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
implement $r->no_cache
Submitted by: Philippe M . Chiasson <[EMAIL PROTECTED]>
Reviewed by: dougm
Revision ChangesPath
1.5 +3 -1 modperl-2.0/t/response/TestAPI/request_rec.pm
Index: request_rec.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/request_rec.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- request_rec.pm2001/05/04 21:21:44 1.4
+++ request_rec.pm2001/09/08 18:26:46 1.5
@@ -8,7 +8,7 @@
sub handler {
my $r = shift;
-plan $r, tests => 36;
+plan $r, tests => 37;
#Apache->request($r); #PerlOptions +GlobalRequest takes care
my $gr = Apache->request;
@@ -87,6 +87,8 @@
#user
#no_cache
+ok $r->no_cache || 1;
+
#no_local_copy
ok $r->unparsed_uri;
1.2 +0 -3 modperl-2.0/todo/api.txt
Index: api.txt
===
RCS file: /home/cvs/modperl-2.0/todo/api.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- api.txt 2001/05/08 22:25:57 1.1
+++ api.txt 2001/09/08 18:26:46 1.2
@@ -18,9 +18,6 @@
$r->header_{in,out}:
deprecated, but should be included in Apache::compat
-$r->no_cache:
-does not yet manage Pragma, Cache-control headers as 1.x did
-
$r->pnotes:
not yet implemented
1.6 +23 -0 modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h
Index: Apache__RequestUtil.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Apache__RequestUtil.h 2001/04/30 04:39:27 1.5
+++ Apache__RequestUtil.h 2001/09/08 18:26:46 1.6
@@ -153,3 +153,26 @@
auth_value = apr_pstrcat(r->pool, "Basic ", encoded, NULL);
apr_table_setn(r->headers_in, "Authorization", auth_value);
}
+
+
+static MP_INLINE
+int mpxs_Apache__RequestRec_no_cache(request_rec *r, SV *flag)
+{
+dTHX; /* XXX */
+int retval = r->no_cache;
+
+if (flag) {
+r->no_cache = (int)SvIV(flag);
+}
+
+if (r->no_cache) {
+apr_table_setn(r->headers_out, "Pragma", "no-cache");
+apr_table_setn(r->headers_out, "Cache-control", "no-cache");
+}
+else if (flag) { /* only unset if $r->no_cache(0) */
+apr_table_unset(r->headers_out, "Pragma");
+apr_table_unset(r->headers_out, "Cache-control");
+}
+
+return retval;
+}
1.28 +1 -0 modperl-2.0/xs/maps/apache_functions.map
Index: apache_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- apache_functions.map 2001/08/01 02:06:06 1.27
+++ apache_functions.map 2001/09/08 18:26:46 1.28
@@ -43,6 +43,7 @@
!ap_content_type_tolower
ap_get_status_line
ap_is_initial_req
+ mpxs_Apache__RequestRec_no_cache
#MODULE=Apache::RequestConfig
ap_document_root
1.8 +1 -1 modperl-2.0/xs/maps/apache_structures.map
Index: apache_structures.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_structures.map,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apache_structures.map 2001/05/22 20:58:00 1.7
+++ apache_structures.map 2001/09/08 18:26:46 1.8
@@ -49,7 +49,7 @@
> vlist_validator
user
- ap_auth_type #should use ap_auth_type function instead
- no_cache
+~ no_cache
no_local_copy
unparsed_uri
uri
1.17 +1 -0 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modperl_functions.map 2001/05/08 18:55:55 1.16
+++ modperl_functions.map 2001/09/08 18:26:46 1.17
@@ -8,6 +8,7 @@
#protocol module helpers
mpxs_Apache__RequestRec_location_merge
mpxs_Apache__RequestRec_set_basic_credentials
+ mpxs_Apache__RequestRec_no_cache | | r, flag
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
stas01/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 ChangesPath
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'
- },
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
stas01/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 ChangesPath
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
===
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/08/19 10:31:50
Modified:xs/tables/current/Apache FunctionTable.pm StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.14 +226 -13 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FunctionTable.pm 2001/08/01 02:04:46 1.13
+++ FunctionTable.pm 2001/08/19 17:31:49 1.14
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Tue Jul 31 19:03:04 2001
+# ! Sun Aug 19 10:32:09 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -937,7 +937,7 @@
'name' => 'mode'
},
{
-'type' => 'apr_size_t *',
+'type' => 'apr_off_t *',
'name' => 'readbytes'
}
]
@@ -2085,6 +2085,20 @@
},
{
'return_type' => 'void',
+'name' => 'ap_internal_fast_redirect',
+'args' => [
+ {
+'type' => 'request_rec *',
+'name' => 'sub_req'
+ },
+ {
+'type' => 'request_rec *',
+'name' => 'r'
+ }
+]
+ },
+ {
+'return_type' => 'void',
'name' => 'ap_internal_redirect',
'args' => [
{
@@ -2616,6 +2630,30 @@
]
},
{
+'return_type' => 'int',
+'name' => 'ap_method_register',
+'args' => [
+ {
+'type' => 'apr_pool_t *',
+'name' => 'p'
+ },
+ {
+'type' => 'const char *',
+'name' => 'methname'
+ }
+]
+ },
+ {
+'return_type' => 'void',
+'name' => 'ap_method_registry_init',
+'args' => [
+ {
+'type' => 'apr_pool_t *',
+'name' => 'p'
+ }
+]
+ },
+ {
'return_type' => 'apr_status_t',
'name' => 'ap_mpm_pod_check',
'args' => [
@@ -2706,6 +2744,114 @@
]
},
{
+'return_type' => 'const char *',
+'name' => 'ap_mpm_set_accept_lock_mech',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'cmd'
+ },
+ {
+'type' => 'void *',
+'name' => 'dummy'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg'
+ }
+]
+ },
+ {
+'return_type' => 'const char *',
+'name' => 'ap_mpm_set_coredumpdir',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'cmd'
+ },
+ {
+'type' => 'void *',
+'name' => 'dummy'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg'
+ }
+]
+ },
+ {
+'return_type' => 'const char *',
+'name' => 'ap_mpm_set_lockfile',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'cmd'
+ },
+ {
+'type' => 'void *',
+'name' => 'dummy'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg'
+ }
+]
+ },
+ {
+'return_type' => 'const char *',
+'name' => 'ap_mpm_set_max_requests',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'cmd'
+ },
+ {
+'type' => 'void *',
+'name' => 'dummy'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg'
+ }
+]
+ },
+ {
+'return_type' => 'const char *',
+'name' => 'ap_mpm_set_pidfile',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'cmd'
+ },
+ {
+'type' => 'void *',
+'name' => 'dummy'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg'
+ }
+]
+ },
+ {
+'return_type' => 'const char *',
+'name' => 'ap_mpm_set_scoreboard',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'cmd'
+ },
+ {
+'type' => 'void *',
+'name' => 'dummy'
+ },
+ {
+'type' => 'const char *',
+'name' => 'arg'
+ }
+]
+ },
+ {
'return_type' => 'void',
'name' => 'ap_no2slash',
'args' => [
@@ -3979,6 +4125,24 @@
]
},
{
+'return_type' => 'const char *',
+'name' => 'ap_set_deprecated',
+'args' => [
+ {
+'type' => 'cmd_parms *',
+'name' => 'cmd'
+ },
+ {
+'type' => 'void *',
+'name' => 'struct_ptr'
+ },
+
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/07/31 19:04:47
Modified:xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.11 +2 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ConstantsTable.pm 2001/06/28 17:32:47 1.10
+++ ConstantsTable.pm 2001/08/01 02:04:46 1.11
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Thu Jun 28 10:20:58 2001
+# ! Tue Jul 31 19:02:56 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -290,6 +290,7 @@
'APR_EINIT',
'APR_ENOTIMPL',
'APR_EMISMATCH',
+ 'APR_EBUSY',
'APR_EACCES',
'APR_EEXIST',
'APR_ENAMETOOLONG',
1.13 +281 -68 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionTable.pm 2001/07/13 16:35:58 1.12
+++ FunctionTable.pm 2001/08/01 02:04:46 1.13
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Fri Jul 13 09:16:00 2001
+# ! Tue Jul 31 19:03:04 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -955,7 +955,7 @@
'name' => 'buffer'
},
{
-'type' => 'int',
+'type' => 'apr_size_t',
'name' => 'bufsiz'
}
]
@@ -1598,6 +1598,11 @@
},
{
'return_type' => 'apr_array_header_t *',
+'name' => 'ap_hook_get_pre_mpm',
+'args' => []
+ },
+ {
+'return_type' => 'apr_array_header_t *',
'name' => 'ap_hook_get_process_connection',
'args' => []
},
@@ -1882,6 +1887,28 @@
},
{
'return_type' => 'void',
+'name' => 'ap_hook_pre_mpm',
+'args' => [
+ {
+'type' => 'ap_HOOK_pre_mpm_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_process_connection',
'args' => [
{
@@ -2590,6 +2617,64 @@
},
{
'return_type' => 'apr_status_t',
+'name' => 'ap_mpm_pod_check',
+'args' => [
+ {
+'type' => 'ap_pod_t *',
+'name' => 'pod'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'ap_mpm_pod_close',
+'args' => [
+ {
+'type' => 'ap_pod_t *',
+'name' => 'pod'
+ }
+]
+ },
+ {
+'return_type' => 'void',
+'name' => 'ap_mpm_pod_killpg',
+'args' => [
+ {
+'type' => 'ap_pod_t *',
+'name' => 'pod'
+ },
+ {
+'type' => 'int',
+'name' => 'num'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'ap_mpm_pod_open',
+'args' => [
+ {
+'type' => 'apr_pool_t *',
+'name' => 'p'
+ },
+ {
+'type' => 'ap_pod_t **',
+'name' => 'pod'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
+'name' => 'ap_mpm_pod_signal',
+'args' => [
+ {
+'type' => 'ap_pod_t *',
+'name' => 'pod'
+ }
+]
+ },
+ {
+'return_type' => 'apr_status_t',
'name' => 'ap_mpm_query',
'args' => [
{
@@ -3600,6 +3685,20 @@
]
},
{
+'return_type' => 'void',
+'name' => 'ap_run_pre_mpm',
+'args' => [
+ {
+'type' => 'apr_pool_t *',
+'name' => 'p'
+ },
+ {
+'type' => 'ap_scoreboard_e',
+'name' => 'sb_type'
+ }
+]
+ },
+ {
'return_type' => 'int',
'name' => 'ap_run_process_connection',
'args' => [
@@ -3852,20 +3951,6 @@
]
},
{
-'return_type' => 'void',
-'name' => 'ap_send_size',
-'args' => [
- {
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/04/29 21:37:32
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.13 +224 -1modperl-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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionTable.pm 2001/04/29 17:53:42 1.12
+++ FunctionTable.pm 2001/04/30 04:37:31 1.13
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sun Apr 29 10:27:28 2001
+# ! Sun Apr 29 20:13:39 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -2298,6 +2298,215 @@
'return_type' => 'void',
'args' => [
{
+'name' => 'global',
+'type' => 'modperl_global_t *'
+ },
+ {
+'name' => 'p',
+'type' => 'apr_pool_t *'
+ },
+ {
+'name' => 'data',
+'type' => 'void *'
+ },
+ {
+'name' => 'name',
+'type' => 'const char *'
+ }
+],
+'name' => 'modperl_global_init'
+ },
+ {
+'return_type' => 'void',
+'args' => [
+ {
+'name' => 'global',
+'type' => 'modperl_global_t *'
+ }
+],
+'name' => 'modperl_global_lock'
+ },
+ {
+'return_type' => 'void',
+'args' => [
+ {
+'name' => 'global',
+'type' => 'modperl_global_t *'
+ }
+],
+'name' => 'modperl_global_unlock'
+ },
+ {
+'return_type' => 'void *',
+'args' => [
+ {
+'name' => 'global',
+'type' => 'modperl_global_t *'
+ }
+],
+'name' => 'modperl_global_get'
+ },
+ {
+'return_type' => 'void',
+'args' => [
+ {
+'name' => 'global',
+'type' => 'modperl_global_t *'
+ },
+ {
+'name' => 'data',
+'type' => 'void *'
+ }
+],
+'name' => 'modperl_global_set'
+ },
+ {
+'return_type' => 'void',
+'args' => [
+ {
+'name' => 'p',
+'type' => 'apr_pool_t *'
+ },
+ {
+'name' => 'pconf',
+'type' => 'apr_pool_t *'
+ }
+],
+'name' => 'modperl_global_init_pconf'
+ },
+ {
+'return_type' => 'void',
+'args' => [],
+'name' => 'modperl_global_lock_pconf'
+ },
+ {
+'return_type' => 'void',
+'args' => [],
+'name' => 'modperl_global_unlock_pconf'
+ },
+ {
+'return_type' => 'apr_pool_t *',
+'args' => [],
+'name' => 'modperl_global_get_pconf'
+ },
+ {
+'return_type' => 'void',
+'args' => [
+ {
+'name' => 'arg0',
+'type' => 'void *'
+ }
+],
+'name' => 'modperl_global_set_pconf'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
+'name' => 'p',
+'type' => 'apr_pool_t *'
+ },
+ {
+'name' => 'key',
+'type' => 'modperl_tls_t **'
+ }
+],
+'name' => 'modperl_tls_create'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
+'name' => 'key',
+'type' => 'modperl_tls_t *'
+ },
+ {
+'name' => 'data',
+'type' => 'void **'
+ }
+],
+'name' => 'modperl_tls_get'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
+'name' => 'key',
+'type' => 'modperl_tls_t *'
+ },
+ {
+'name' => 'data',
+'type' => 'void *'
+ }
+],
+'name' => 'modperl_tls_set'
+ },
+ {
+'return_type' => 'void',
+'args' => [
+ {
+'name' => 'p',
+'type' => 'apr_pool_t *'
+ },
+ {
+'name' => 'key',
+'type' => 'modperl_tls_t *'
+ },
+ {
+'name' => 'data',
+'type' => 'void *'
+ }
+],
+'name' => 'modperl_tls_reset_cleanup'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
+'name' => 'p',
+'type' => 'apr_pool_t *'
+ }
+],
+'name' => 'modperl_tls_create_request_rec'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
+'name' => 'data',
+'type' => 'request_rec * *'
+ }
+],
+'name' => 'modperl_tls_get_request_rec'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
+'name' => 'data',
+'type' => 'void *'
+ }
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/04/29 10:53:42
Modified:t/response/TestAPI uri.pm
xs/Apache/URI Apache__URI.h
xs/maps apache_functions.map apache_structures.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
special case Apache::URI->port
Revision ChangesPath
1.3 +14 -3 modperl-2.0/t/response/TestAPI/uri.pm
Index: uri.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/uri.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uri.pm2001/04/28 22:42:06 1.2
+++ uri.pm2001/04/29 17:53:41 1.3
@@ -12,7 +12,7 @@
sub handler {
my $r = shift;
-plan $r, tests => 12;
+plan $r, tests => 14;
$r->args('query');
@@ -50,16 +50,27 @@
ok $newr->args eq 'query';
-ok $newr->parsed_uri->path eq $path;
+my $puri = $newr->parsed_uri;
-ok $newr->parsed_uri->query eq 'query';
+ok $puri->path eq $path;
+ok $puri->query eq 'query';
+
my @c = qw(one two three);
$url_string = join '%20', @c;
Apache::unescape_url($url_string);
ok $url_string eq "@c";
+
+my $port = 6767;
+$puri->port($port);
+$puri->scheme('ftp');
+$puri->hostname('perl.apache.org');
+
+ok $puri->port == $port;
+
+ok $puri->unparse eq "ftp://perl.apache.org:$port$path?query";;
Apache::OK;
}
1.2 +17 -0 modperl-2.0/xs/Apache/URI/Apache__URI.h
Index: Apache__URI.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/URI/Apache__URI.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Apache__URI.h 2001/04/28 22:35:22 1.1
+++ Apache__URI.h 2001/04/29 17:53:41 1.2
@@ -74,3 +74,20 @@
return status;
}
+
+static MP_INLINE
+char *mpxs_Apache__URI_port(uri_components *uri, SV *portsv)
+{
+dTHX; /*XXX*/
+char *port_str = uri->port_str;
+
+if (portsv) {
+STRLEN len;
+char *port = SvPV(portsv, len);
+uri->port_str = apr_pstrndup(((modperl_uri_t *)uri)->pool,
+ port, len);
+uri->port = (int)SvIV(portsv);
+}
+
+return port_str;
+}
1.16 +2 -0 modperl-2.0/xs/maps/apache_functions.map
Index: apache_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- apache_functions.map 2001/04/28 22:35:23 1.15
+++ apache_functions.map 2001/04/29 17:53:42 1.16
@@ -250,6 +250,8 @@
SV *:classname, SV *:p, uri=NULL | parse
ap_unparse_uri_components | mpxs_ | \
uptr, flags=UNP_OMITPASSWORD | unparse
+ #special case to set both uri->port and uri->port_str
+ mpxs_Apache__URI_port | | uri, portsv=Nullsv
PACKAGE=Apache::RequestRec
mpxs_Apache__RequestRec_parsed_uri
1.6 +2 -2 modperl-2.0/xs/maps/apache_structures.map
Index: apache_structures.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_structures.map,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apache_structures.map 2001/04/18 16:52:49 1.5
+++ apache_structures.map 2001/04/29 17:53:42 1.6
@@ -223,12 +223,12 @@
user
password
hostname
- port_str
+- port_str
path
query
fragment
hostent
- port
+~ port
is_initialized
dns_looked_up
dns_resolved
1.12 +15 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionTable.pm 2001/04/28 22:42:56 1.11
+++ FunctionTable.pm 2001/04/29 17:53:42 1.12
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sat Apr 28 15:36:08 2001
+# ! Sun Apr 29 10:27:28 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -2979,6 +2979,20 @@
}
],
'name' => 'mpxs_ap_unescape_url'
+ },
+ {
+'return_type' => 'char *',
+'args' => [
+ {
+'name' => 'uri',
+'type' => 'uri_components *'
+ },
+ {
+'name' => 'portsv',
+
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/04/28 15:42:56
Modified:xs/Apache/RequestUtil Apache__RequestUtil.h
xs/maps modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
allow optional APR::Pool parameter to allocate Apache::RequestRec->new
Revision ChangesPath
1.4 +7 -2 modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h
Index: Apache__RequestUtil.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestUtil/Apache__RequestUtil.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Apache__RequestUtil.h 2001/03/17 06:03:37 1.3
+++ Apache__RequestUtil.h 2001/04/28 22:42:55 1.4
@@ -43,13 +43,18 @@
static MP_INLINE
request_rec *mpxs_Apache__RequestRec_new(SV *classname,
- conn_rec *c)
+ conn_rec *c,
+ apr_pool_t *base_pool)
{
apr_pool_t *p;
request_rec *r;
server_rec *s = c->base_server;
-apr_pool_create(&p, c->pool);
+if (!base_pool) {
+base_pool = c->pool;
+}
+
+apr_pool_create(&p, base_pool);
r = apr_pcalloc(p, sizeof(request_rec));
r->pool = p;
1.8 +1 -1 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- modperl_functions.map 2001/04/28 19:10:44 1.7
+++ modperl_functions.map 2001/04/28 22:42:56 1.8
@@ -9,7 +9,7 @@
mpxs_Apache__RequestRec_location_merge
mpxs_Apache__RequestRec_set_basic_credentials
PACKAGE=Apache::RequestRec
- mpxs_Apache__RequestRec_new
+ mpxs_Apache__RequestRec_new | | classname, c, base_pool=NULL
MODULE=Apache::RequestIO PACKAGE=Apache::RequestRec
SV *:DEFINE_TIEHANDLE | | SV *:stashsv, SV *:sv=Nullsv
1.11 +19 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionTable.pm 2001/04/28 22:34:18 1.10
+++ FunctionTable.pm 2001/04/28 22:42:56 1.11
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sat Apr 28 15:05:42 2001
+# ! Sat Apr 28 15:36:08 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -2967,6 +2967,20 @@
'name' => 'mpxs_ap_parse_uri_components'
},
{
+'return_type' => 'int',
+'args' => [
+ {
+'name' => 'my_perl',
+'type' => 'PerlInterpreter *'
+ },
+ {
+'name' => 'url',
+'type' => 'SV *'
+ }
+],
+'name' => 'mpxs_ap_unescape_url'
+ },
+ {
'return_type' => 'SV *',
'args' => [
{
@@ -3040,6 +3054,10 @@
{
'name' => 'c',
'type' => 'conn_rec *'
+ },
+ {
+'name' => 'base_pool',
+'type' => 'apr_pool_t *'
}
],
'name' => 'mpxs_Apache__RequestRec_new'
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/04/28 15:34:20
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.10 +75 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionTable.pm 2001/04/28 19:10:45 1.9
+++ FunctionTable.pm 2001/04/28 22:34:18 1.10
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sat Apr 28 11:56:55 2001
+# ! Sat Apr 28 15:05:42 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -315,6 +315,20 @@
'name' => 'modperl_ptr2obj'
},
{
+'return_type' => 'apr_pool_t *',
+'args' => [
+ {
+'name' => 'my_perl',
+'type' => 'PerlInterpreter *'
+ },
+ {
+'name' => 'obj',
+'type' => 'SV *'
+ }
+],
+'name' => 'modperl_sv2pool'
+ },
+ {
'return_type' => 'char *',
'args' => [
{
@@ -2891,6 +2905,66 @@
}
],
'name' => 'mpxs_apr_base64_decode'
+ },
+ {
+'return_type' => 'modperl_uri_t *',
+'args' => [
+ {
+'name' => 'p',
+'type' => 'apr_pool_t *'
+ }
+],
+'name' => 'mpxs_uri_new'
+ },
+ {
+'return_type' => 'uri_components *',
+'args' => [
+ {
+'name' => 'r',
+'type' => 'request_rec *'
+ }
+],
+'name' => 'mpxs_Apache__RequestRec_parsed_uri'
+ },
+ {
+'return_type' => 'char *',
+'args' => [
+ {
+'name' => 'my_perl',
+'type' => 'PerlInterpreter *'
+ },
+ {
+'name' => 'uptr',
+'type' => 'uri_components *'
+ },
+ {
+'name' => 'flags',
+'type' => 'unsigned'
+ }
+],
+'name' => 'mpxs_ap_unparse_uri_components'
+ },
+ {
+'return_type' => 'uri_components *',
+'args' => [
+ {
+'name' => 'my_perl',
+'type' => 'PerlInterpreter *'
+ },
+ {
+'name' => 'classname',
+'type' => 'SV *'
+ },
+ {
+'name' => 'obj',
+'type' => 'SV *'
+ },
+ {
+'name' => 'uri_string',
+'type' => 'const char *'
+ }
+],
+'name' => 'mpxs_ap_parse_uri_components'
},
{
'return_type' => 'SV *',
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/04/28 12:10:46
Modified:xs/Apache/RequestIO Apache__RequestIO.h
xs/maps modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Added: t/apisendfile.t
t/response/TestAPI sendfile.pm
Log:
add $r->sendfile method and tests
Revision ChangesPath
1.1 modperl-2.0/t/api/sendfile.t
Index: sendfile.t
===
use strict;
use warnings FATAL => 'all';
use Test;
use Apache::TestConfig ();
plan tests => 3;
my $config = Apache::TestConfig->thaw;
my $url = '/TestAPI::sendfile';
my $data = $config->http_raw_get($url);
ok $data;
my $module = 'response/TestAPI/sendfile.pm';
ok length($data) == -s $module;
$data = $config->http_raw_get("$url?noexist.txt");
ok $data =~ /Not Found/;
1.1 modperl-2.0/t/response/TestAPI/sendfile.pm
Index: sendfile.pm
===
package TestAPI::sendfile;
use strict;
use warnings FATAL => 'all';
sub handler {
my $r = shift;
my $file = $r->args || __FILE__;
my $status = $r->sendfile($file);
return $status == APR::SUCCESS ? Apache::OK : Apache::NOT_FOUND;
}
1;
1.6 +30 -0 modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h
Index: Apache__RequestIO.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Apache__RequestIO.h 2001/04/20 03:07:54 1.5
+++ Apache__RequestIO.h 2001/04/28 19:10:44 1.6
@@ -72,3 +72,33 @@
return nrd;
}
+
+static MP_INLINE
+apr_status_t mpxs_Apache__RequestRec_sendfile(request_rec *r,
+ const char *filename,
+ apr_off_t offset,
+ apr_size_t len)
+{
+apr_size_t nbytes;
+apr_status_t status;
+apr_file_t *fp;
+
+status = apr_file_open(&fp, filename, APR_READ|APR_BINARY,
+ APR_OS_DEFAULT, r->pool);
+
+if (status != APR_SUCCESS) {
+return status;
+}
+
+if (!len) {
+apr_finfo_t finfo;
+apr_file_info_get(&finfo, APR_FINFO_NORM, fp);
+len = finfo.size;
+}
+
+status = ap_send_fd(fp, r, offset, len, &nbytes);
+
+/* apr_file_close(fp); */ /* do not do this */
+
+return status;
+}
1.7 +1 -0 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- modperl_functions.map 2001/04/20 03:07:55 1.6
+++ modperl_functions.map 2001/04/28 19:10:44 1.7
@@ -14,6 +14,7 @@
MODULE=Apache::RequestIO PACKAGE=Apache::RequestRec
SV *:DEFINE_TIEHANDLE | | SV *:stashsv, SV *:sv=Nullsv
apr_size_t:DEFINE_PRINT | | ...
+ mpxs_Apache__RequestRec_sendfile | | r, filename=r->filename, offset=0, len=0
MODULE=Apache::ServerUtil PACKAGE=guess
mpxs_Apache__Server_push_handlers
1.9 +23 -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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionTable.pm 2001/04/27 21:07:09 1.8
+++ FunctionTable.pm 2001/04/28 19:10:45 1.9
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Fri Apr 27 14:00:37 2001
+# ! Sat Apr 28 11:56:55 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -3179,6 +3179,28 @@
}
],
'name' => 'mpxs_ap_get_client_block'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
+'name' => 'r',
+'type' => 'request_rec *'
+ },
+ {
+'name' => 'filename',
+'type' => 'const char *'
+ },
+ {
+'name' => 'offset',
+'type' => 'apr_off_t'
+ },
+ {
+'name' => 'len',
+'type' => 'apr_size_t'
+ }
+],
+'name' => 'mpxs_Apache__RequestRec_sendfile'
}
];
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/04/27 14:07:10
Modified:xs/tables/current/Apache FunctionTable.pm StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.5 +40 -16modperl-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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionTable.pm 2001/04/24 02:25:45 1.4
+++ FunctionTable.pm 2001/04/27 21:07:04 1.5
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Mon Apr 23 18:32:09 2001
+# ! Fri Apr 27 14:00:21 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -60,6 +60,40 @@
'name' => 'apr_pool_create'
},
{
+'return_type' => 'void',
+'args' => [
+ {
+'name' => 'abortfunc',
+'type' => 'apr_abortfunc_t'
+ },
+ {
+'name' => 'pool',
+'type' => 'apr_pool_t *'
+ }
+],
+'name' => 'apr_pool_set_abort'
+ },
+ {
+'return_type' => 'apr_abortfunc_t',
+'args' => [
+ {
+'name' => 'pool',
+'type' => 'apr_pool_t *'
+ }
+],
+'name' => 'apr_pool_get_abort'
+ },
+ {
+'return_type' => 'apr_pool_t *',
+'args' => [
+ {
+'name' => 'pool',
+'type' => 'apr_pool_t *'
+ }
+],
+'name' => 'apr_pool_get_parent'
+ },
+ {
'return_type' => 'apr_status_t',
'args' => [
{
@@ -139,6 +173,10 @@
{
'name' => 'p',
'type' => 'apr_pool_t *'
+ },
+ {
+'name' => 'recurse',
+'type' => 'int'
}
],
'name' => 'apr_pool_num_bytes'
@@ -1340,20 +1378,6 @@
'return_type' => 'apr_status_t',
'args' => [
{
-'name' => 'arg0',
-'type' => 'int (*apr_abort)(int retcode)'
- },
- {
-'name' => 'cont',
-'type' => 'apr_pool_t *'
- }
-],
-'name' => 'apr_set_abort'
- },
- {
-'return_type' => 'apr_status_t',
-'args' => [
- {
'name' => 'os',
'type' => 'apr_getopt_t **'
},
@@ -3493,7 +3517,7 @@
},
{
'name' => 'thedso',
-'type' => 'apr_os_dso_handle_t *'
+'type' => 'apr_os_dso_handle_t'
},
{
'name' => 'pool',
1.5 +7 -52 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StructureTable.pm 2001/04/24 02:25:45 1.4
+++ StructureTable.pm 2001/04/27 21:07:06 1.5
@@ -2,58 +2,13 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Mon Apr 23 18:32:10 2001
+# ! Fri Apr 27 14:00:23 2001
# ! do NOT edit, any changes will be lost !
# !!
$Apache::StructureTable = [
{
-'elts' => [
- {
-'name' => 'first',
-'type' => 'union block_hdr *'
- },
- {
-'name' => 'last',
-'type' => 'union block_hdr *'
- },
- {
-'name' => 'cleanups',
-'type' => 'cleanup *'
- },
- {
-'name' => 'subprocesses',
-'type' => 'process_chain *'
- },
- {
-'name' => 'sub_pools',
-'type' => 'apr_pool_t *'
- },
- {
-'name' => 'sub_next',
-'type' => 'apr_pool_t *'
- },
- {
-'name' => 'sub_prev',
-'type' => 'apr_pool_t *'
- },
- {
-'name' => 'parent',
-'type' => 'apr_pool_t *'
- },
- {
-'name' => 'free_first_avail',
-'type' => 'char *'
- },
- {
-'name' => 'apr_abort',
-'type' => 'int(*)(int retcode)'
- },
- {
-'name' => 'prog_data',
-'type' => 'apr_hash_t *'
- }
-],
+'elts' => [],
'type' => 'apr_pool_t'
},
{
@@ -69,7 +24,7 @@
'elts' => [
{
'name' => 'link',
-'type' => '_ANON 63'
+'type' => '_ANON 62'
},
{
'name' => 'type',
@@ -1108,10 +1063,6 @@
'type' => 'signed int'
},
{
-'name
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/04/19 20:03:41
Modified:xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.7 +19 -29modperl-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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionTable.pm 2001/04/20 00:38:11 1.6
+++ FunctionTable.pm 2001/04/20 03:03:40 1.7
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Thu Apr 19 17:22:38 2001
+# ! Thu Apr 19 19:14:01 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -286,6 +286,24 @@
'type' => 'PerlInterpreter *'
},
{
+'name' => 'stashsv',
+'type' => 'SV *'
+ },
+ {
+'name' => 'obj',
+'type' => 'SV *'
+ }
+],
+'name' => 'modperl_newSVsv_obj'
+ },
+ {
+'return_type' => 'SV *',
+'args' => [
+ {
+'name' => 'my_perl',
+'type' => 'PerlInterpreter *'
+ },
+ {
'name' => 'classname',
'type' => 'char *'
},
@@ -1923,20 +1941,6 @@
'name' => 'modperl_run_filter'
},
{
-'return_type' => 'modperl_filter_t *',
-'args' => [
- {
-'name' => 'my_perl',
-'type' => 'PerlInterpreter *'
- },
- {
-'name' => 'sv',
-'type' => 'SV *'
- }
-],
-'name' => 'modperl_sv2filter'
- },
- {
'return_type' => 'apr_status_t',
'args' => [
{
@@ -3133,20 +3137,6 @@
}
],
'name' => 'mpxs_ap_get_client_block'
- },
- {
-'return_type' => 'request_rec *',
-'args' => [
- {
-'name' => 'classname',
-'type' => 'SV *'
- },
- {
-'name' => 'r',
-'type' => 'request_rec *'
- }
-],
-'name' => 'mpxs_Apache__RequestRec_TIEHANDLE'
}
];
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/04/19 17:38:11
Modified:src/modules/perl modperl_filter.c modperl_filter.h
t/filter/TestFilter api.pm buckets.pm input_body.pm
input_msg.pm
xs/Apache/Filter Apache__Filter.h
xs/maps modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
get rid of Apache::{Input,Output}Filter subclasses
first argument to filter handlers is now a ap_filter_t, just like C handlers
difference is the Apache::Filter object has a modperl_filter_t attached to it,
for access to the read/print stream-like interface
Revision ChangesPath
1.15 +15 -6 modperl-2.0/src/modules/perl/modperl_filter.c
Index: modperl_filter.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- modperl_filter.c 2001/04/19 21:26:35 1.14
+++ modperl_filter.c 2001/04/20 00:38:08 1.15
@@ -51,11 +51,6 @@
/* generic filter routines */
-static char *filter_classes[] = {
-"Apache::InputFilter",
-"Apache::OutputFilter",
-};
-
modperl_filter_t *modperl_filter_new(ap_filter_t *f,
apr_bucket_brigade *bb,
modperl_filter_mode_e mode)
@@ -79,6 +74,18 @@
return filter;
}
+static void modperl_filter_mg_set(pTHX_ SV *obj, modperl_filter_t *filter)
+{
+sv_magic(SvRV(obj), obj, '~', NULL, 0);
+SvMAGIC(SvRV(obj))->mg_ptr = (char *)filter;
+}
+
+modperl_filter_t *modperl_filter_mg_get(pTHX_ SV *obj)
+{
+MAGIC *mg = mg_find(SvRV(obj), '~');
+return mg ? (modperl_filter_t *)mg->mg_ptr : NULL;
+}
+
int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode)
{
AV *args = Nullav;
@@ -94,9 +101,11 @@
MP_dINTERP_SELECT(r, c, s);
modperl_handler_make_args(aTHX_ &args,
- filter_classes[filter->mode], filter,
+ "Apache::Filter", filter->f,
"APR::Brigade", filter->bb,
NULL);
+
+modperl_filter_mg_set(aTHX_ AvARRAY(args)[0], filter);
if (filter->mode == MP_INPUT_FILTER_MODE) {
av_push(args, newSViv(mode));
1.4 +2 -0 modperl-2.0/src/modules/perl/modperl_filter.h
Index: modperl_filter.h
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modperl_filter.h 2001/04/19 17:44:17 1.3
+++ modperl_filter.h 2001/04/20 00:38:08 1.4
@@ -23,6 +23,8 @@
apr_bucket_brigade *bb,
modperl_filter_mode_e mode);
+modperl_filter_t *modperl_filter_mg_get(pTHX_ SV *obj);
+
int modperl_run_filter(modperl_filter_t *filter, ap_input_mode_t mode);
MP_INLINE modperl_filter_t *modperl_sv2filter(pTHX_ SV *sv);
1.2 +4 -6 modperl-2.0/t/filter/TestFilter/api.pm
Index: api.pm
===
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/api.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- api.pm2001/04/13 07:17:06 1.1
+++ api.pm2001/04/20 00:38:09 1.2
@@ -14,7 +14,7 @@
my $filter = shift;
{
-package Apache::OutputFilter;
+package Apache::Filter;
#XXX: make part of standard api?
unless (defined &PRINT) {
*PRINT = \&print;
@@ -40,17 +40,15 @@
ok $buffer eq $response_data;
-my $f = $filter->f;
+ok $filter->isa('Apache::Filter');
-ok $f->isa('Apache::Filter');
+my $frec = $filter->frec;
-my $frec = $f->frec;
-
ok $frec->isa('Apache::FilterRec');
ok $frec->name;
-my $r = $f->r;
+my $r = $filter->r;
ok $r->isa('Apache::RequestRec');
1.3 +2 -2 modperl-2.0/t/filter/TestFilter/buckets.pm
Index: buckets.pm
===
RCS file: /home/cvs/modperl-2.0/t/filter/TestFilter/buckets.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buckets.pm2001/04/19 17:31:06 1.2
+++ buckets.pm2001/04/20 00:38:09 1.3
@@ -26,7 +26,7 @@
my $tests = Apache::TestToString->finish;
-my $brigade = APR::Brigade->new($filter->f->r->pool);
+my $brigade = APR::Brigade->new($filter->r->pool);
my $bucket = APR::Bucket->new($tests);
$brigade->insert_tail($bucke
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/04/19 14:26:47
Modified:src/modules/perl mod_perl.h modperl_filter.c modperl_mgv.c
modperl_types.h
t/conf modperl_extra.pl
xs modperl_xs_util.h
xs/Apache/Filter Apache__Filter.h
xs/maps modperl_types.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
implement InputMessageFilters
Revision ChangesPath
1.29 +5 -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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mod_perl.h2001/03/16 05:52:29 1.28
+++ mod_perl.h2001/04/19 21:26:34 1.29
@@ -41,4 +41,9 @@
void modperl_response_finish(request_rec *r);
int modperl_response_handler(request_rec *r);
+/* betting on Perl*Handlers not using CvXSUBANY
+ * mod_perl reuses this field for handler attributes
+ */
+#define MP_CODE_ATTRS(cv) (CvXSUBANY((CV*)cv).any_i32)
+
#endif /* MOD_PERL_H */
1.14 +10 -2 modperl-2.0/src/modules/perl/modperl_filter.c
Index: modperl_filter.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- modperl_filter.c 2001/04/19 17:58:25 1.13
+++ modperl_filter.c 2001/04/19 21:26:35 1.14
@@ -397,8 +397,16 @@
int i;
for (i=0; inelts; i++) {
-modperl_filter_ctx_t *ctx =
-(modperl_filter_ctx_t *)apr_pcalloc(c->pool, sizeof(*ctx));
+modperl_filter_ctx_t *ctx;
+
+if (!(handlers[i]->attrs & MP_INPUT_FILTER_MESSAGE)) {
+MP_TRACE_f(MP_FUNC,
+ "%s is not an InputFilterMessage handler\n",
+ handlers[i]->name);
+continue;
+}
+
+ctx = (modperl_filter_ctx_t *)apr_pcalloc(c->pool, sizeof(*ctx));
ctx->handler = handlers[i];
ap_add_input_filter(MODPERL_INPUT_FILTER_NAME,
(void*)ctx, NULL, c);
1.13 +2 -0 modperl-2.0/src/modules/perl/modperl_mgv.c
Index: modperl_mgv.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_mgv.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- modperl_mgv.c 2001/04/02 07:37:12 1.12
+++ modperl_mgv.c 2001/04/19 21:26:35 1.13
@@ -277,6 +277,7 @@
}
else {
if ((cv = get_cv(name, FALSE))) {
+handler->attrs = (U32)MP_CODE_ATTRS(cv);
handler->mgv_cv =
modperl_mgv_compile(aTHX_ p, HvNAME(GvSTASH(CvGV(cv;
modperl_mgv_append(aTHX_ p, handler->mgv_cv, GvNAME(CvGV(cv)));
@@ -331,6 +332,7 @@
}
}
+handler->attrs = (U32)MP_CODE_ATTRS(cv);
/* note: this is the real function after @ISA lookup */
handler->mgv_cv = modperl_mgv_compile(aTHX_ p, HvNAME(GvSTASH(gv)));
modperl_mgv_append(aTHX_ p, handler->mgv_cv, handler_name);
1.36 +1 -0 modperl-2.0/src/modules/perl/modperl_types.h
Index: modperl_types.h
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_types.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- modperl_types.h 2001/04/13 07:17:06 1.35
+++ modperl_types.h 2001/04/19 21:26:35 1.36
@@ -155,6 +155,7 @@
modperl_mgv_t *mgv_cv;
const char *name; /* orignal name from .conf if any */
U8 flags;
+U32 attrs;
} modperl_handler_t;
#define MP_HANDLER_TYPE_CHAR 1
1.5 +2 -0 modperl-2.0/t/conf/modperl_extra.pl
Index: modperl_extra.pl
===
RCS file: /home/cvs/modperl-2.0/t/conf/modperl_extra.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- modperl_extra.pl 2001/04/19 20:20:37 1.4
+++ modperl_extra.pl 2001/04/19 21:26:38 1.5
@@ -7,6 +7,8 @@
use Apache::Const -compile => ':common';
use APR::Const -compile => ':common';
+eval { require TestFilter::input_msg };
+
use APR::Table ();
sub ModPerl::Test::read_post {
1.6 +0 -2 modperl-2.0/xs/modperl_xs_util.h
Index: modperl_xs_util.h
===
RCS file: /home/cvs/modperl-2.0/xs/modperl_xs_util.h,v
retrieving revision 1.5
retrieving revision 1.6
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/04/19 10:45:31
Modified:xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync
Revision ChangesPath
1.6 +5 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConstantsTable.pm 2001/04/18 05:28:18 1.5
+++ ConstantsTable.pm 2001/04/19 17:45:21 1.6
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Tue Apr 17 22:15:55 2001
+# ! Thu Apr 19 10:01:37 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -148,6 +148,10 @@
]
},
'APR' => {
+'read_type' => [
+ 'APR_BLOCK_READ',
+ 'APR_NONBLOCK_READ'
+],
'fileperms' => [
'APR_UREAD',
'APR_UWRITE',
1.3 +125 -93 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionTable.pm 2001/04/18 04:42:50 1.2
+++ FunctionTable.pm 2001/04/19 17:45:22 1.3
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Tue Apr 17 21:37:29 2001
+# ! Thu Apr 19 10:01:42 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -3488,6 +3488,38 @@
'return_type' => 'apr_status_t',
'args' => [
{
+'name' => 'dso',
+'type' => 'apr_dso_handle_t **'
+ },
+ {
+'name' => 'thedso',
+'type' => 'apr_os_dso_handle_t *'
+ },
+ {
+'name' => 'pool',
+'type' => 'apr_pool_t *'
+ }
+],
+'name' => 'apr_os_dso_handle_put'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
+'name' => 'dso',
+'type' => 'apr_os_dso_handle_t *'
+ },
+ {
+'name' => 'aprdso',
+'type' => 'apr_dso_handle_t *'
+ }
+],
+'name' => 'apr_os_dso_handle_get'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
'name' => 'm',
'type' => 'apr_shmem_t **'
},
@@ -9506,98 +9538,6 @@
'name' => 'ap_matches_request_vhost'
},
{
-'return_type' => 'int',
-'args' => [],
-'name' => 'ap_exists_scoreboard_image'
- },
- {
-'return_type' => 'void',
-'args' => [
- {
-'name' => 'p',
-'type' => 'apr_pool_t *'
- },
- {
-'name' => 't',
-'type' => 'ap_scoreboard_e'
- }
-],
-'name' => 'ap_create_scoreboard'
- },
- {
-'return_type' => 'void',
-'args' => [
- {
-'name' => 'child_num',
-'type' => 'int'
- },
- {
-'name' => 'thread_num',
-'type' => 'int'
- },
- {
-'name' => 'r',
-'type' => 'request_rec *'
- }
-],
-'name' => 'ap_increment_counts'
- },
- {
-'return_type' => 'apr_status_t',
-'args' => [
- {
-'name' => 'd',
-'type' => 'void *'
- }
-],
-'name' => 'ap_cleanup_scoreboard'
- },
- {
-'return_type' => 'void',
-'args' => [],
-'name' => 'ap_sync_scoreboard_image'
- },
- {
-'return_type' => 'int',
-'args' => [
- {
-'name' => 'child_num',
-'type' => 'int'
- },
- {
-'name' => 'thread_num',
-'type' => 'int'
- },
- {
-'name' => 'status',
-'type' => 'int'
- },
- {
-'name' => 'r',
-'type' => 'request_rec *'
- }
-],
-'name' => 'ap_update_child_status'
- },
- {
-'return_type' => 'void',
-'args' => [
- {
-'name' => 'child_num',
-'type' => 'int'
- },
- {
-'name' => 'thread_num',
-'type' => 'int'
- },
- {
-'name' => 'status',
-'type' => 'int'
- }
-],
-'name' => 'ap_time_process_request'
- },
- {
'return_type' => 'void',
'args' => [
{
@@ -9714,6 +9654,98 @@
}
],
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/04/17 21:42:54
Modified:xs/tables/current/Apache ConstantsTable.pm FunctionTable.pm
StructureTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync generated tables
Revision ChangesPath
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ConstantsTable.pm 2001/04/12 00:59:21 1.3
+++ ConstantsTable.pm 2001/04/18 04:42:50 1.4
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Wed Apr 11 17:57:08 2001
+# ! Mon Apr 16 18:17:25 2001
# ! do NOT edit, any changes will be lost !
# !!
1.2 +117 -300 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionTable.pm 2001/03/26 16:05:47 1.1
+++ FunctionTable.pm 2001/04/18 04:42:50 1.2
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by Apache::ParseSource/0.02
-# ! Mon Mar 26 07:44:02 2001
+# ! Tue Apr 17 21:37:29 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -436,6 +436,24 @@
{
'name' => 'input',
'type' => 'apr_time_t'
+ },
+ {
+'name' => 'offs',
+'type' => 'apr_int32_t'
+ }
+],
+'name' => 'apr_explode_time'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
+'name' => 'result',
+'type' => 'apr_exploded_time_t *'
+ },
+ {
+'name' => 'input',
+'type' => 'apr_time_t'
}
],
'name' => 'apr_explode_gmt'
@@ -636,6 +654,24 @@
'return_type' => 'apr_status_t',
'args' => [
{
+'name' => 'rootpath',
+'type' => 'const char **'
+ },
+ {
+'name' => 'filepath',
+'type' => 'const char **'
+ },
+ {
+'name' => 'p',
+'type' => 'apr_pool_t *'
+ }
+],
+'name' => 'apr_filepath_root'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
'name' => 'newpath',
'type' => 'char **'
},
@@ -662,6 +698,34 @@
'return_type' => 'apr_status_t',
'args' => [
{
+'name' => 'path',
+'type' => 'char **'
+ },
+ {
+'name' => 'p',
+'type' => 'apr_pool_t *'
+ }
+],
+'name' => 'apr_filepath_get'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
+'name' => 'path',
+'type' => 'const char *'
+ },
+ {
+'name' => 'p',
+'type' => 'apr_pool_t *'
+ }
+],
+'name' => 'apr_filepath_set'
+ },
+ {
+'return_type' => 'apr_status_t',
+'args' => [
+ {
'name' => 'new_file',
'type' => 'apr_file_t **'
},
@@ -740,16 +804,6 @@
'return_type' => 'apr_status_t',
'args' => [
{
-'name' => 'fptr',
-'type' => 'apr_file_t *'
- }
-],
-'name' => 'apr_file_error'
- },
- {
-'return_type' => 'apr_status_t',
-'args' => [
- {
'name' => 'thefile',
'type' => 'apr_file_t **'
},
@@ -2600,7 +2654,7 @@
'type' => 'apr_int32_t'
}
],
-'name' => 'apr_threadattr_detach_get'
+'name' => 'apr_threadattr_detach_set'
},
{
'return_type' => 'apr_status_t',
@@ -2610,7 +2664,7 @@
'type' => 'apr_threadattr_t *'
}
],
-'name' => 'apr_threadattr_detach_set'
+'name' => 'apr_threadattr_detach_get'
},
{
'return_type' => 'apr_status_t',
@@ -3149,24 +3203,12 @@
{
'return_type' => 'apr_status_t',
'args' => [
- {
-'name' => 'td',
-'type' => 'apr_thread_t **'
- },
- {
-'name' => 'tattr',
-'type' => 'apr_threadattr_t *'
- },
{
-'name' => 'arg2',
-'type' => 'int (*signal_handler)(int signum)'
- },
- {
-'name' => 'p',
-'type' => 'apr_pool_t *'
+'name' => 'arg0',
+'
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/03/26 20:40:37
Modified:xs/Apache/RequestIO Apache__RequestIO.h
xs/tables/current/ModPerl FunctionTable.pm
Log:
fix Apache::RequestRec::TIEHANDLE
Revision ChangesPath
1.4 +4 -3 modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h
Index: Apache__RequestIO.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/RequestIO/Apache__RequestIO.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Apache__RequestIO.h 2001/03/16 05:32:35 1.3
+++ Apache__RequestIO.h 2001/03/27 04:40:36 1.4
@@ -68,8 +68,9 @@
return nrd;
}
-static MP_INLINE SV *mpxs_Apache__RequestRec_TIEHANDLE(SV *classname,
- SV *obj)
+static MP_INLINE
+request_rec *mpxs_Apache__RequestRec_TIEHANDLE(SV *classname,
+ request_rec *r)
{
-return obj;
+return r;
}
1.2 +4 -4 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FunctionTable.pm 2001/03/26 16:06:59 1.1
+++ FunctionTable.pm 2001/03/27 04:40:36 1.2
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Mon Mar 26 07:44:14 2001
+# ! Mon Mar 26 20:36:51 2001
# ! do NOT edit, any changes will be lost !
# !!
@@ -2685,15 +2685,15 @@
'name' => 'mpxs_ap_get_client_block'
},
{
-'return_type' => 'SV *',
+'return_type' => 'request_rec *',
'args' => [
{
'name' => 'classname',
'type' => 'SV *'
},
{
-'name' => 'obj',
-'type' => 'SV *'
+'name' => 'r',
+'type' => 'request_rec *'
}
],
'name' => 'mpxs_Apache__RequestRec_TIEHANDLE'
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 01/03/26 08:07:00
Added: xs/tables/current/ModPerl FunctionTable.pm
Log:
current version of ModPerl::FunctionTable (generated by C::Scan/ModPerl::ParseSource)
Revision ChangesPath
1.1 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===
package ModPerl::FunctionTable;
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
# ! Mon Mar 26 07:44:14 2001
# ! do NOT edit, any changes will be lost !
# !!
$ModPerl::FunctionTable = [
{
'return_type' => 'U32',
'args' => [
{
'name' => 'str',
'type' => 'const char *'
}
],
'name' => 'modperl_flags_lookup_dir'
},
{
'return_type' => 'U32',
'args' => [
{
'name' => 'str',
'type' => 'const char *'
}
],
'name' => 'modperl_flags_lookup_srv'
},
{
'return_type' => 'int',
'args' => [
{
'name' => 'c',
'type' => 'conn_rec *'
}
],
'name' => 'modperl_pre_connection_handler'
},
{
'return_type' => 'int',
'args' => [
{
'name' => 'c',
'type' => 'conn_rec *'
}
],
'name' => 'modperl_process_connection_handler'
},
{
'return_type' => 'void',
'args' => [
{
'name' => 'p',
'type' => 'apr_pool_t *'
},
{
'name' => 's',
'type' => 'server_rec *'
}
],
'name' => 'modperl_child_init_handler'
},
{
'return_type' => 'int',
'args' => [
{
'name' => 'r',
'type' => 'request_rec *'
}
],
'name' => 'modperl_header_parser_handler'
},
{
'return_type' => 'int',
'args' => [
{
'name' => 'r',
'type' => 'request_rec *'
}
],
'name' => 'modperl_access_handler'
},
{
'return_type' => 'int',
'args' => [
{
'name' => 'r',
'type' => 'request_rec *'
}
],
'name' => 'modperl_authen_handler'
},
{
'return_type' => 'int',
'args' => [
{
'name' => 'r',
'type' => 'request_rec *'
}
],
'name' => 'modperl_authz_handler'
},
{
'return_type' => 'int',
'args' => [
{
'name' => 'r',
'type' => 'request_rec *'
}
],
'name' => 'modperl_type_handler'
},
{
'return_type' => 'int',
'args' => [
{
'name' => 'r',
'type' => 'request_rec *'
}
],
'name' => 'modperl_fixup_handler'
},
{
'return_type' => 'int',
'args' => [
{
'name' => 'r',
'type' => 'request_rec *'
}
],
'name' => 'modperl_log_handler'
},
{
'return_type' => 'int',
'args' => [
{
'name' => 'r',
'type' => 'request_rec *'
}
],
'name' => 'modperl_post_read_request_handler'
},
{
'return_type' => 'int',
'args' => [
{
'name' => 'r',
'type' => 'request_rec *'
}
],
'name' => 'modperl_trans_handler'
},
{
'return_type' => 'void',
'args' => [
{
'name' => 'pconf',
'type' => 'apr_pool_t *'
},
{
'name' => 'plog',
'type' => 'apr_pool_t *'
},
{
'name' => 'ptemp',
'type' => 'apr_pool_t *'
},
{
'name' => 's',
'type' => 'server_rec *'
}
],
'name' => 'modperl_open_logs_handler'
},
{
'return_type' => 'void',
'args' => [
{
'name' => 'pconf',
'type' => 'apr_pool_t *'
},
{
'name' => 'plog',
'type' => 'apr_pool_t *'
},
{
'name' => 'ptemp',
'type' => 'apr_pool_t *'
},
{
'name' => 's',
'type' => 'server_rec *'
}
],
'name' => 'modperl_post_config_handler'
},
{
'return_type' => 'void',
'args' => [],
'name' => 'modperl_register_handler_hooks'
},
{
'return_type' => 'const char *',
'args' => [
{
'name' => 'idx',
'type' => 'int'
}
],
'name' => 'modperl_handler_desc_connection'
},
{
'return_type' => 'const char *',
'args' => [
{
'name' => 'idx',
'type' => 'int'
}
],
'name' => 'modperl_handler_desc_process'
},
{
'return_type' => 'const char *',
'args' =>
