Author: stevehay
Date: Thu Oct 31 22:53:41 2013
New Revision: 1537749
URL: http://svn.apache.org/r1537749
Log:
Merged revision(s) 671871 from perl/modperl/branches/threading:
cleaning up trailing spaces and expanding tabs where necessary
........
Modified:
perl/modperl/branches/httpd24threading/ (props changed)
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.c
perl/modperl/branches/httpd24threading/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h
Propchange: perl/modperl/branches/httpd24threading/
------------------------------------------------------------------------------
Merged /perl/modperl/branches/threading:r671871
Modified:
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.c
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.c?rev=1537749&r1=1537748&r2=1537749&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.c
(original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.c
Thu Oct 31 22:53:41 2013
@@ -381,7 +381,7 @@ modperl_interp_t *modperl_interp_pool_se
(unsigned long)interp, (unsigned long)p);
}
}
-
+
/* set context (THX) for this thread */
PERL_SET_CONTEXT(interp->perl);
/* let the perl interpreter point back to its interp */
Modified:
perl/modperl/branches/httpd24threading/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h?rev=1537749&r1=1537748&r2=1537749&view=diff
==============================================================================
---
perl/modperl/branches/httpd24threading/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h
(original)
+++
perl/modperl/branches/httpd24threading/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h
Thu Oct 31 22:53:41 2013
@@ -24,7 +24,7 @@ SV *mpxs_Apache2__Connection_pnotes(pTHX
if (!ccfg) {
return &PL_sv_undef;
}
-
+
return modperl_pnotes(aTHX_ &ccfg->pnotes, key, val, c->pool);
}
