You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by to...@apache.org on 2008/06/26 14:20:48 UTC
svn commit: r671871 [2/2] - in /perl/modperl/branches/threading:
src/modules/perl/ xs/ xs/APR/Base64/ xs/APR/Brigade/ xs/APR/Bucket/
xs/APR/BucketAlloc/ xs/APR/Error/ xs/APR/Finfo/ xs/APR/Lock/ xs/APR/PerlIO/
xs/APR/Pool/ xs/APR/String/ xs/APR/Table/ x...
Modified: perl/modperl/branches/threading/xs/Apache2/Directive/Apache2__Directive.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/Directive/Apache2__Directive.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/Directive/Apache2__Directive.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/Directive/Apache2__Directive.h Thu Jun 26 05:20:45 2008
@@ -35,8 +35,8 @@
/* Adds an entry to a hash, vivifying hash/array for multiple entries */
-static void hash_insert(pTHX_ HV *hash, const char *key,
- int keylen, const char *args,
+static void hash_insert(pTHX_ HV *hash, const char *key,
+ int keylen, const char *args,
int argslen, SV *value)
{
HV *subhash;
@@ -73,7 +73,7 @@
}
static MP_INLINE SV *mpxs_Apache2__Directive_as_hash(pTHX_
- ap_directive_t *tree)
+ ap_directive_t *tree)
{
const char *directive;
int directive_len;
@@ -103,12 +103,12 @@
}
subtree = mpxs_Apache2__Directive_as_hash(aTHX_ tree->first_child);
- hash_insert(aTHX_ hash, directive, directive_len,
+ hash_insert(aTHX_ hash, directive, directive_len,
args, args_len, subtree);
}
else {
- hash_insert(aTHX_ hash, directive, directive_len,
- args, args_len, Nullsv);
+ hash_insert(aTHX_ hash, directive, directive_len,
+ args, args_len, Nullsv);
}
tree = tree->next;
Modified: perl/modperl/branches/threading/xs/Apache2/Filter/Apache2__Filter.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/Filter/Apache2__Filter.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/Filter/Apache2__Filter.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/Filter/Apache2__Filter.h Thu Jun 26 05:20:45 2008
@@ -33,7 +33,7 @@
mpxs_usage_va_1(modperl_filter, "$filter->print(...)");
MP_TRACE_f(MP_FUNC, "from %s\n",
- ((modperl_filter_ctx_t *)modperl_filter->f->ctx)->handler->name);
+ ((modperl_filter_ctx_t *)modperl_filter->f->ctx)->handler->name);
if (modperl_filter->mode == MP_OUTPUT_FILTER_MODE) {
mpxs_write_loop(modperl_output_filter_write,
modperl_filter, "Apache2::Filter::print");
Modified: perl/modperl/branches/threading/xs/Apache2/Log/Apache2__Log.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/Log/Apache2__Log.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/Log/Apache2__Log.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/Log/Apache2__Log.h Thu Jun 26 05:20:45 2008
@@ -16,9 +16,9 @@
static void mpxs_Apache2__Log_BOOT(pTHX)
{
- av_push(get_av("Apache2::Log::Request::ISA", TRUE),
+ av_push(get_av("Apache2::Log::Request::ISA", TRUE),
newSVpv("Apache2::Log", 12));
- av_push(get_av("Apache2::Log::Server::ISA", TRUE),
+ av_push(get_av("Apache2::Log::Server::ISA", TRUE),
newSVpv("Apache2::Log", 12));
}
@@ -54,7 +54,7 @@
line = CopLINE(cop); /* (caller)[2] */
}
- if ((s->loglevel >= lmask) &&
+ if ((s->loglevel >= lmask) &&
SvROK(msg) && (SvTYPE(SvRV(msg)) == SVt_PVCV)) {
dSP;
ENTER;SAVETMPS;
Modified: perl/modperl/branches/threading/xs/Apache2/MPM/Apache2__MPM.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/MPM/Apache2__MPM.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/MPM/Apache2__MPM.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/MPM/Apache2__MPM.h Thu Jun 26 05:20:45 2008
@@ -38,7 +38,7 @@
apr_status_t retval = ap_mpm_query(AP_MPMQ_IS_THREADED, &mpm_query_info);
if (retval == APR_SUCCESS) {
- MP_TRACE_g(MP_FUNC, "defined Apache2::MPM->is_threaded() as %i\n",
+ MP_TRACE_g(MP_FUNC, "defined Apache2::MPM->is_threaded() as %i\n",
mpm_query_info);
newCONSTSUB(PL_defstash, "Apache2::MPM::is_threaded",
Modified: perl/modperl/branches/threading/xs/Apache2/Module/Apache2__Module.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/Module/Apache2__Module.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/Module/Apache2__Module.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/Module/Apache2__Module.h Thu Jun 26 05:20:45 2008
@@ -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/branches/threading/xs/Apache2/RequestIO/Apache2__RequestIO.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/RequestIO/Apache2__RequestIO.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/RequestIO/Apache2__RequestIO.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/RequestIO/Apache2__RequestIO.h Thu Jun 26 05:20:45 2008
@@ -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/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h Thu Jun 26 05:20:45 2008
@@ -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/branches/threading/xs/Apache2/RequestUtil/Apache2__RequestUtil.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/RequestUtil/Apache2__RequestUtil.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/RequestUtil/Apache2__RequestUtil.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/RequestUtil/Apache2__RequestUtil.h Thu Jun 26 05:20:45 2008
@@ -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;
}
@@ -332,7 +332,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;
@@ -352,7 +352,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/branches/threading/xs/Apache2/SubProcess/Apache2__SubProcess.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/SubProcess/Apache2__SubProcess.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/SubProcess/Apache2__SubProcess.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/SubProcess/Apache2__SubProcess.h Thu Jun 26 05:20:45 2008
@@ -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/branches/threading/xs/modperl_xs_util.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/modperl_xs_util.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/modperl_xs_util.h (original)
+++ perl/modperl/branches/threading/xs/modperl_xs_util.h Thu Jun 26 05:20:45 2008
@@ -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))