Modified: perl/modperl/trunk/xs/Apache2/Module/Apache2__Module.h URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/Module/Apache2__Module.h?rev=607690&r1=607689&r2=607690&view=diff ============================================================================== --- perl/modperl/trunk/xs/Apache2/Module/Apache2__Module.h (original) +++ perl/modperl/trunk/xs/Apache2/Module/Apache2__Module.h Sun Dec 30 23:20:50 2007 @@ -75,7 +75,7 @@ return mod->minor_version; } -static MP_INLINE void mpxs_Apache2__Module_add(pTHX_ +static MP_INLINE void mpxs_Apache2__Module_add(pTHX_ char *package, SV *cmds) { @@ -90,7 +90,7 @@ error = modperl_module_add(s->process->pconf, s, package, cmds); if (error) { - Perl_croak(aTHX_ "Apache2::Module::add(%s) failed : %s", + Perl_croak(aTHX_ "Apache2::Module::add(%s) failed : %s", package, error); }
Modified: perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h?rev=607690&r1=607689&r2=607690&view=diff ============================================================================== --- perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h (original) +++ perl/modperl/trunk/xs/Apache2/RequestIO/Apache2__RequestIO.h Sun Dec 30 23:20:50 2007 @@ -97,7 +97,7 @@ mpxs_output_flush(r, rcfg, "Apache2::RequestIO::print"); return bytes ? newSVuv(bytes) : newSVpvn("0E0", 3); -} +} static MP_INLINE apr_size_t mpxs_ap_rprintf(pTHX_ I32 items, SV **MARK, SV **SP) @@ -129,7 +129,7 @@ mpxs_output_flush(r, rcfg, "Apache2::RequestIO::printf"); return bytes; -} +} /* alias */ #define mpxs_Apache2__RequestRec_WRITE(r, buffer, len, offset) \ @@ -252,7 +252,7 @@ if (total > 0) { mpxs_sv_cur_set(buffer, offset+total); - } + } else { sv_setpvn(buffer, "", 0); } Modified: perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h?rev=607690&r1=607689&r2=607690&view=diff ============================================================================== --- perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h (original) +++ perl/modperl/trunk/xs/Apache2/RequestRec/Apache2__RequestRec.h Sun Dec 30 23:20:50 2007 @@ -35,10 +35,10 @@ SV *mpxs_Apache2__RequestRec_content_languages(pTHX_ request_rec *r, SV *languages) { - SV *retval = modperl_apr_array_header2avrv(aTHX_ + SV *retval = modperl_apr_array_header2avrv(aTHX_ r->content_languages); if (languages) { - r->content_languages = modperl_avrv2apr_array_header(aTHX_ + r->content_languages = modperl_avrv2apr_array_header(aTHX_ r->pool, languages); } @@ -52,11 +52,11 @@ if (!val && !r->proxyreq && r->parsed_uri.scheme && - !(r->parsed_uri.hostname && + !(r->parsed_uri.hostname && strEQ(r->parsed_uri.scheme, ap_http_scheme(r)) && ap_matches_request_vhost(r, r->parsed_uri.hostname, - r->parsed_uri.port_str ? - r->parsed_uri.port : + r->parsed_uri.port_str ? + r->parsed_uri.port : ap_default_port(r)))) { retval = r->proxyreq = 1; @@ -146,5 +146,3 @@ return RETVAL; } - - Modified: perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h?rev=607690&r1=607689&r2=607690&view=diff ============================================================================== --- perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h (original) +++ perl/modperl/trunk/xs/Apache2/RequestUtil/Apache2__RequestUtil.h Sun Dec 30 23:20:50 2007 @@ -81,7 +81,7 @@ r->server = s; r->request_time = apr_time_now(); - + r->user = NULL; r->ap_auth_type = NULL; @@ -125,7 +125,7 @@ if (base_pool_sv) { mpxs_add_pool_magic(r_sv, base_pool_sv); } - + return r_sv; } @@ -320,7 +320,7 @@ struct mp_docroot_info *di; core_server_config *conf; MP_CROAK_IF_THREADS_STARTED("setting $r->document_root"); - conf = ap_get_module_config(r->server->module_config, + conf = ap_get_module_config(r->server->module_config, &core_module); di = apr_palloc(r->pool, sizeof *di); di->docroot = &conf->ap_document_root; @@ -340,7 +340,7 @@ /* On the first pass, re-register so we end up last */ if (data) { apr_pool_cleanup_register(pool, NULL, child_terminate, - apr_pool_cleanup_null); + apr_pool_cleanup_null); } else { exit(0); Modified: perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h?rev=607690&r1=607689&r2=607690&view=diff ============================================================================== --- perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h (original) +++ perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h Sun Dec 30 23:20:50 2007 @@ -68,7 +68,7 @@ if (FAILED(apr_procattr_create(&procattr, p)) || FAILED(apr_procattr_io_set(procattr, e_info.in_pipe, e_info.out_pipe, e_info.err_pipe)) || - FAILED(apr_procattr_dir_set(procattr, + FAILED(apr_procattr_dir_set(procattr, ap_make_dirstr_parent(r->pool, r->filename))) || FAILED(apr_procattr_cmdtype_set(procattr, e_info.cmd_type))) Modified: perl/modperl/trunk/xs/modperl_xs_util.h URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/modperl_xs_util.h?rev=607690&r1=607689&r2=607690&view=diff ============================================================================== --- perl/modperl/trunk/xs/modperl_xs_util.h (original) +++ perl/modperl/trunk/xs/modperl_xs_util.h Sun Dec 30 23:20:50 2007 @@ -73,7 +73,7 @@ #define mpxs_sv_object_deref(sv, type) \ (mpxs_sv_is_object(sv) ? \ - INT2PTR(type *, SvIVX((SV*)SvRV(sv))) : NULL) + INT2PTR(type *, SvIVX((SV*)SvRV(sv))) : NULL) #define mpxs_sv2_obj(obj, sv) \ (obj = mp_xs_sv2_##obj(sv))