cholet 00/07/24 06:33:03
Modified:src/modules/perl mod_perl.h perl_config.c
Log:
revert my latest change, my editor suddenly decided to untabify everything, burying
the actual change
Revision ChangesPath
1.100 +34 -34modperl/src/modules/perl/mod_perl.h
Index: mod_perl.h
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- mod_perl.h2000/07/24 13:22:55 1.99
+++ mod_perl.h2000/07/24 13:33:00 1.100
@@ -64,7 +64,7 @@
#include malloc.h
#include win32.h
#include win32iop.h
-#include fcntl.h // For O_BINARY
+#include fcntl.h // For O_BINARY
#include "EXTERN.h"
#include "perl.h"
#include iperlsys.h
@@ -195,7 +195,7 @@
#endif
#ifndef AvFILLp
-#define AvFILLp(av) ((XPVAV*) SvANY(av))-xav_fill
+#define AvFILLp(av) ((XPVAV*) SvANY(av))-xav_fill
#endif
#ifdef eval_pv
@@ -300,7 +300,7 @@
#define av_copy_array(av) av_make(av_len(av)+1, AvARRAY(av))
#ifndef newRV_noinc
-#define newRV_noinc(sv) ((Sv = newRV(sv)), --SvREFCNT(SvRV(Sv)), Sv)
+#define newRV_noinc(sv) ((Sv = newRV(sv)), --SvREFCNT(SvRV(Sv)), Sv)
#endif
#ifndef SvTAINTED_on
@@ -349,14 +349,14 @@
#define mp_debug mod_perl_debug_flags
-extern U32 mp_debug;
+extern U32 mp_debug;
#ifdef PERL_TRACE
-#define MP_TRACE(a) if (mp_debug) a
-#define MP_TRACE_d(a) if (mp_debug 1) a /* directives */
-#define MP_TRACE_s(a) if (mp_debug 2) a /* perl sections */
-#define MP_TRACE_h(a) if (mp_debug 4) a /* handlers */
-#define MP_TRACE_g(a) if (mp_debug 8) a /* globals and allocation */
+#define MP_TRACE(a) if (mp_debug) a
+#define MP_TRACE_d(a) if (mp_debug 1) a /* directives */
+#define MP_TRACE_s(a) if (mp_debug 2) a /* perl sections */
+#define MP_TRACE_h(a) if (mp_debug 4) a /* handlers */
+#define MP_TRACE_g(a) if (mp_debug 8) a /* globals and allocation */
#define MP_TRACE_c(a) if (mp_debug 16) a /* directive handlers */
#ifndef PERL_MARK_WHERE
#define PERL_MARK_WHERE
@@ -405,14 +405,14 @@
#define MPf_Off -1
#define MPf_None 0
-#define MPf_INCPUSH 0x0100 /* use lib split ":", $ENV{PERL5LIB} */
-#define MPf_SENDHDR 0x0200 /* is PerlSendHeader On? */
-#define MPf_SENTHDR 0x0400 /* has PerlSendHeader sent the headers? */
-#define MPf_ENV 0x0800 /* PerlSetupEnv */
-#define MPf_HASENV 0x1000 /* do we have any PerlSetEnv's? */
-#define MPf_DSTDERR 0x2000 /* redirect stderr to error_log */
-#define MPf_CLEANUP 0x4000 /* did we register our cleanup ? */
-#define MPf_RCLEANUP0x8000 /* for $r-register_cleanup */
+#define MPf_INCPUSH 0x0100 /* use lib split ":", $ENV{PERL5LIB} */
+#define MPf_SENDHDR 0x0200 /* is PerlSendHeader On? */
+#define MPf_SENTHDR 0x0400 /* has PerlSendHeader sent the headers? */
+#define MPf_ENV 0x0800 /* PerlSetupEnv */
+#define MPf_HASENV 0x1000 /* do we have any PerlSetEnv's? */
+#define MPf_DSTDERR 0x2000 /* redirect stderr to error_log */
+#define MPf_CLEANUP 0x4000 /* did we register our cleanup ? */
+#define MPf_RCLEANUP 0x8000 /* for $r-register_cleanup */
#define MP_FMERGE(new,add,base,f) \
if((add-flags f) || (base-flags f)) \
@@ -442,7 +442,7 @@
#define MP_ENV_off(d)(d-flags = ~MPf_ENV)
#endif
-#define MP_ENV(d) (d-SetupEnv != MPf_Off)
+#define MP_ENV(d) (d-SetupEnv == MPf_On)
#define MP_ENV_on(d)(d-SetupEnv = MPf_On)
#define MP_ENV_off(d) (d-SetupEnv = MPf_Off)
@@ -535,13 +535,13 @@
#define HAS_CONTEXT MODULE_MAGIC_AT_LEAST(MMN_136,2)
#if HAS_CONTEXT
-#define CAN_SELF_BOOT_SECTIONS (PERL_SECTIONS_SELF_BOOT)
-#define SECTION_ALLOWED OR_ALL
-#define USABLE_CONTEXT parms-context
-#else
-#define CAN_SELF_BOOT_SECTIONS ((parms-path==NULL)PERL_SECTIONS_SELF_BOOT)
-#define SECTION_ALLOWED RSRC_CONF
-#define USABLE_CONTEXT parms-server-lookup_defaults
+#define CAN_SELF_BOOT_SECTIONS (PERL_SECTIONS_SELF_BOOT)
+#define SECTION_ALLOWED OR_ALL
+#define USABLE_CONTEXT parms-context
+#else
+#define CAN_SELF_BOOT_SECTIONS ((parms-path==NULL)PERL_SECTIONS_SELF_BOOT)
+#define SECTION_ALLOWED RSRC_CONF
+#define USABLE_CONTEXT parms-server-lookup_defaults
#endif
#define APACHE_SSL_12X (defined(APACHE_SSL) (MODULE_MAGIC_NUMBER MMN_130))
@@ -598,7 +598,7 @@
"access to %s failed for %s, reason: %s", \
file, \
get_remote_host(r-connection, \
-r-per_dir_config, REMOTE_NAME), \
+ r-per_dir_config,
