cvs commit: modperl-2.0/t/response/TestModperl dir_config.pm
stas02/05/19 00:53:27
Modified:t/response/TestModperl dir_config.pm
Log:
test that sub-section overrides parent section for the same key
Revision ChangesPath
1.4 +9 -2 modperl-2.0/t/response/TestModperl/dir_config.pm
Index: dir_config.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/dir_config.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dir_config.pm 11 Apr 2002 11:08:44 - 1.3
+++ dir_config.pm 19 May 2002 07:53:27 - 1.4
-16,7 +16,7
sub handler {
my $r = shift;
-plan $r, tests = 12;
+plan $r, tests = 13;
#Apache::RequestRec::dir_config tests
-38,6 +38,13
'testing PerlAddVar ITERATE2');
}
+# sub-section overrides parent section for the same key
+{
+my $key = 'TestModperl__server_rec_Key_set_in_Base';
+ok t_cmp('SubSecValue', $r-dir_config-get($key),
+ sub-section overrides parent section for the same key);
+}
+
{
my $key = make_key('0');
-159,4 +166,4
PerlAddVar TestModperl__request_rec_Key1 2_AddValue
PerlAddVar TestModperl__request_rec_Key1 3_AddValue 4_AddValue
-PerlSetVar TestModperl__server_rec_Key_set_in_Base WhatEver
+PerlSetVar TestModperl__server_rec_Key_set_in_Base SubSecValue
cvs commit: modperl-2.0 STATUS
stas02/05/19 02:28:06 Added: .STATUS Log: start the STATUS file Revision ChangesPath 1.1 modperl-2.0/STATUS Index: STATUS === mod_perl 2.0 STATUS: -*-text-*- Last modified at [$Date: 2002/05/19 09:28:06 $] Release: 1.99_02-dev: In development. 1.99_01: Released April 06, 2002 Release Showstoppers: - * Report: Status: Available Patches: -- Needs Patch or Further Investigation: - Open Issues or Core Enhancements: - Documentation: -- Patches unlikely to be applied: --- * Report: Status:
cvs commit: modperl-2.0/t/response/TestAPI module.pm
dougm 02/05/19 12:10:45
Modified:t/response/TestAPI module.pm
Log:
fix broken test #2
Revision ChangesPath
1.7 +2 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- module.pm 13 May 2002 18:19:28 - 1.6
+++ module.pm 19 May 2002 19:10:45 - 1.7
-24,8 +24,8
ok $top_module;
-ok t_cmp($cfg-{httpd_info}-{MODULE_MAGIC_NUMBER},
- $top_module-version . ':0',
+ok t_cmp($cfg-{httpd_info}-{MODULE_MAGIC_NUMBER_MAJOR},
+ $top_module-version,
q{$top_module-version});
ok t_cmp(scalar keys %{ $cfg-{modules} },
cvs commit: modperl-2.0/xs/Apache/RequestRec - New directory
dougm 02/05/19 13:08:46 modperl-2.0/xs/Apache/RequestRec - New directory
cvs commit: modperl-2.0/xs/Apache/RequestRec Apache__RequestRec.h
dougm 02/05/19 13:09:27
Added: xs/Apache/RequestRec Apache__RequestRec.h
Log:
wrapper for $r-content_type
Revision ChangesPath
1.1 modperl-2.0/xs/Apache/RequestRec/Apache__RequestRec.h
Index: Apache__RequestRec.h
===
static MP_INLINE
const char *mpxs_Apache__RequestRec_content_type(pTHX_ request_rec *r,
SV *type)
{
const char *retval = r-content_type;
if (type) {
STRLEN len;
const char *val = SvPV(type, len);
ap_set_content_type(r, apr_pmemdup(r-pool, val, len));
}
return retval;
}
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
dougm 02/05/19 13:11:56
Modified:xs/maps apache_functions.map apache_structures.map
modperl_functions.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
wrap $r-content_type(foo/bar) so ap_set_content_type is called underneath
Revision ChangesPath
1.51 +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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- apache_functions.map 19 May 2002 01:05:30 - 1.50
+++ apache_functions.map 19 May 2002 20:11:55 - 1.51
-49,7 +49,7
ap_rgetline_core
?ap_get_request_note
?ap_register_request_note
- ap_set_content_type
+~ap_set_content_type
#MODULE=Apache::RequestConfig
ap_document_root
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- apache_structures.map 19 May 2002 01:05:30 - 1.14
+++ apache_structures.map 19 May 2002 20:11:55 - 1.15
-40,7 +40,7
err_headers_out
subprocess_env
notes
- content_type
+~ content_type
handler
content_encoding
content_languages
1.37 +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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- modperl_functions.map 10 May 2002 17:48:27 - 1.36
+++ modperl_functions.map 19 May 2002 20:11:55 - 1.37
-8,6 +8,9
mpxs_ModPerl__Global_special_list_call
mpxs_ModPerl__Global_special_list_clear
+MODULE=Apache::RequestRec PACKAGE=Apache::RequestRec
+ mpxs_Apache__RequestRec_content_type | | r, type=Nullsv
+
MODULE=Apache::RequestUtil PACKAGE=guess
mpxs_Apache__RequestRec_push_handlers
mpxs_Apache__RequestRec_set_handlers
1.64 +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.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- FunctionTable.pm 18 May 2002 23:56:54 - 1.63
+++ FunctionTable.pm 19 May 2002 20:11:55 - 1.64
-2,7 +2,7
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.01
-# ! Sat May 18 16:46:32 2002
+# ! Sun May 19 12:59:55 2002
# ! do NOT edit, any changes will be lost !
# !!
-4366,6 +4366,24
{
'type' = 'request_rec *',
'name' = 'r'
+ }
+]
+ },
+ {
+'return_type' = 'const char *',
+'name' = 'mpxs_Apache__RequestRec_content_type',
+'args' = [
+ {
+'type' = 'PerlInterpreter *',
+'name' = 'my_perl'
+ },
+ {
+'type' = 'request_rec *',
+'name' = 'r'
+ },
+ {
+'type' = 'SV *',
+'name' = 'type'
}
]
},
cvs commit: modperl-2.0/xs/Apache/Response Apache__Response.h
dougm 02/05/19 16:01:12
Modified:xs/Apache/Response Apache__Response.h
Log:
use ap_set_content_type rather than directly setting r-content_type
in $r-send_http_header
Revision ChangesPath
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Apache__Response.h21 Jan 2002 08:27:30 - 1.6
+++ Apache__Response.h19 May 2002 23:01:12 - 1.7
-20,7 +20,7
MP_dRCFG;
if (type) {
-r-content_type = apr_pstrdup(r-pool, type);
+ap_set_content_type(r, apr_pstrdup(r-pool, type));
}
rcfg-wbucket-header_parse = 0; /* turn off PerlOptions +ParseHeaders */
cvs commit: modperl-2.0/xs/maps apache_functions.map apr_functions.map
dougm 02/05/19 16:59:52 Modified:xs/maps apache_functions.map apr_functions.map Log: misc api mapping changes: - swap internal_fast_redirect, ap_die args - alias sub_req_lookup_dirent to lookup_dirent, reorder/default args - disable ap_run_child_init, apr_gethostname, apr_base64_decode_len Revision ChangesPath 1.52 +4 -4 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.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- apache_functions.map 19 May 2002 20:11:55 - 1.51 +++ apache_functions.map 19 May 2002 23:59:52 - 1.52 -81,8 +81,8 -ap_finalize_sub_req_protocol ap_internal_redirect | | r, new_uri ap_internal_redirect_handler | | r, new_uri - ap_internal_fast_redirect - ap_sub_req_lookup_dirent + ap_internal_fast_redirect| | r, sub_req + ap_sub_req_lookup_dirent | | r, finfo, subtype=AP_SUBREQ_NO_ARGS, next_filter=NULL | lookup_dirent subrequest_rec *:ap_sub_req_lookup_file | | \ r, new_file, next_filter=r-output_filters-next | lookup_file -436,7 +436,7 ap_run_open_logs ap_run_post_config ap_run_insert_filter - ap_run_child_init +ap_run_child_init ?ap_run_default_port ?ap_run_http_method ap_run_create_connection -460,7 +460,7 ap_run_pre_mpm !ap_run_quick_handler ap_invoke_handler - ap_die + ap_die | | r, type !MODULE=Apache::MD5 ap_md5 1.40 +2 -2 modperl-2.0/xs/maps/apr_functions.map Index: apr_functions.map === RCS file: /home/cvs/modperl-2.0/xs/maps/apr_functions.map,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- apr_functions.map 19 May 2002 01:05:30 - 1.39 +++ apr_functions.map 19 May 2002 23:59:52 - 1.40 -489,7 +489,7 apr_current_userid MODULE=APR::NetLib - apr_gethostname +-apr_gethostname apr_getnameinfo -apr_getservbyname apr_parse_addr_port -551,7 +551,7 apr_base64_decode | MPXS_ | coded_src apr_base64_encode | MPXS_ | plain_src apr_base64_encode_len - apr_base64_decode_len +-apr_base64_decode_len -apr_base64_encode_binary -apr_base64_decode_binary
