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 [1/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...
Author: torsten
Date: Thu Jun 26 05:20:45 2008
New Revision: 671871
URL: http://svn.apache.org/viewvc?rev=671871&view=rev
Log:
cleaning up trailing spaces and expanding tabs where necessary
Modified:
perl/modperl/branches/threading/src/modules/perl/mod_perl.c
perl/modperl/branches/threading/src/modules/perl/mod_perl.h
perl/modperl/branches/threading/src/modules/perl/modperl_apr_compat.h
perl/modperl/branches/threading/src/modules/perl/modperl_bucket.c
perl/modperl/branches/threading/src/modules/perl/modperl_bucket.h
perl/modperl/branches/threading/src/modules/perl/modperl_callback.c
perl/modperl/branches/threading/src/modules/perl/modperl_callback.h
perl/modperl/branches/threading/src/modules/perl/modperl_cgi.c
perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c
perl/modperl/branches/threading/src/modules/perl/modperl_common_debug.c
perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c
perl/modperl/branches/threading/src/modules/perl/modperl_common_types.h
perl/modperl/branches/threading/src/modules/perl/modperl_common_util.c
perl/modperl/branches/threading/src/modules/perl/modperl_common_util.h
perl/modperl/branches/threading/src/modules/perl/modperl_config.c
perl/modperl/branches/threading/src/modules/perl/modperl_config.h
perl/modperl/branches/threading/src/modules/perl/modperl_const.c
perl/modperl/branches/threading/src/modules/perl/modperl_debug.c
perl/modperl/branches/threading/src/modules/perl/modperl_env.c
perl/modperl/branches/threading/src/modules/perl/modperl_error.c
perl/modperl/branches/threading/src/modules/perl/modperl_error.h
perl/modperl/branches/threading/src/modules/perl/modperl_filter.c
perl/modperl/branches/threading/src/modules/perl/modperl_filter.h
perl/modperl/branches/threading/src/modules/perl/modperl_global.c
perl/modperl/branches/threading/src/modules/perl/modperl_gtop.c
perl/modperl/branches/threading/src/modules/perl/modperl_gtop.h
perl/modperl/branches/threading/src/modules/perl/modperl_handler.c
perl/modperl/branches/threading/src/modules/perl/modperl_handler.h
perl/modperl/branches/threading/src/modules/perl/modperl_interp.c
perl/modperl/branches/threading/src/modules/perl/modperl_interp.h
perl/modperl/branches/threading/src/modules/perl/modperl_io.c
perl/modperl/branches/threading/src/modules/perl/modperl_io.h
perl/modperl/branches/threading/src/modules/perl/modperl_io_apache.c
perl/modperl/branches/threading/src/modules/perl/modperl_mgv.c
perl/modperl/branches/threading/src/modules/perl/modperl_module.c
perl/modperl/branches/threading/src/modules/perl/modperl_module.h
perl/modperl/branches/threading/src/modules/perl/modperl_options.c
perl/modperl/branches/threading/src/modules/perl/modperl_pcw.c
perl/modperl/branches/threading/src/modules/perl/modperl_perl.c
perl/modperl/branches/threading/src/modules/perl/modperl_perl_global.c
perl/modperl/branches/threading/src/modules/perl/modperl_perl_unembed.h
perl/modperl/branches/threading/src/modules/perl/modperl_tipool.c
perl/modperl/branches/threading/src/modules/perl/modperl_types.h
perl/modperl/branches/threading/src/modules/perl/modperl_util.c
perl/modperl/branches/threading/src/modules/perl/modperl_util.h
perl/modperl/branches/threading/xs/APR/Base64/APR__Base64.h
perl/modperl/branches/threading/xs/APR/Brigade/APR__Brigade.h
perl/modperl/branches/threading/xs/APR/Bucket/APR__Bucket.h
perl/modperl/branches/threading/xs/APR/BucketAlloc/APR__BucketAlloc.h
perl/modperl/branches/threading/xs/APR/Error/APR__Error.h
perl/modperl/branches/threading/xs/APR/Finfo/APR__Finfo.h
perl/modperl/branches/threading/xs/APR/Lock/APR__Lock.h
perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.c
perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.h
perl/modperl/branches/threading/xs/APR/Pool/APR__Pool.h
perl/modperl/branches/threading/xs/APR/String/APR__String.h
perl/modperl/branches/threading/xs/APR/Table/APR__Table.h
perl/modperl/branches/threading/xs/APR/URI/APR__URI.h
perl/modperl/branches/threading/xs/Apache2/Access/Apache2__Access.h
perl/modperl/branches/threading/xs/Apache2/CmdParms/Apache2__CmdParms.h
perl/modperl/branches/threading/xs/Apache2/Connection/Apache2__Connection.h
perl/modperl/branches/threading/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h
perl/modperl/branches/threading/xs/Apache2/Directive/Apache2__Directive.h
perl/modperl/branches/threading/xs/Apache2/Filter/Apache2__Filter.h
perl/modperl/branches/threading/xs/Apache2/Log/Apache2__Log.h
perl/modperl/branches/threading/xs/Apache2/MPM/Apache2__MPM.h
perl/modperl/branches/threading/xs/Apache2/Module/Apache2__Module.h
perl/modperl/branches/threading/xs/Apache2/RequestIO/Apache2__RequestIO.h
perl/modperl/branches/threading/xs/Apache2/RequestRec/Apache2__RequestRec.h
perl/modperl/branches/threading/xs/Apache2/RequestUtil/Apache2__RequestUtil.h
perl/modperl/branches/threading/xs/Apache2/SubProcess/Apache2__SubProcess.h
perl/modperl/branches/threading/xs/modperl_xs_util.h
Modified: perl/modperl/branches/threading/src/modules/perl/mod_perl.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/mod_perl.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/mod_perl.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/mod_perl.c Thu Jun 26 05:20:45 2008
@@ -215,7 +215,7 @@
{
server_rec *base_server = modperl_global_get_server_rec();
const char *desc = modperl_server_desc(s, p);
- if (base_server == s) {
+ if (base_server == s) {
MP_TRACE_i(MP_FUNC,
"starting the parent perl for the base server\n", desc);
}
@@ -410,7 +410,7 @@
/* virtual host w/ +Clone gets its own mip */
if (MpSrvCLONE(scfg)) {
modperl_interp_init(s, p, perl);
- }
+ }
#endif
if (!modperl_config_apply_PerlRequire(s, scfg, perl, p)) {
@@ -478,7 +478,7 @@
for (; s; s=s->next) {
MP_dSCFG(s);
if (!modperl_config_apply_PerlPostConfigRequire(s, scfg, p)) {
- return FALSE;
+ return FALSE;
}
}
return TRUE;
@@ -607,7 +607,7 @@
return APR_SUCCESS;
}
-int modperl_hook_init(apr_pool_t *pconf, apr_pool_t *plog,
+int modperl_hook_init(apr_pool_t *pconf, apr_pool_t *plog,
apr_pool_t *ptemp, server_rec *s)
{
if (MP_IS_STARTING || MP_IS_RUNNING) {
@@ -712,7 +712,7 @@
#else
#define MP_PERL_VERSION_STAMP "Perl/v%vd"
#endif
-
+
ap_add_version_component(pconf, MP_VERSION_STRING);
ap_add_version_component(pconf,
Perl_form(aTHX_ MP_PERL_VERSION_STAMP,
@@ -773,7 +773,7 @@
}
static int modperl_hook_header_parser(request_rec *r)
-{
+{
/* if 'PerlOptions +GlobalRequest' is inside a container */
modperl_global_request_cfg_set(r);
@@ -915,7 +915,7 @@
modperl_register_handler_hooks();
}
-static const command_rec modperl_cmds[] = {
+static const command_rec modperl_cmds[] = {
MP_CMD_SRV_ITERATE("PerlSwitches", switches, "Perl Switches"),
MP_CMD_DIR_ITERATE("PerlModule", modules, "PerlModule"),
MP_CMD_DIR_ITERATE("PerlRequire", requires, "PerlRequire"),
@@ -971,8 +971,8 @@
"Turn on -w switch"),
#endif
MP_CMD_ENTRIES,
- { NULL },
-};
+ { NULL },
+};
void modperl_response_init(request_rec *r)
{
@@ -1150,7 +1150,7 @@
}
module AP_MODULE_DECLARE_DATA perl_module = {
- STANDARD20_MODULE_STUFF,
+ STANDARD20_MODULE_STUFF,
modperl_config_dir_create, /* dir config creater */
modperl_config_dir_merge, /* dir merger --- default is to override */
modperl_config_srv_create, /* server config */
Modified: perl/modperl/branches/threading/src/modules/perl/mod_perl.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/mod_perl.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/mod_perl.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/mod_perl.h Thu Jun 26 05:20:45 2008
@@ -55,7 +55,7 @@
/* apr largefile support is enabled, perl support is disabled */
#if (!defined(USE_LARGE_FILES)) && APR_HAS_LARGE_FILES
-#define MP_LARGE_FILES_APR_ONLY
+#define MP_LARGE_FILES_APR_ONLY
#endif
/* conflict due to not have either both perl and apr
@@ -103,7 +103,7 @@
Perl_croak(aTHX_ "Can't run '%s' in the threaded " \
"environment after server startup", what); \
}
-
+
#define MP_CROAK_IF_THREADED_MPM(what) \
if (modperl_threaded_mpm()) { \
Perl_croak(aTHX_ "Can't run '%s' in a threaded mpm", \
@@ -122,7 +122,7 @@
void modperl_init_globals(server_rec *s, apr_pool_t *pconf);
int modperl_run(void);
int modperl_is_running(void);
-int modperl_hook_init(apr_pool_t *pconf, apr_pool_t *plog,
+int modperl_hook_init(apr_pool_t *pconf, apr_pool_t *plog,
apr_pool_t *ptemp, server_rec *s);
int modperl_hook_pre_config(apr_pool_t *p, apr_pool_t *plog,
apr_pool_t *ptemp);
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_apr_compat.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_apr_compat.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_apr_compat.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_apr_compat.h Thu Jun 26 05:20:45 2008
@@ -109,7 +109,7 @@
#ifndef APR_FOPEN_READ
#define APR_FOPEN_READ APR_READ
#endif
-#ifndef APR_FOPEN_WRITE
+#ifndef APR_FOPEN_WRITE
#define APR_FOPEN_WRITE APR_WRITE
#endif
#ifndef APR_FOPEN_CREATE
@@ -124,16 +124,16 @@
#ifndef APR_FOPEN_BINARY
#define APR_FOPEN_BINARY APR_BINARY
#endif
-#ifndef APR_FOPEN_EXCL
+#ifndef APR_FOPEN_EXCL
#define APR_FOPEN_EXCL APR_EXCL
#endif
-#ifndef APR_FOPEN_BUFFERED
+#ifndef APR_FOPEN_BUFFERED
#define APR_FOPEN_BUFFERED APR_BUFFERED
#endif
#ifndef APR_FOPEN_DELONCLOSE
#define APR_FOPEN_DELONCLOSE APR_DELONCLOSE
#endif
-#ifndef APR_FOPEN_XTHREAD
+#ifndef APR_FOPEN_XTHREAD
#define APR_FOPEN_XTHREAD APR_XTHREAD
#endif
#ifndef APR_FOPEN_SHARELOCK
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_bucket.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_bucket.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_bucket.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_bucket.c Thu Jun 26 05:20:45 2008
@@ -66,7 +66,7 @@
apr_bucket_free(svbucket);
}
-static
+static
apr_status_t modperl_bucket_sv_setaside(apr_bucket *bucket, apr_pool_t *pool)
{
modperl_bucket_sv_t *svbucket = bucket->data;
@@ -111,7 +111,7 @@
apr_off_t offset,
apr_size_t len)
{
- modperl_bucket_sv_t *svbucket;
+ modperl_bucket_sv_t *svbucket;
svbucket = apr_bucket_alloc(sizeof(*svbucket), bucket->list);
@@ -146,7 +146,7 @@
return bucket;
}
-apr_bucket *modperl_bucket_sv_create(pTHX_ apr_bucket_alloc_t *list, SV *sv,
+apr_bucket *modperl_bucket_sv_create(pTHX_ apr_bucket_alloc_t *list, SV *sv,
apr_off_t offset, apr_size_t len)
{
apr_bucket *bucket;
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_bucket.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_bucket.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_bucket.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_bucket.h Thu Jun 26 05:20:45 2008
@@ -17,7 +17,7 @@
#ifndef MODPERL_BUCKET_H
#define MODPERL_BUCKET_H
-apr_bucket *modperl_bucket_sv_create(pTHX_ apr_bucket_alloc_t *list, SV *sv,
+apr_bucket *modperl_bucket_sv_create(pTHX_ apr_bucket_alloc_t *list, SV *sv,
apr_off_t offset, apr_size_t len);
#endif /* MODPERL_BUCKET_H */
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_callback.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_callback.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_callback.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_callback.c Thu Jun 26 05:20:45 2008
@@ -111,7 +111,7 @@
if (status_sv == &PL_sv_undef) {
/* ModPerl::Util::exit() and Perl_croak internally
* arrange to return PL_sv_undef with G_EVAL|G_SCALAR */
- status = OK;
+ status = OK;
}
else {
status = SvIVx(status_sv);
@@ -283,7 +283,7 @@
break;
}
/* the normal case:
- * OK and DECLINED continue
+ * OK and DECLINED continue
* errors end the phase
*/
else if ((status != OK) && (status != DECLINED)) {
@@ -330,7 +330,7 @@
else {
/* the rare case.
* MP_HOOK_VOID handlers completely ignore the return status
- * Apache should handle whatever mod_perl returns,
+ * Apache should handle whatever mod_perl returns,
* so there is no need to mess with the status
*/
}
@@ -369,7 +369,7 @@
NULL, NULL, NULL, run_mode);
}
-int modperl_callback_per_srv(int idx, request_rec *r,
+int modperl_callback_per_srv(int idx, request_rec *r,
modperl_hook_run_mode_e run_mode)
{
return modperl_callback_run_handlers(idx,
@@ -378,7 +378,7 @@
NULL, NULL, NULL, run_mode);
}
-int modperl_callback_connection(int idx, conn_rec *c,
+int modperl_callback_connection(int idx, conn_rec *c,
modperl_hook_run_mode_e run_mode)
{
return modperl_callback_run_handlers(idx,
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_callback.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_callback.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_callback.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_callback.h Thu Jun 26 05:20:45 2008
@@ -45,7 +45,7 @@
apr_pool_t *ptemp,
modperl_hook_run_mode_e run_mode);
-int modperl_callback_per_dir(int idx, request_rec *r,
+int modperl_callback_per_dir(int idx, request_rec *r,
modperl_hook_run_mode_e run_mode);
int modperl_callback_per_srv(int idx, request_rec *r,
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_cgi.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_cgi.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_cgi.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_cgi.c Thu Jun 26 05:20:45 2008
@@ -75,7 +75,7 @@
r->method_number = M_GET;
/* We already read the message body (if any), so don't allow
- * the redirected request to think it has one. We can ignore
+ * the redirected request to think it has one. We can ignore
* Transfer-Encoding, since we used REQUEST_CHUNKED_ERROR.
*/
apr_table_unset(r->headers_in, "Content-Length");
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_cmd.c Thu Jun 26 05:20:45 2008
@@ -242,7 +242,7 @@
}
MP_CMD_SRV_DECLARE(config_requires)
-{
+{
/* we must init earlier than normal */
modperl_run();
@@ -540,14 +540,14 @@
pkg_namespace = modperl_file2package(p, directive->filename);
- pkg_name = apr_psprintf(p, "%s::%s::line_%d",
- pkg_base,
- pkg_namespace,
+ pkg_name = apr_psprintf(p, "%s::%s::line_%d",
+ pkg_base,
+ pkg_namespace,
directive->line_num);
apr_table_set(options, "package", pkg_name);
- line_header = apr_psprintf(p, "\n#line %d %s\n",
+ line_header = apr_psprintf(p, "\n#line %d %s\n",
directive->line_num,
directive->filename);
@@ -620,7 +620,7 @@
{
char line[MAX_STRING_LEN];
- if (arg && *arg && !(MP_POD_FORMAT(arg) || strstr("pod", arg))) {
+ if (arg && *arg && !(MP_POD_FORMAT(arg) || strstr("pod", arg))) {
return "Unknown =back format";
}
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_common_debug.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_common_debug.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_common_debug.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_common_debug.c Thu Jun 26 05:20:45 2008
@@ -17,4 +17,3 @@
/* This file must not contain any symbols from apache/mod_perl
* (apr and perl are OK) */
#include "modperl_common_includes.h"
-
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_common_log.c Thu Jun 26 05:20:45 2008
@@ -31,7 +31,7 @@
unsigned long modperl_debug_level(void)
{
- return debug_level;
+ return debug_level;
}
void modperl_trace_logfile_set(apr_file_t *logfile_new)
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_common_types.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_common_types.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_common_types.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_common_types.h Thu Jun 26 05:20:45 2008
@@ -26,4 +26,3 @@
} modperl_uri_t;
#endif /* MODPERL_COMMON_TYPES_H */
-
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_common_util.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_common_util.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_common_util.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_common_util.c Thu Jun 26 05:20:45 2008
@@ -40,7 +40,7 @@
*/
MP_INLINE static
-int modperl_table_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv,
+int modperl_table_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv,
const char *name, int namelen)
{
/* prefetch the value whenever we're iterating over the keys */
@@ -53,11 +53,11 @@
}
-static const MGVTBL modperl_table_magic_prefetch = {0, 0, 0, 0, 0,
+static const MGVTBL modperl_table_magic_prefetch = {0, 0, 0, 0, 0,
modperl_table_magic_copy};
#endif /* End of prefetch magic */
-MP_INLINE SV *modperl_hash_tie(pTHX_
+MP_INLINE SV *modperl_hash_tie(pTHX_
const char *classname,
SV *tsv, void *p)
{
@@ -81,7 +81,7 @@
gv_stashpv(classname, TRUE)));
}
-MP_INLINE SV *modperl_hash_tied_object_rv(pTHX_
+MP_INLINE SV *modperl_hash_tied_object_rv(pTHX_
const char *classname,
SV *tsv)
{
@@ -115,7 +115,7 @@
return &PL_sv_undef;
}
-MP_INLINE void *modperl_hash_tied_object(pTHX_
+MP_INLINE void *modperl_hash_tied_object(pTHX_
const char *classname,
SV *tsv)
{
@@ -133,7 +133,7 @@
{
GV *gv = newGVgen(pack);
SV *rv = newRV((SV*)gv);
- (void)hv_delete(gv_stashpv(pack, TRUE),
+ (void)hv_delete(gv_stashpv(pack, TRUE),
GvNAME(gv), GvNAMELEN(gv), G_DISCARD);
return rv;
}
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_common_util.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_common_util.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_common_util.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_common_util.h Thu Jun 26 05:20:45 2008
@@ -77,7 +77,7 @@
#define MP_magical_tie(sv, mg_flags) \
SvFLAGS((SV*)sv) |= mg_flags
-/* some wrapper macros to detect perl versions
+/* some wrapper macros to detect perl versions
* and prevent code clutter */
#define MP_PERL_VERSION_AT_LEAST(r, v, s) \
(PERL_REVISION == r && \
@@ -95,7 +95,7 @@
SV *tsv, void *p);
/* tied %hash */
-MP_INLINE SV *modperl_hash_tied_object_rv(pTHX_
+MP_INLINE SV *modperl_hash_tied_object_rv(pTHX_
const char *classname,
SV *tsv);
/* tied %hash */
@@ -110,4 +110,3 @@
SV *modperl_perl_gensym(pTHX_ char *pack);
#endif /* MODPERL_COMMON_UTIL_H */
-
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_config.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_config.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_config.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_config.c Thu Jun 26 05:20:45 2008
@@ -23,7 +23,7 @@
dcfg->location = dir;
MP_TRACE_d(MP_FUNC, "dir %s\n", dir);
-
+
#ifdef USE_ITHREADS
/* defaults to per-server scope */
dcfg->interp_scope = MP_INTERP_SCOPE_UNDEF;
@@ -110,7 +110,7 @@
*add = (modperl_config_dir_t *)addv,
*mrg = modperl_config_dir_new(p);
- MP_TRACE_d(MP_FUNC, "basev==0x%lx, addv==0x%lx, mrg==0x%lx\n",
+ MP_TRACE_d(MP_FUNC, "basev==0x%lx, addv==0x%lx, mrg==0x%lx\n",
(unsigned long)basev, (unsigned long)addv,
(unsigned long)mrg);
@@ -140,7 +140,7 @@
modperl_config_req_t *modperl_config_req_new(request_rec *r)
{
- modperl_config_req_t *rcfg =
+ modperl_config_req_t *rcfg =
(modperl_config_req_t *)apr_pcalloc(r->pool, sizeof(*rcfg));
MP_TRACE_d(MP_FUNC, "0x%lx\n", (unsigned long)rcfg);
@@ -150,7 +150,7 @@
modperl_config_con_t *modperl_config_con_new(conn_rec *c)
{
- modperl_config_con_t *ccfg =
+ modperl_config_con_t *ccfg =
(modperl_config_con_t *)apr_pcalloc(c->pool, sizeof(*ccfg));
MP_TRACE_d(MP_FUNC, "0x%lx\n", (unsigned long)ccfg);
@@ -182,7 +182,7 @@
#ifdef MP_USE_GTOP
scfg->gtop = modperl_gtop_new(p);
-#endif
+#endif
/* make sure httpd's argv[0] is the first argument so $0 is
* correctly connected to the real thing */
@@ -258,7 +258,7 @@
#ifdef USE_ITHREADS
- scfg->interp_pool_cfg =
+ scfg->interp_pool_cfg =
(modperl_tipool_config_t *)
apr_pcalloc(p, sizeof(*scfg->interp_pool_cfg));
@@ -286,7 +286,7 @@
*add = (modperl_config_srv_t *)addv,
*mrg = modperl_config_srv_new(p, add->server);
- MP_TRACE_d(MP_FUNC, "basev==0x%lx, addv==0x%lx, mrg==0x%lx\n",
+ MP_TRACE_d(MP_FUNC, "basev==0x%lx, addv==0x%lx, mrg==0x%lx\n",
(unsigned long)basev, (unsigned long)addv,
(unsigned long)mrg);
@@ -482,7 +482,7 @@
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"Can't load Perl file: %s for server %s, exiting...",
requires[i]->file, modperl_server_desc(s, p));
-
+
return FALSE;
}
}
@@ -582,14 +582,14 @@
return errmsg;
}
-const char *modperl_config_insert_parms(pTHX_ cmd_parms *parms,
+const char *modperl_config_insert_parms(pTHX_ cmd_parms *parms,
SV *lines)
{
- return modperl_config_insert(aTHX_
- parms->server,
- parms->pool,
+ return modperl_config_insert(aTHX_
+ parms->server,
+ parms->pool,
parms->temp_pool,
- parms->override,
+ parms->override,
parms->path,
#ifdef MP_HTTPD_HAS_OVERRIDE_OPTS
parms->override_opts,
@@ -635,7 +635,7 @@
return errmsg;
}
- r->per_dir_config =
+ r->per_dir_config =
ap_merge_per_dir_configs(r->pool,
r->per_dir_config,
dconf);
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_config.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_config.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_config.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_config.h Thu Jun 26 05:20:45 2008
@@ -99,7 +99,7 @@
#define MP_dCCFG \
modperl_config_con_t *ccfg = modperl_config_con_get(c)
-
+
#define modperl_config_dir_get(r) \
(r ? (modperl_config_dir_t *) \
modperl_get_module_config(r->per_dir_config) : NULL)
@@ -157,7 +157,7 @@
ap_conf_vector_t *conf,
SV *lines);
-const char *modperl_config_insert_parms(pTHX_ cmd_parms *parms,
+const char *modperl_config_insert_parms(pTHX_ cmd_parms *parms,
SV *lines);
const char *modperl_config_insert_server(pTHX_ server_rec *s, SV *lines);
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_const.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_const.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_const.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_const.c Thu Jun 26 05:20:45 2008
@@ -117,7 +117,7 @@
}
classname = *(stashname + 1) == 'P'
- ? "APR::Const"
+ ? "APR::Const"
: (*stashname == 'A' ? "Apache2::Const" : "ModPerl");
arg = SvPV(ST(1),n_a);
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_debug.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_debug.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_debug.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_debug.c Thu Jun 26 05:20:45 2008
@@ -37,7 +37,7 @@
len = tmp_len;
}
}
- }
+ }
/* dump the table with keys aligned */
fmt = Perl_form(aTHX_ "%%-%ds => %%s", len);
@@ -46,7 +46,7 @@
continue;
}
modperl_trace(MP_FUNC, fmt, elts[i].key, elts[i].val);
- }
+ }
modperl_trace(MP_FUNC, "");
}
#endif
@@ -75,4 +75,3 @@
}
#endif
-
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_env.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_env.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_env.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_env.c Thu Jun 26 05:20:45 2008
@@ -130,7 +130,7 @@
continue;
}
MP_ENV_HV_STORE_TABLE_ENTRY(hv, elts[i]);
- }
+ }
modperl_env_tie(mg_flags);
}
@@ -167,10 +167,10 @@
apr_table_entry_t *elts;
HV *hv = ENVHV;
SV **svp;
-
+
array = apr_table_elts(table);
elts = (apr_table_entry_t *)array->elts;
-
+
for (i = 0; i < array->nelts; i++) {
if (!elts[i].key) {
continue;
@@ -181,7 +181,7 @@
MP_TRACE_e(MP_FUNC, "(Set|Pass)Env '%s' '%s'", elts[i].key,
SvPV_nolen(*svp));
}
- }
+ }
TAINT_NOT; /* SvPV_* causes the taint issue */
}
@@ -255,7 +255,7 @@
MP_dRCFG;
MP_dDCFG;
- /* populate %ENV and r->subprocess_env with per-directory
+ /* populate %ENV and r->subprocess_env with per-directory
* PerlSetEnv entries.
*
* note that per-server PerlSetEnv entries, as well as
@@ -267,7 +267,7 @@
apr_table_t *setenv_copy;
/* add per-directory PerlSetEnv entries to %ENV
- * collisions with per-server PerlSetEnv entries are
+ * collisions with per-server PerlSetEnv entries are
* resolved via the nature of a Perl hash
*/
MP_TRACE_e(MP_FUNC, "\n\t[0x%lx/%s]"
@@ -295,8 +295,8 @@
MP_dRCFG;
MP_dSCFG(r->server);
- /* populate %ENV and r->subprocess_env with per-server PerlSetEnv
- * and PerlPassEnv entries.
+ /* populate %ENV and r->subprocess_env with per-server PerlSetEnv
+ * and PerlPassEnv entries.
*
* although both are setup in %ENV in modperl_request_configure_server
* %ENV will be reset via modperl_env_request_unpopulate.
@@ -356,7 +356,7 @@
* normally, %ENV is only populated once per request (if at all) -
* just prior to content generation if +SetupEnv.
*
- * however, in the $r->subprocess_env() case it will be called
+ * however, in the $r->subprocess_env() case it will be called
* more than once - once for each void call, and once again just
* prior to content generation. while costly, the multiple
* passes are required, otherwise void calls would prohibit later
@@ -382,7 +382,7 @@
/* don't set up CGI variables again this request.
* this also triggers modperl_env_request_unpopulate, which
- * resets %ENV between requests - see modperl_config_request_cleanup
+ * resets %ENV between requests - see modperl_config_request_cleanup
*/
MpReqSETUP_ENV_On(rcfg);
}
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_error.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_error.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_error.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_error.c Thu Jun 26 05:20:45 2008
@@ -62,7 +62,7 @@
* line - set to the callers line number
* func - set to the function name
*/
-void modperl_croak(pTHX_ apr_status_t rc, const char* func)
+void modperl_croak(pTHX_ apr_status_t rc, const char* func)
{
HV *stash;
HV *data;
@@ -78,7 +78,7 @@
}
if (SvTRUE(ERRSV)) {
- Perl_croak(aTHX_ "%s", SvPV_nolen(ERRSV));
+ Perl_croak(aTHX_ "%s", SvPV_nolen(ERRSV));
}
stash = gv_stashpvn("APR::Error", 10, FALSE);
@@ -91,5 +91,5 @@
sv_setiv(*hv_fetch(data, "line", 4, 1), CopLINE(PL_curcop));
sv_setpv(*hv_fetch(data, "func", 4, 1), func);
- Perl_croak(aTHX_ Nullch);
+ Perl_croak(aTHX_ Nullch);
}
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_error.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_error.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_error.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_error.h Thu Jun 26 05:20:45 2008
@@ -25,7 +25,7 @@
#define MODPERL_FILTER_ERROR APR_OS_START_USERERR + 1
/**
- * return the string representation of the error code
+ * return the string representation of the error code
* @param rc error code
* @return the error string
*
@@ -34,7 +34,7 @@
* called again (which could happen indirectly). If unsure, copy.
*/
char *modperl_error_strerror(pTHX_ apr_status_t rc);
-
+
void modperl_croak(pTHX_ apr_status_t rc, const char* func);
#define MP_RUN_CROAK(rc_run, func) STMT_START \
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_filter.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_filter.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_filter.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_filter.c Thu Jun 26 05:20:45 2008
@@ -85,7 +85,7 @@
{
const char *name = f->frec->name;
- /* frec->name is always lowercased */
+ /* frec->name is always lowercased */
if (!strcasecmp(name, MP_FILTER_CONNECTION_INPUT_NAME) ||
!strcasecmp(name, MP_FILTER_CONNECTION_OUTPUT_NAME) ||
!strcasecmp(name, MP_FILTER_REQUEST_INPUT_NAME) ||
@@ -211,7 +211,7 @@
MP_TRACE_f(MP_FUNC, "\n\n\twrite out: %db [%s]\n"
"\t\tfrom %s\n\t\tto %s filter handler\n",
- len,
+ len,
MP_TRACE_STR_TRUNC(wb->pool, buf, len),
((wb->r && wb->filters == &wb->r->output_filters)
? "response handler" : "current filter handler"),
@@ -427,7 +427,7 @@
static int modperl_run_filter_init(ap_filter_t *f,
modperl_filter_mode_e mode,
- modperl_handler_t *handler)
+ modperl_handler_t *handler)
{
AV *args = Nullav;
int status;
@@ -438,7 +438,7 @@
apr_pool_t *p = r ? r->pool : c->pool;
modperl_filter_t *filter = modperl_filter_new(f, NULL, mode, 0, 0, 0);
- MP_dINTERP_SELECT(r, c, s);
+ MP_dINTERP_SELECT(r, c, s);
MP_TRACE_h(MP_FUNC, "running filter init handler %s\n",
modperl_handler_name(handler));
@@ -467,7 +467,7 @@
MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
"return: %d\n", modperl_handler_name(handler), status);
- return status;
+ return status;
}
@@ -1096,7 +1096,7 @@
/* XXX: I think this won't work as f->frec->name gets
* lowercased when added to the chain */
if (*fname == 'M' && strEQ(fname, name)) {
- modperl_handler_t *ctx_handler =
+ modperl_handler_t *ctx_handler =
((modperl_filter_ctx_t *)f->ctx)->handler;
if (modperl_handler_equal(ctx_handler, handlers[i])) {
@@ -1215,7 +1215,7 @@
modperl_filter_f_cleanup,
apr_pool_cleanup_null);
- /* has to resolve early so we can check for init functions */
+ /* has to resolve early so we can check for init functions */
if (!modperl_mgv_resolve(aTHX_ handler, pool, handler->name, TRUE)) {
Perl_croak(aTHX_ "unable to resolve handler %s\n",
modperl_handler_name(handler));
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_filter.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_filter.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_filter.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_filter.h Thu Jun 26 05:20:45 2008
@@ -25,9 +25,9 @@
#define MP_FILTER_CONNECTION_HANDLER 0x01
#define MP_FILTER_REQUEST_HANDLER 0x02
-#define MP_FILTER_HAS_INIT_HANDLER 0x04
-#define MP_FILTER_INIT_HANDLER 0x08
-#define MP_FILTER_HTTPD_HANDLER 0x10
+#define MP_FILTER_HAS_INIT_HANDLER 0x04
+#define MP_FILTER_INIT_HANDLER 0x08
+#define MP_FILTER_HTTPD_HANDLER 0x10
typedef ap_filter_t * MP_FUNC_T(modperl_filter_add_t) (const char *, void *,
request_rec *,
@@ -101,7 +101,7 @@
modperl_filter_t *filter,
SV *buffer,
apr_size_t wanted);
-
+
MP_INLINE apr_status_t modperl_input_filter_write(pTHX_
modperl_filter_t *filter,
const char *buf,
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_global.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_global.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_global.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_global.c Thu Jun 26 05:20:45 2008
@@ -185,11 +185,11 @@
{
int next;
/* XXX: inline lock/unlock? */
- modperl_global_lock(&MP_global_anon_cnt);
+ modperl_global_lock(&MP_global_anon_cnt);
next = ++*(int *)(MP_global_anon_cnt.data);
- modperl_global_unlock(&MP_global_anon_cnt);
+ modperl_global_unlock(&MP_global_anon_cnt);
return next;
}
@@ -250,7 +250,7 @@
static apr_status_t modperl_tls_reset(void *data)
{
- modperl_tls_cleanup_data_t *cdata =
+ modperl_tls_cleanup_data_t *cdata =
(modperl_tls_cleanup_data_t *)data;
return modperl_tls_set(cdata->key, cdata->data);
}
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_gtop.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_gtop.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_gtop.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_gtop.c Thu Jun 26 05:20:45 2008
@@ -53,7 +53,7 @@
modperl_gtop_t *modperl_gtop_new(apr_pool_t *p)
{
- modperl_gtop_t *gtop =
+ modperl_gtop_t *gtop =
(modperl_gtop_t *)apr_pcalloc(p, sizeof(*gtop));
gtop->pid = getpid();
@@ -83,8 +83,8 @@
#define SS_TYPE_AFTER 2
#define SS_TYPE_DIFF 3
-/*
- * XXX: this is pretty ugly,
+/*
+ * XXX: this is pretty ugly,
* but avoids allocating buffers for the size string
*/
static void modperl_gtop_proc_mem_size_string(modperl_gtop_t *gtop, int type)
@@ -110,7 +110,7 @@
#undef ss_call
}
-void modperl_gtop_report_proc_mem(modperl_gtop_t *gtop,
+void modperl_gtop_report_proc_mem(modperl_gtop_t *gtop,
char *when, const char *func, char *msg)
{
#define ss_item(item) gtop->proc_mem_ss.item
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_gtop.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_gtop.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_gtop.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_gtop.h Thu Jun 26 05:20:45 2008
@@ -43,7 +43,7 @@
char share[MP_GTOP_SSS];
char rss[MP_GTOP_SSS];
} modperl_gtop_proc_mem_ss;
-
+
typedef struct {
glibtop_union before;
glibtop_union after;
@@ -54,7 +54,7 @@
modperl_gtop_t *modperl_gtop_new(apr_pool_t *p);
void modperl_gtop_get_proc_mem_before(modperl_gtop_t *gtop);
void modperl_gtop_get_proc_mem_after(modperl_gtop_t *gtop);
-void modperl_gtop_report_proc_mem(modperl_gtop_t *gtop,
+void modperl_gtop_report_proc_mem(modperl_gtop_t *gtop,
char *when, const char *func, char *msg);
void modperl_gtop_report_proc_mem_diff(modperl_gtop_t *gtop, const char* func, char *msg);
void modperl_gtop_report_proc_mem_before(modperl_gtop_t *gtop, const char* func, char *msg);
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_handler.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_handler.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_handler.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_handler.c Thu Jun 26 05:20:45 2008
@@ -18,7 +18,7 @@
modperl_handler_t *modperl_handler_new(apr_pool_t *p, const char *name)
{
- modperl_handler_t *handler =
+ modperl_handler_t *handler =
(modperl_handler_t *)apr_pcalloc(p, sizeof(*handler));
switch (*name) {
@@ -71,7 +71,7 @@
* when perl_clone is called, each clone will clone that CV value, but
* we will still be able to find it, since we stored it in the
* hash. so we retrieve the CV value, whatever it is and we run it.
- *
+ *
* that explanation can be written and run in perl:
*
* use threads;
@@ -96,7 +96,7 @@
{
/* re-use modperl_mgv_t entry which is otherwise is not used
* by anon handlers */
- modperl_mgv_t *anon =
+ modperl_mgv_t *anon =
(modperl_mgv_t *)apr_pcalloc(p, sizeof(*anon));
anon->name = apr_psprintf(p, "anon%d", modperl_global_anon_cnt_next());
@@ -155,7 +155,7 @@
static
modperl_handler_t *modperl_handler_new_anon(pTHX_ apr_pool_t *p, CV *cv)
{
- modperl_handler_t *handler =
+ modperl_handler_t *handler =
(modperl_handler_t *)apr_pcalloc(p, sizeof(*handler));
MpHandlerPARSED_On(handler);
MpHandlerANON_On(handler);
@@ -359,7 +359,7 @@
* $r->push/set at request time will create entries in r->request_config
* push will first merge with configured handlers, unless an entry
* in r->request_config already exists. in this case, push or set has
- * already been called for the given handler,
+ * already been called for the given handler,
* r->request_config entries then override those in r->per_dir_config
*/
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_handler.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_handler.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_handler.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_handler.h Thu Jun 26 05:20:45 2008
@@ -27,7 +27,7 @@
MP_INLINE modperl_mgv_t *modperl_handler_anon_next(pTHX_ apr_pool_t *p);
MP_INLINE void modperl_handler_anon_add(pTHX_ modperl_mgv_t *anon, CV *cv);
MP_INLINE CV *modperl_handler_anon_get(pTHX_ modperl_mgv_t *anon);
-
+
#define modperl_handler_array_new(p) \
apr_array_make(p, 1, sizeof(modperl_handler_t *))
@@ -45,7 +45,7 @@
modperl_handler_t *modperl_handler_new_from_sv(pTHX_ apr_pool_t *p, SV *sv);
MP_INLINE const char *modperl_handler_name(modperl_handler_t *handler);
-
+
int modperl_handler_resolve(pTHX_ modperl_handler_t **handp,
apr_pool_t *p, server_rec *s);
@@ -66,7 +66,7 @@
modperl_handler_action_e action,
const char **desc);
-MpAV **modperl_handler_get_handlers(request_rec *r, conn_rec *c,server_rec *s,
+MpAV **modperl_handler_get_handlers(request_rec *r, conn_rec *c,server_rec *s,
apr_pool_t *p, const char *name,
modperl_handler_action_e action);
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_interp.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_interp.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_interp.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_interp.c Thu Jun 26 05:20:45 2008
@@ -55,7 +55,7 @@
PerlInterpreter *perl)
{
UV clone_flags = CLONEf_KEEP_PTR_TABLE;
- modperl_interp_t *interp =
+ modperl_interp_t *interp =
(modperl_interp_t *)malloc(sizeof(*interp));
memset(interp, '\0', sizeof(*interp));
@@ -244,7 +244,7 @@
apr_pool_t *server_pool = modperl_server_pool();
pTHX;
MP_dSCFG(s);
- modperl_interp_pool_t *mip =
+ modperl_interp_pool_t *mip =
(modperl_interp_pool_t *)apr_pcalloc(p, sizeof(*mip));
MP_TRACE_i(MP_FUNC, "server=%s\n", modperl_server_desc(s, p));
@@ -374,7 +374,7 @@
(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 */
@@ -467,7 +467,7 @@
* else scope must be per-connection
*/
- scope = (dcfg && !modperl_interp_scope_undef(dcfg)) ?
+ scope = (dcfg && !modperl_interp_scope_undef(dcfg)) ?
dcfg->interp_scope :
(r ? scfg->interp_scope : MP_INTERP_SCOPE_CONNECTION);
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_interp.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_interp.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_interp.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_interp.h Thu Jun 26 05:20:45 2008
@@ -100,7 +100,7 @@
apr_status_t modperl_interp_pool_destroy(void *data);
-typedef apr_status_t (*modperl_interp_mip_walker_t)(pTHX_
+typedef apr_status_t (*modperl_interp_mip_walker_t)(pTHX_
modperl_interp_pool_t *mip,
void *data);
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_io.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_io.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_io.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_io.c Thu Jun 26 05:20:45 2008
@@ -218,7 +218,7 @@
}
do_close(handle, FALSE);
- (void)hv_delete(gv_stashpv("Apache2::RequestIO", TRUE),
+ (void)hv_delete(gv_stashpv("Apache2::RequestIO", TRUE),
GvNAME(handle), GvNAMELEN(handle), G_DISCARD);
if (err != Nullsv) {
@@ -230,7 +230,7 @@
}
MP_INLINE void modperl_io_perlio_restore_stdout(pTHX_ GV *handle)
-{
+{
GV *handle_orig = gv_fetchpv("STDOUT", FALSE, SVt_PVIO);
MP_TRACE_o(MP_FUNC, "start");
@@ -265,7 +265,7 @@
}
do_close(handle, FALSE);
- (void)hv_delete(gv_stashpv("Apache2::RequestIO", TRUE),
+ (void)hv_delete(gv_stashpv("Apache2::RequestIO", TRUE),
GvNAME(handle), GvNAMELEN(handle), G_DISCARD);
if (err != Nullsv) {
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_io.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_io.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_io.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_io.h Thu Jun 26 05:20:45 2008
@@ -62,15 +62,15 @@
#if defined(MP_IO_TIE_SFIO)
/* XXX */
#elif defined(MP_IO_TIE_PERLIO)
-#define modperl_io_override_stdin modperl_io_perlio_override_stdin
-#define modperl_io_override_stdout modperl_io_perlio_override_stdout
-#define modperl_io_restore_stdin modperl_io_perlio_restore_stdin
-#define modperl_io_restore_stdout modperl_io_perlio_restore_stdout
+#define modperl_io_override_stdin modperl_io_perlio_override_stdin
+#define modperl_io_override_stdout modperl_io_perlio_override_stdout
+#define modperl_io_restore_stdin modperl_io_perlio_restore_stdin
+#define modperl_io_restore_stdout modperl_io_perlio_restore_stdout
#else
-#define modperl_io_override_stdin modperl_io_tie_stdin
-#define modperl_io_override_stdout modperl_io_tie_stdout
-#define modperl_io_restore_stdin modperl_io_handle_untie
-#define modperl_io_restore_stdout modperl_io_handle_untie
+#define modperl_io_override_stdin modperl_io_tie_stdin
+#define modperl_io_override_stdout modperl_io_tie_stdout
+#define modperl_io_restore_stdin modperl_io_handle_untie
+#define modperl_io_restore_stdout modperl_io_handle_untie
#endif
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_io_apache.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_io_apache.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_io_apache.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_io_apache.c Thu Jun 26 05:20:45 2008
@@ -98,7 +98,7 @@
{
/* XXX: we could return STDIN => 0, STDOUT => 1, but that wouldn't
* be correct, as the IO goes through the socket, may be we should
- * return the filedescriptor of the socket?
+ * return the filedescriptor of the socket?
*
* -1 in this case indicates that the layer cannot provide fileno
*/
@@ -139,7 +139,7 @@
rv = modperl_wbucket_write(aTHX_ rcfg->wbucket, vbuf, &count);
if (rv != APR_SUCCESS) {
- Perl_croak(aTHX_ modperl_error_strerror(aTHX_ rv));
+ Perl_croak(aTHX_ modperl_error_strerror(aTHX_ rv));
}
bytes += count;
@@ -224,7 +224,7 @@
NULL, /* can't seek on STD{IN|OUT}, fail on call*/
NULL, /* can't tell on STD{IN|OUT}, fail on call*/
PerlIOApache_close,
- PerlIOApache_flush,
+ PerlIOApache_flush,
PerlIOApache_noop_fail, /* fill */
PerlIOBase_eof,
PerlIOBase_error,
@@ -274,7 +274,7 @@
rc = ap_get_brigade(r->input_filters, bb, AP_MODE_READBYTES,
APR_BLOCK_READ, len);
- if (rc != APR_SUCCESS) {
+ if (rc != APR_SUCCESS) {
/* if we fail here, we want to stop trying to read data
* from the client.
*/
@@ -335,7 +335,3 @@
return total;
}
-
-
-
-
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_mgv.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_mgv.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_mgv.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_mgv.c Thu Jun 26 05:20:45 2008
@@ -156,7 +156,7 @@
return gv;
}
- /*
+ /*
* this VirtualHost has its own parent interpreter
* must require the module again with this server's THX
*/
@@ -322,8 +322,8 @@
if (!stash) {
return 0;
}
-
-
+
+
if (MpHandlerMETHOD(handler) && !handler->mgv_obj) {
char *name = HvNAME(stash);
if (!name) {
@@ -449,7 +449,7 @@
#ifdef USE_ITHREADS
if ((MpSrvPARENT(scfg) && MpSrvAUTOLOAD(scfg))
&& !modperl_mgv_lookup(aTHX_ handler->mgv_cv)) {
- /*
+ /*
* this VirtualHost has its own parent interpreter
* must require the module again with this server's THX
*/
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_module.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_module.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_module.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_module.c Thu Jun 26 05:20:45 2008
@@ -252,7 +252,7 @@
modperl_interp_unselect(interp);
MP_PERL_CONTEXT_RESTORE;
#endif
-
+
return (void *)mrg;
}
@@ -665,7 +665,7 @@
#ifdef USE_ITHREADS
MP_dSCFG(s);
dTHXa(scfg->mip->parent->perl);
-#endif
+#endif
module_cmds = (AV*)SvRV(mod_cmds);
fill = AvFILL(module_cmds);
@@ -790,7 +790,7 @@
HV *stash = gv_stashpv(modp->name, FALSE);
GV *gv = gv_fetchmethod_autoload(stash, method, FALSE);
- MP_TRACE_c(MP_FUNC, "looking for method %s in package `%s'...%sfound\n",
+ MP_TRACE_c(MP_FUNC, "looking for method %s in package `%s'...%sfound\n",
method, modp->name,
MP_isGV(gv) ? "" : "not ");
@@ -827,7 +827,7 @@
/* use this slot for our context */
modp->dynamic_load_handle = minfo;
- /*
+ /*
* XXX: we should lookup here if the Perl methods exist,
* and set these pointers only if they do.
*/
@@ -872,7 +872,7 @@
apr_hash_set(scfg->modules, apr_pstrdup(p, name), APR_HASH_KEY_STRING, modp);
#ifdef USE_ITHREADS
- /*
+ /*
* if the Perl module is loaded in the base server and a vhost
* has configuration directives from that module, but no mod_perl.c
* directives, scfg == NULL when modperl_module_cmd_take123 is run.
@@ -890,7 +890,7 @@
return NULL;
}
-SV *modperl_module_config_get_obj(pTHX_ SV *pmodule, server_rec *s,
+SV *modperl_module_config_get_obj(pTHX_ SV *pmodule, server_rec *s,
ap_conf_vector_t *v)
{
MP_dSCFG(s);
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_module.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_module.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_module.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_module.h Thu Jun 26 05:20:45 2008
@@ -24,7 +24,7 @@
const char *modperl_module_add(apr_pool_t *p, server_rec *s,
const char *name, SV *mod_cmds);
-SV *modperl_module_config_get_obj(pTHX_ SV *pmodule, server_rec *s,
+SV *modperl_module_config_get_obj(pTHX_ SV *pmodule, server_rec *s,
ap_conf_vector_t *v);
#endif /* MODPERL_MODULE_H */
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_options.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_options.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_options.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_options.c Thu Jun 26 05:20:45 2008
@@ -52,10 +52,10 @@
modperl_options_t *modperl_options_new(apr_pool_t *p, int type)
{
- modperl_options_t *options =
+ modperl_options_t *options =
(modperl_options_t *)apr_pcalloc(p, sizeof(*options));
- options->opts = options->unset =
+ options->opts = options->unset =
(type == MpSrvType ? MpSrv_f_UNSET : MpDir_f_UNSET);
return options;
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_pcw.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_pcw.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_pcw.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_pcw.c Thu Jun 26 05:20:45 2008
@@ -32,7 +32,7 @@
for (i = 0; i < sconf->sec_url->nelts; i++) {
core_dir_config *conf =
ap_get_module_config(urls[i], &core_module);
- void *dir_cfg = ap_get_module_config(urls[i], modp);
+ void *dir_cfg = ap_get_module_config(urls[i], modp);
if (!dir_cb(pconf, s, dir_cfg, conf->d, data)) {
break;
@@ -82,9 +82,9 @@
module *modp,
ap_pcw_dir_cb_t dir_cb, void *data)
{
- core_dir_config *conf =
+ core_dir_config *conf =
ap_get_module_config(s->lookup_defaults, &core_module);
- void *dir_cfg =
+ void *dir_cfg =
ap_get_module_config(s->lookup_defaults, modp);
dir_cb(pconf, s, dir_cfg, conf->d, data);
@@ -108,7 +108,7 @@
ap_pcw_dir_cb_t dir_cb, ap_pcw_srv_cb_t srv_cb)
{
for (; s; s = s->next) {
- core_dir_config *dconf =
+ core_dir_config *dconf =
ap_get_module_config(s->lookup_defaults,
&core_module);
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_perl.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_perl.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_perl.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_perl.c Thu Jun 26 05:20:45 2008
@@ -43,9 +43,9 @@
Perl_croak(aTHX_ "Usage: ModPerl::Util::exit(status=0)");
}
/* default: 0 */
- status = items < 1 ? 0 : (int)SvIV(ST(0));
+ status = items < 1 ? 0 : (int)SvIV(ST(0));
modperl_perl_exit(aTHX_ status);
-
+
XSRETURN_EMPTY;
}
@@ -71,11 +71,11 @@
#endif
#ifndef WIN32
ids->uid = getuid();
- ids->euid = geteuid();
- ids->gid = getgid();
- ids->egid = getegid();
+ ids->euid = geteuid();
+ ids->gid = getgid();
+ ids->egid = getegid();
- MP_TRACE_r(MP_FUNC,
+ MP_TRACE_r(MP_FUNC,
"pid=%d, "
#ifdef MP_MAINTAIN_PPID
"ppid=%d, "
@@ -134,7 +134,7 @@
void modperl_perl_destruct(PerlInterpreter *perl)
{
char **orig_environ = NULL;
- PTR_TBL_t *module_commands;
+ PTR_TBL_t *module_commands;
dTHXa(perl);
PERL_SET_CONTEXT(perl);
@@ -211,7 +211,7 @@
#endif
/* see modperl_hash_seed_set() */
-void modperl_hash_seed_init(apr_pool_t *p)
+void modperl_hash_seed_init(apr_pool_t *p)
{
#ifdef MP_NEED_HASH_SEED_FIXUP
char *s;
@@ -253,7 +253,7 @@
* it randomizes if perl was compiled with ccflags -DUSE_HASH_SEED
* or -DUSE_HASH_SEED_EXPLICIT, in which case we need to tell perl
* to use the same seed everywhere */
-void modperl_hash_seed_set(pTHX)
+void modperl_hash_seed_set(pTHX)
{
#ifdef MP_NEED_HASH_SEED_FIXUP
if (MP_init_hash_seed_set) {
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_perl_global.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_perl_global.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_perl_global.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_perl_global.c Thu Jun 26 05:20:45 2008
@@ -279,7 +279,7 @@
HvRITER(ohv) = hv_riter;
HvEITER(ohv) = hv_eiter;
- hv_magic(hv, Nullgv, 'E');
+ hv_magic(hv, Nullgv, 'E');
TAINT_NOT;
@@ -299,7 +299,7 @@
* at this point: modperl_env.c:modperl_env_const_vars[],
* PerlPassEnv and top-level PerlSetEnv
* XXX: still; could have have something faster than newHVhv()
- * especially if we add another GVHV to the globals table that
+ * especially if we add another GVHV to the globals table that
* might have more entries
*/
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_perl_unembed.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_perl_unembed.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_perl_unembed.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_perl_unembed.h Thu Jun 26 05:20:45 2008
@@ -43,4 +43,3 @@
#undef list
#endif /* MODPERL_PERL_UNEMBED_H */
-
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_tipool.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_tipool.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_tipool.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_tipool.c Thu Jun 26 05:20:45 2008
@@ -33,7 +33,7 @@
modperl_list_t *modperl_list_new()
{
- modperl_list_t *listp =
+ modperl_list_t *listp =
(modperl_list_t *)malloc(sizeof(*listp));
memset(listp, '\0', sizeof(*listp));
return listp;
@@ -277,7 +277,7 @@
/* XXX: this should never happen */
if (!head) {
- MP_TRACE_i(MP_FUNC, "PANIC: no items available, %d of %d in use\n",
+ MP_TRACE_i(MP_FUNC, "PANIC: no items available, %d of %d in use\n",
tipool->in_use, tipool->size);
abort();
}
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_types.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_types.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_types.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_types.h Thu Jun 26 05:20:45 2008
@@ -193,7 +193,7 @@
* - a subroutine name for named subs
* - NULL for anon subs
*/
- const char *name;
+ const char *name;
CV *cv;
U8 flags;
U32 attrs;
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_util.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_util.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_util.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_util.c Thu Jun 26 05:20:45 2008
@@ -344,7 +344,7 @@
sv_free((SV *)tmpav);
}
-static void modperl_package_unload_dynamic(pTHX_ const char *package,
+static void modperl_package_unload_dynamic(pTHX_ const char *package,
I32 dl_index)
{
AV *librefs = get_av(dl_librefs, 0);
@@ -356,7 +356,7 @@
modperl_av_remove_entry(aTHX_ get_av(dl_librefs, 0), dl_index);
modperl_av_remove_entry(aTHX_ get_av(dl_modules, 0), dl_index);
- return;
+ return;
}
static int modperl_package_is_dynamic(pTHX_ const char *package,
@@ -449,7 +449,7 @@
}
}
-/* XXX: same as Perl_do_sprintf();
+/* XXX: same as Perl_do_sprintf();
* but Perl_do_sprintf() is not part of the "public" api
*/
void modperl_perl_do_sprintf(pTHX_ SV *sv, I32 len, SV **sarg)
@@ -496,7 +496,7 @@
{
ENTER;
SAVESPTR(PL_diehook);
- PL_diehook = Nullsv;
+ PL_diehook = Nullsv;
modperl_croak(aTHX_ MODPERL_RC_EXIT, "ModPerl::Util::exit");
}
@@ -505,7 +505,7 @@
{
SV *retval = &PL_sv_undef;
- if (r && r->per_dir_config) {
+ if (r && r->per_dir_config) {
MP_dDCFG;
retval = modperl_table_get_set(aTHX_ dcfg->configvars,
key, sv_val, FALSE);
@@ -531,31 +531,31 @@
{
SV *retval = &PL_sv_undef;
- if (table == NULL) {
+ if (table == NULL) {
/* do nothing */
}
- else if (key == NULL) {
+ else if (key == NULL) {
retval = modperl_hash_tie(aTHX_ "APR::Table",
- Nullsv, (void*)table);
+ Nullsv, (void*)table);
}
else if (!sv_val) { /* no val was passed */
- char *val;
- if ((val = (char *)apr_table_get(table, key))) {
- retval = newSVpv(val, 0);
- }
- else {
- retval = newSV(0);
- }
- if (do_taint) {
- SvTAINTED_on(retval);
- }
+ char *val;
+ if ((val = (char *)apr_table_get(table, key))) {
+ retval = newSVpv(val, 0);
+ }
+ else {
+ retval = newSV(0);
+ }
+ if (do_taint) {
+ SvTAINTED_on(retval);
+ }
}
else if (!SvOK(sv_val)) { /* val was passed in as undef */
- apr_table_unset(table, key);
+ apr_table_unset(table, key);
}
- else {
+ else {
apr_table_set(table, key, SvPV_nolen(sv_val));
- }
+ }
return retval;
}
@@ -631,7 +631,7 @@
MP_TRACE_o(MP_FUNC, "read %d bytes from '%s'\n", size, r->filename);
if (r->finfo.size != size) {
- SvREFCNT_dec(sv);
+ SvREFCNT_dec(sv);
Perl_croak(aTHX_ "Error: read %d bytes, expected %d ('%s')",
size, (apr_size_t)r->finfo.size, r->filename);
}
@@ -705,10 +705,10 @@
SV *modperl_apr_array_header2avrv(pTHX_ apr_array_header_t *array)
{
- AV *av = newAV();
+ AV *av = newAV();
if (array) {
- int i;
+ int i;
for (i = 0; i < array->nelts; i++) {
av_push(av, newSVpv(((char **)array->elts)[i], 0));
}
@@ -741,7 +741,7 @@
}
/* Remove a package from %INC */
-static void modperl_package_delete_from_inc(pTHX_ const char *package)
+static void modperl_package_delete_from_inc(pTHX_ const char *package)
{
int len;
char *filename = package2filename(package, &len);
@@ -752,7 +752,7 @@
/* Destroy a package's stash */
#define MP_STASH_SUBSTASH(key, len) ((len >= 2) && \
(key[len-1] == ':') && \
- (key[len-2] == ':'))
+ (key[len-2] == ':'))
#define MP_STASH_DEBUGGER(key, len) ((len >= 2) && \
(key[0] == '_') && \
(key[1] == '<'))
@@ -818,7 +818,7 @@
*counter = 1;
apr_pool_userdata_set(counter, MP_RESTART_COUNT_KEY,
apr_pool_cleanup_null, p);
- }
+ }
}
int modperl_restart_count(void)
@@ -828,7 +828,7 @@
modperl_global_get_server_rec()->process->pool);
return data ? *(int *)data : 0;
}
-
+
static MP_INLINE
apr_status_t modperl_cleanup_pnotes(void *data) {
modperl_pnotes_t *pnotes = data;
@@ -845,7 +845,7 @@
modperl_interp_unselect(pnotes->interp);
pnotes->interp = NULL;
#endif
- return APR_SUCCESS;
+ return APR_SUCCESS;
}
void modperl_pnotes_kill(void *data) {
@@ -890,4 +890,3 @@
}
return newRV_inc((SV *)pnotes->pnotes);
}
-
Modified: perl/modperl/branches/threading/src/modules/perl/modperl_util.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_util.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_util.h (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_util.h Thu Jun 26 05:20:45 2008
@@ -27,7 +27,7 @@
}
/* turn off cgi header parsing. in case we are already inside
- * modperl_callback_per_dir(MP_RESPONSE_HANDLER, r, MP_HOOK_RUN_FIRST);
+ * modperl_callback_per_dir(MP_RESPONSE_HANDLER, r, MP_HOOK_RUN_FIRST);
* but haven't sent any data yet, it's too late to change
* MpReqPARSE_HEADERS, so change the wbucket's private flag directly
*/
@@ -35,7 +35,7 @@
MpReqPARSE_HEADERS_Off(rcfg); \
if (rcfg->wbucket) { \
rcfg->wbucket->header_parse = 0; \
- }
+ }
MP_INLINE server_rec *modperl_sv2server_rec(pTHX_ SV *sv);
MP_INLINE request_rec *modperl_sv2request_rec(pTHX_ SV *sv);
@@ -81,7 +81,7 @@
MP_INLINE SV *modperl_dir_config(pTHX_ request_rec *r, server_rec *s,
char *key, SV *sv_val);
-
+
SV *modperl_table_get_set(pTHX_ apr_table_t *table, char *key,
SV *sv_val, int do_taint);
Modified: perl/modperl/branches/threading/xs/APR/Base64/APR__Base64.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/Base64/APR__Base64.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Base64/APR__Base64.h (original)
+++ perl/modperl/branches/threading/xs/APR/Base64/APR__Base64.h Thu Jun 26 05:20:45 2008
@@ -17,7 +17,7 @@
/* apr_base64_encode_len and apr_base64_encode_binary give length that
* includes the terminating '\0' */
#define mpxs_APR__Base64_encode_len(len) (apr_base64_encode_len(len) - 1)
-
+
static MP_INLINE void mpxs_apr_base64_encode(pTHX_ SV *sv, SV *arg)
{
STRLEN len;
Modified: perl/modperl/branches/threading/xs/APR/Brigade/APR__Brigade.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/Brigade/APR__Brigade.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Brigade/APR__Brigade.h (original)
+++ perl/modperl/branches/threading/xs/APR/Brigade/APR__Brigade.h Thu Jun 26 05:20:45 2008
@@ -97,7 +97,7 @@
static MP_INLINE
apr_pool_t *mpxs_APR__Brigade_pool(apr_bucket_brigade *brigade)
{
- /* eesh, it's r->pool, and c->pool, but bb->p
+ /* eesh, it's r->pool, and c->pool, but bb->p
* let's make Perl consistent, otherwise this could be autogenerated
*/
Modified: perl/modperl/branches/threading/xs/APR/Bucket/APR__Bucket.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/Bucket/APR__Bucket.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Bucket/APR__Bucket.h (original)
+++ perl/modperl/branches/threading/xs/APR/Bucket/APR__Bucket.h Thu Jun 26 05:20:45 2008
@@ -119,6 +119,6 @@
* by modperl_bucket_sv_setaside) if the pool goes out of scope,
* copying the data to the heap.
*/
-
+
return rc;
}
Modified: perl/modperl/branches/threading/xs/APR/BucketAlloc/APR__BucketAlloc.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/BucketAlloc/APR__BucketAlloc.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/BucketAlloc/APR__BucketAlloc.h (original)
+++ perl/modperl/branches/threading/xs/APR/BucketAlloc/APR__BucketAlloc.h Thu Jun 26 05:20:45 2008
@@ -27,4 +27,3 @@
mpxs_add_pool_magic(ba_sv, p_sv);
return ba_sv;
}
-
Modified: perl/modperl/branches/threading/xs/APR/Error/APR__Error.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/Error/APR__Error.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Error/APR__Error.h (original)
+++ perl/modperl/branches/threading/xs/APR/Error/APR__Error.h Thu Jun 26 05:20:45 2008
@@ -15,4 +15,3 @@
*/
#define mpxs_APR__Error_strerror(rc) modperl_error_strerror(aTHX_ rc)
-
Modified: perl/modperl/branches/threading/xs/APR/Finfo/APR__Finfo.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/Finfo/APR__Finfo.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Finfo/APR__Finfo.h (original)
+++ perl/modperl/branches/threading/xs/APR/Finfo/APR__Finfo.h Thu Jun 26 05:20:45 2008
@@ -21,12 +21,12 @@
apr_pool_t *p = mp_xs_sv2_APR__Pool(p_sv);
apr_finfo_t *finfo = (apr_finfo_t *)apr_pcalloc(p, sizeof(apr_finfo_t));
SV *finfo_sv;
-
+
MP_RUN_CROAK(apr_stat(finfo, fname, wanted, p),
"APR::Finfo::stat");
finfo_sv = sv_setref_pv(NEWSV(0, 0), "APR::Finfo", (void*)finfo);
mpxs_add_pool_magic(finfo_sv, p_sv);
-
+
return finfo_sv;
}
Modified: perl/modperl/branches/threading/xs/APR/Lock/APR__Lock.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/Lock/APR__Lock.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Lock/APR__Lock.h (original)
+++ perl/modperl/branches/threading/xs/APR/Lock/APR__Lock.h Thu Jun 26 05:20:45 2008
@@ -13,4 +13,3 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
Modified: perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.c?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.c (original)
+++ perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.c Thu Jun 26 05:20:45 2008
@@ -86,7 +86,7 @@
switch (*mode) {
case 'a':
apr_flag = APR_APPEND | APR_CREATE;
- break;
+ break;
case 'w':
apr_flag = APR_WRITE | APR_CREATE | APR_TRUNCATE;
break;
@@ -184,7 +184,7 @@
return count;
}
else if (rc != APR_SUCCESS) {
- modperl_croak(aTHX_ rc, "APR::PerlIO::read");
+ modperl_croak(aTHX_ rc, "APR::PerlIO::read");
}
return count;
@@ -294,7 +294,7 @@
apr_file_name_get(&new_path, st->file);
}
- rc = apr_os_file_get(&os_file, st->file);
+ rc = apr_os_file_get(&os_file, st->file);
if (rc != APR_SUCCESS) {
Perl_croak(aTHX_ "filedes retrieval failed!");
}
@@ -408,7 +408,7 @@
PerlIOAPR_read,
PerlIOBase_unread,
PerlIOAPR_write,
- PerlIOAPR_seek,
+ PerlIOAPR_seek,
PerlIOAPR_tell,
PerlIOAPR_close,
PerlIOAPR_flush, /* flush */
@@ -475,7 +475,7 @@
apr_os_file_t os_file;
/* convert to the OS representation of file */
- rc = apr_os_file_get(&os_file, file);
+ rc = apr_os_file_get(&os_file, file);
if (rc != APR_SUCCESS) {
croak("filedes retrieval failed!");
}
@@ -495,10 +495,10 @@
static SV *modperl_apr_perlio_PerlIO_to_glob(pTHX_ PerlIO *pio,
modperl_apr_perlio_hook_e type)
{
- SV *retval = modperl_perl_gensym(aTHX_ "APR::PerlIO");
- GV *gv = (GV*)SvRV(retval);
+ SV *retval = modperl_perl_gensym(aTHX_ "APR::PerlIO");
+ GV *gv = (GV*)SvRV(retval);
- gv_IOadd(gv);
+ gv_IOadd(gv);
switch (type) {
case MODPERL_APR_PERLIO_HOOK_WRITE:
@@ -553,7 +553,7 @@
};
/* convert to the OS representation of file */
- rc = apr_os_file_get(&os_file, file);
+ rc = apr_os_file_get(&os_file, file);
if (rc != APR_SUCCESS) {
Perl_croak(aTHX_ "filedes retrieval failed!");
}
@@ -564,7 +564,7 @@
fd = PerlLIO_dup(os_file);
MP_TRACE_o(MP_FUNC, "fd old: %d, new %d\n", os_file, fd);
- if (!(retval = PerlIO_fdopen(fd, mode))) {
+ if (!(retval = PerlIO_fdopen(fd, mode))) {
...
}
@@ -576,22 +576,22 @@
*/
- if (!(retval = PerlIO_fdopen(os_file, mode))) {
+ if (!(retval = PerlIO_fdopen(os_file, mode))) {
PerlLIO_close(fd);
Perl_croak(aTHX_ "fdopen failed!");
- }
+ }
return retval;
}
-SV *modperl_apr_perlio_apr_file_to_glob(pTHX_ apr_file_t *file,
+SV *modperl_apr_perlio_apr_file_to_glob(pTHX_ apr_file_t *file,
apr_pool_t *pool,
modperl_apr_perlio_hook_e type)
{
- SV *retval = modperl_perl_gensym(aTHX_ "APR::PerlIO");
- GV *gv = (GV*)SvRV(retval);
+ SV *retval = modperl_perl_gensym(aTHX_ "APR::PerlIO");
+ GV *gv = (GV*)SvRV(retval);
- gv_IOadd(gv);
+ gv_IOadd(gv);
switch (type) {
case MODPERL_APR_PERLIO_HOOK_WRITE:
@@ -616,4 +616,3 @@
}
#endif /* PERLIO_LAYERS */
-
Modified: perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.h (original)
+++ perl/modperl/branches/threading/xs/APR/PerlIO/modperl_apr_perlio.h Thu Jun 26 05:20:45 2008
@@ -19,7 +19,7 @@
#ifdef PERLIO_LAYERS
#include "perliol.h"
-#else
+#else
#include "iperlsys.h"
#endif
@@ -54,7 +54,7 @@
#ifndef MP_SOURCE_SCAN
#ifdef PERLIO_LAYERS
-PerlIO *modperl_apr_perlio_apr_file_to_PerlIO(pTHX_ apr_file_t *file,
+PerlIO *modperl_apr_perlio_apr_file_to_PerlIO(pTHX_ apr_file_t *file,
apr_pool_t *pool,
modperl_apr_perlio_hook_e type);
APR_DECLARE_OPTIONAL_FN(PerlIO *,
@@ -64,7 +64,7 @@
#endif /* PERLIO_LAYERS */
-SV *modperl_apr_perlio_apr_file_to_glob(pTHX_ apr_file_t *file,
+SV *modperl_apr_perlio_apr_file_to_glob(pTHX_ apr_file_t *file,
apr_pool_t *pool,
modperl_apr_perlio_hook_e type);
APR_DECLARE_OPTIONAL_FN(SV *,
Modified: perl/modperl/branches/threading/xs/APR/Pool/APR__Pool.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/Pool/APR__Pool.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Pool/APR__Pool.h (original)
+++ perl/modperl/branches/threading/xs/APR/Pool/APR__Pool.h Thu Jun 26 05:20:45 2008
@@ -64,7 +64,7 @@
mg_free(acct->sv); \
SvIVX(acct->sv) = 0; \
} STMT_END
-
+
#ifdef USE_ITHREADS
#define MP_APR_POOL_SV_DROPS_OWNERSHIP(acct) STMT_START { \
@@ -221,7 +221,7 @@
if (parent_pool) {
mpxs_add_pool_magic(rv, parent_pool_obj);
}
-
+
return rv;
}
}
@@ -381,4 +381,3 @@
apr_pool_destroy(p);
}
}
-
Modified: perl/modperl/branches/threading/xs/APR/String/APR__String.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/String/APR__String.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/String/APR__String.h (original)
+++ perl/modperl/branches/threading/xs/APR/String/APR__String.h Thu Jun 26 05:20:45 2008
@@ -21,5 +21,5 @@
apr_strfsize(size, buff);
- return newSVpvn(buff, 4);
+ return newSVpvn(buff, 4);
}
Modified: perl/modperl/branches/threading/xs/APR/Table/APR__Table.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/Table/APR__Table.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/Table/APR__Table.h (original)
+++ perl/modperl/branches/threading/xs/APR/Table/APR__Table.h Thu Jun 26 05:20:45 2008
@@ -91,8 +91,8 @@
return rv;
}
-static MP_INLINE
-int mpxs_apr_table_do(pTHX_ I32 items, SV **MARK, SV **SP)
+static MP_INLINE
+int mpxs_apr_table_do(pTHX_ I32 items, SV **MARK, SV **SP)
{
apr_table_t *table;
SV *sub;
@@ -119,8 +119,8 @@
}
}
- /* XXX: would be nice to be able to call apr_table_vdo directly,
- * but I don't think it's possible to create/populate something
+ /* XXX: would be nice to be able to call apr_table_vdo directly,
+ * but I don't think it's possible to create/populate something
* that smells like a va_list with our list of filters specs
*/
@@ -154,7 +154,7 @@
"first argument not an APR::Table object");
}
- t = INT2PTR(apr_table_t *, SvIVX(SvRV(rv)));
+ t = INT2PTR(apr_table_t *, SvIVX(SvRV(rv)));
if (apr_is_empty_table(t)) {
return NULL;
Modified: perl/modperl/branches/threading/xs/APR/URI/APR__URI.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/URI/APR__URI.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/URI/APR__URI.h (original)
+++ perl/modperl/branches/threading/xs/APR/URI/APR__URI.h Thu Jun 26 05:20:45 2008
@@ -47,7 +47,7 @@
uri_sv = sv_setref_pv(NEWSV(0, 0), "APR::URI", (void*)uri);
mpxs_add_pool_magic(uri_sv, p_sv);
-
+
return uri_sv;
}
Modified: perl/modperl/branches/threading/xs/Apache2/Access/Apache2__Access.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/Access/Apache2__Access.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/Access/Apache2__Access.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/Access/Apache2__Access.h Thu Jun 26 05:20:45 2008
@@ -37,16 +37,16 @@
hv = newHV();
- hv_store(hv, "method_mask", 11,
+ hv_store(hv, "method_mask", 11,
newSViv((IV)reqs[x].method_mask), 0);
- hv_store(hv, "requirement", 11,
+ hv_store(hv, "requirement", 11,
newSVpv(reqs[x].requirement,0), 0);
av_push(av, newRV_noinc((SV*)hv));
}
- return newRV_noinc((SV*)av);
+ return newRV_noinc((SV*)av);
}
static MP_INLINE
@@ -81,7 +81,7 @@
errmsg =
modperl_config_insert_request(aTHX_ r,
newRV_noinc((SV*)config),
- OR_AUTHCFG, NULL,
+ OR_AUTHCFG, NULL,
MP_HTTPD_OVERRIDE_OPTS_UNSET);
if (errmsg) {
@@ -147,7 +147,7 @@
int mpxs_Apache2__RequestRec_allow_override_opts(pTHX_ request_rec *r)
{
#ifdef MP_HTTPD_HAS_OVERRIDE_OPTS
- core_dir_config *cfg = ap_get_module_config(r->per_dir_config,
+ core_dir_config *cfg = ap_get_module_config(r->per_dir_config,
&core_module);
return cfg->override_opts;
#else
Modified: perl/modperl/branches/threading/xs/Apache2/CmdParms/Apache2__CmdParms.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/CmdParms/Apache2__CmdParms.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/CmdParms/Apache2__CmdParms.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/CmdParms/Apache2__CmdParms.h Thu Jun 26 05:20:45 2008
@@ -25,7 +25,7 @@
return newSVpv(data, 0);
}
- return &PL_sv_undef;
+ return &PL_sv_undef;
}
static MP_INLINE
Modified: perl/modperl/branches/threading/xs/Apache2/Connection/Apache2__Connection.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/Connection/Apache2__Connection.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/Connection/Apache2__Connection.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/Connection/Apache2__Connection.h Thu Jun 26 05:20:45 2008
@@ -40,4 +40,3 @@
{
return ap_get_remote_host(c, (void *)dir_config, type, NULL);
}
-
Modified: perl/modperl/branches/threading/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h?rev=671871&r1=671870&r2=671871&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h (original)
+++ perl/modperl/branches/threading/xs/Apache2/ConnectionUtil/Apache2__ConnectionUtil.h Thu Jun 26 05:20:45 2008
@@ -20,11 +20,11 @@
MP_dCCFG;
modperl_config_con_init(c, ccfg);
-
+
if (!ccfg) {
return &PL_sv_undef;
}
-
+
return modperl_pnotes(aTHX_ &ccfg->pnotes, key, val, c->pool);
}