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 Changes Path
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.h 2001/05/08 21:08:53 1.3
+++ Apache__Response.h 2001/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'
}
]
},
