cvs commit: modperl/src/modules/perl mod_perl.c mod_perl.h
dougm 02/05/22 21:35:16
Modified:src/modules/perl mod_perl.c mod_perl.h
Log:
fix fix to compile with ithreads
Revision ChangesPath
1.145 +2 -2 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- mod_perl.c23 May 2002 04:03:46 - 1.144
+++ mod_perl.c23 May 2002 04:35:16 - 1.145
@@ -578,9 +578,9 @@
perl_require_module("DynaLoader", NULL);
}
-static void mod_perl_xs_init(void)
+static void mod_perl_xs_init(pTHX)
{
-xs_init();
+xs_init(aTHX);
/* XXX: in 5.7.2+ we can call the body of mod_perl_boot here
* but in 5.6.1 the Perl runtime is not properly setup yet
1.116 +2 -0 modperl/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.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mod_perl.h23 May 2002 04:03:46 - 1.115
+++ mod_perl.h23 May 2002 04:35:16 - 1.116
@@ -168,6 +168,8 @@
#ifndef PERL_IS_5_6
#define pTHX_
#define aTHXo_
+#define aTHX
+#define pTHX
#define CopFILEGV(cop) cop->cop_filegv
#define CopLINE(cop) cop->cop_line
#define CopLINE_set(c,l) (CopLINE(c) = (l))
cvs commit: modperl/src/modules/perl mod_perl.c mod_perl.h
dougm 02/05/22 21:03:46
Modified:src/modules/perl mod_perl.c mod_perl.h
Log:
better fix for DynaLoader vs XSLoader workaround
Revision ChangesPath
1.144 +23 -1 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- mod_perl.c24 Mar 2002 23:01:33 - 1.143
+++ mod_perl.c23 May 2002 04:03:46 - 1.144
@@ -569,6 +569,28 @@
perl_startup(s, p);
}
+static void mod_perl_boot(void *data)
+{
+/* make sure DynaLoader is loaded before XSLoader
+ * to workaround bug in 5.6.1 that can trigger a segv
+ * when using modperl as a dso
+ */
+perl_require_module("DynaLoader", NULL);
+}
+
+static void mod_perl_xs_init(void)
+{
+xs_init();
+
+/* XXX: in 5.7.2+ we can call the body of mod_perl_boot here
+ * but in 5.6.1 the Perl runtime is not properly setup yet
+ * so we have to pull this stunt to delay
+ */
+#ifdef SAVEDESTRUCTOR_X
+SAVEDESTRUCTOR_X(mod_perl_boot, 0);
+#endif
+}
+
void perl_startup (server_rec *s, pool *p)
{
char *argv[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
@@ -677,7 +699,7 @@
MP_TRACE_g(fprintf(stderr, "constructing perl interpreter...ok\n"));
perl_construct(perl);
-status = perl_parse(perl, xs_init, argc, argv, NULL);
+status = perl_parse(perl, mod_perl_xs_init, argc, argv, NULL);
if (status != OK) {
MP_TRACE_g(fprintf(stderr,"not ok, status=%d\n", status));
perror("parse");
1.115 +0 -1 modperl/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.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- mod_perl.h23 May 2002 03:07:27 - 1.114
+++ mod_perl.h23 May 2002 04:03:46 - 1.115
@@ -1192,7 +1192,6 @@
/* perl_config.c */
#define require_Apache(s) \
-perl_require_module("DynaLoader", s); \
perl_require_module("Apache", s)
char *mod_perl_auth_name(request_rec *r, char *val);
cvs commit: modperl/src/modules/perl mod_perl.c mod_perl.h perl_util.c
dougm 02/03/24 15:01:33
Modified:.Changes STATUS
src/modules/perl mod_perl.c mod_perl.h perl_util.c
Log:
Submitted by: Tatsuhiko Miyagawa <[EMAIL PROTECTED]>
Reviewed by: dougm
PERL5LIB support now properly unshifts paths into @INC rather than push
Revision ChangesPath
1.636 +3 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -r1.635 -r1.636
--- Changes 24 Mar 2002 22:51:04 - 1.635
+++ Changes 24 Mar 2002 23:01:33 - 1.636
@@ -10,6 +10,9 @@
=item 1.26_01-dev
+PERL5LIB support now properly unshifts paths into @INC rather than push
+[Tatsuhiko Miyagawa <[EMAIL PROTECTED]>]
+
do not clear symbol tables within a package in perl_clear_symtab()
used by directive handler extensions
[Stephen Clouse <[EMAIL PROTECTED]>]
1.12 +1 -7 modperl/STATUS
Index: STATUS
===
RCS file: /home/cvs/modperl/STATUS,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- STATUS24 Mar 2002 22:51:04 - 1.11
+++ STATUS24 Mar 2002 23:01:33 - 1.12
@@ -1,5 +1,5 @@
mod_perl 1.3 STATUS:
- Last modified at [$Date: 2002/03/24 22:51:04 $]
+ Last modified at [$Date: 2002/03/24 23:01:33 $]
Release:
@@ -37,12 +37,6 @@
Report:
http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=98278446807561&w=2
Status:
patch available
-
-* PERL5LIB should unshift @INC instead of push
-Report:
http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=100434522809036&w=2
-Status:
- patch available
-
Needs Patch or Further Investigation
1.143 +2 -2 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- mod_perl.c24 Mar 2002 18:22:56 - 1.142
+++ mod_perl.c24 Mar 2002 23:01:33 - 1.143
@@ -747,7 +747,7 @@
#endif
#ifdef APACHE_PERL5LIB
-perl_incpush(APACHE_PERL5LIB);
+perl_inc_unshift(APACHE_PERL5LIB);
#else
av_push(GvAV(incgv), newSVpv(server_root_relative(p,""),0));
av_push(GvAV(incgv), newSVpv(server_root_relative(p,"lib/perl"),0));
@@ -1412,7 +1412,7 @@
char *path = (char *)table_get(r->subprocess_env, "PERL5LIB");
if (path) {
- perl_incpush(path);
+ perl_inc_unshift(path);
MP_INCPUSH_on(cld);
}
}
1.113 +1 -1 modperl/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.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- mod_perl.h24 Mar 2002 20:57:23 - 1.112
+++ mod_perl.h24 Mar 2002 23:01:33 - 1.113
@@ -1179,7 +1179,7 @@
void mod_perl_init_ids(void);
int perl_eval_ok(server_rec *s);
int perl_sv_is_http_code(SV *sv, int *status);
-void perl_incpush(char *s);
+void perl_inc_unshift(char *s);
SV *mod_perl_sv_name(SV *svp);
void mod_perl_mark_where(char *where, SV *sub);
1.47 +3 -2 modperl/src/modules/perl/perl_util.c
Index: perl_util.c
===
RCS file: /home/cvs/modperl/src/modules/perl/perl_util.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- perl_util.c 17 Apr 2001 21:30:02 - 1.46
+++ perl_util.c 24 Mar 2002 23:01:33 - 1.47
@@ -785,7 +785,7 @@
#define PERLLIB_SEP ':'
#endif
-void perl_incpush(char *p)
+void perl_inc_unshift(char *p)
{
if(!p) return;
@@ -803,7 +803,8 @@
sv_setpv(libdir, p);
p = Nullch;
}
- av_push(GvAV(incgv), libdir);
+ av_unshift(GvAV(incgv), 1);
+ av_store(GvAV(incgv), 0, libdir);
}
}
cvs commit: modperl/src/modules/perl mod_perl.c mod_perl.h perl_config.c
dougm 01/06/18 20:12:48
Modified:.Makefile.PL
src/modules/perl mod_perl.c mod_perl.h perl_config.c
Log:
remove dead code for PERL_STARTUP_{IS_DONE,DONE_CHECK} hack
Revision ChangesPath
1.187 +0 -2 modperl/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- Makefile.PL 2001/06/14 04:49:07 1.186
+++ Makefile.PL 2001/06/19 03:12:41 1.187
@@ -232,8 +232,6 @@
my %experimental = map { $_,1 } qw{
PERL_AUTOPRELOAD
-PERL_DSO_UNLOAD
-PERL_STARTUP_DONE_CHECK
PERL_RUN_XS
PERL_MARK_WHERE
DO_INTERNAL_REDIRECT
1.140 +5 -21 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- mod_perl.c2001/06/19 02:38:54 1.139
+++ mod_perl.c2001/06/19 03:12:44 1.140
@@ -603,7 +603,7 @@
dstr = NULL;
#endif
-if(PERL_RUNNING() && PERL_STARTUP_IS_DONE) {
+if(PERL_RUNNING()) {
saveINC;
mp_check_version();
#if !HAS_MMN_136
@@ -760,22 +760,6 @@
GvIMPORTED_CV_on(exitgp);
}
-if(PERL_STARTUP_DONE_CHECK) {
- char *psd = getenv("PERL_STARTUP_DONE");
- if (!psd) {
- MP_TRACE_g(fprintf(stderr,
-"mod_perl: PerlModule,PerlRequire postponed\n"));
- my_setenv("PERL_STARTUP_DONE", "1");
- saveINC;
- return;
- }
- else {
- MP_TRACE_g(fprintf(stderr,
-"mod_perl: postponed PerlModule,PerlRequire
enabled\n"));
- my_setenv("PERL_STARTUP_DONE", "2");
- }
-}
-
ENTER_SAFE(s,p);
MP_TRACE_g(mod_perl_dump_opmask());
@@ -808,10 +792,10 @@
#endif
saveINC;
-#if MODULE_MAGIC_NUMBER >= MMN_130
-if(perl_module.dynamic_load_handle)
- register_cleanup(p, p, mp_dso_unload, null_cleanup);
-#endif
+
+if (PERL_IS_DSO) {
+ register_cleanup(p, p, mp_dso_unload, null_cleanup);
+}
}
int mod_perl_sent_header(request_rec *r, int val)
1.109 +0 -11 modperl/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.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- mod_perl.h2001/02/16 23:30:27 1.108
+++ mod_perl.h2001/06/19 03:12:45 1.109
@@ -503,17 +503,6 @@
# endif
#endif
-#ifndef PERL_STARTUP_DONE_CHECK
-#define PERL_STARTUP_DONE_CHECK getenv("PERL_STARTUP_DONE_CHECK")
-#endif
-
-#define PERL_STARTUP_IS_DONE \
-(!PERL_STARTUP_DONE_CHECK || strEQ(getenv("PERL_STARTUP_DONE"), "2"))
-
-#ifndef PERL_DSO_UNLOAD
-#define PERL_DSO_UNLOAD getenv("PERL_DSO_UNLOAD")
-#endif
-
#ifdef APACHE_SSL
#define PERL_DONE_STARTUP 1
#else
1.110 +22 -26modperl/src/modules/perl/perl_config.c
Index: perl_config.c
===
RCS file: /home/cvs/modperl/src/modules/perl/perl_config.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- perl_config.c 2001/05/15 17:02:32 1.109
+++ perl_config.c 2001/06/19 03:12:45 1.110
@@ -593,21 +593,19 @@
MP_TRACE_d(fprintf(stderr, "PerlModule: arg='%s'\n", arg));
if(PERL_RUNNING()) {
- if (PERL_STARTUP_IS_DONE) {
- if (perl_require_module(arg, NULL) != OK) {
- dTHR;
- STRLEN n_a;
- dTHRCTX;
- return SvPV(ERRSV,n_a);
- }
+if (perl_require_module(arg, NULL) != OK) {
+dTHR;
+STRLEN n_a;
+dTHRCTX;
+return SvPV(ERRSV,n_a);
+}
#ifdef PERL_SECTIONS
-else {
-if (CAN_SELF_BOOT_SECTIONS) {
-perl_section_self_boot(parms, dummy, arg);
-}
- }
+else {
+if (CAN_SELF_BOOT_SECTIONS) {
+perl_section_self_boot(parms, dummy, arg);
+}
+}
#endif
- }
}
else {
/* Delay processing it until Perl starts */
@@ -625,21 +623,19 @@
MP_TRACE_d(fprintf(stderr, "PerlRequire: arg=`%s'\n", arg));
if(PERL_RUNNING()) {
- if (PERL_STARTUP_IS_DONE) {
- if (perl_load_startup_script(parms->server, parms->pool, arg, TRUE) != OK)
{
- dTHR;
- STRLEN
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 01/06/18 19:38:55
Modified:src/modules/perl mod_perl.c
Log:
removing dead code
Revision ChangesPath
1.139 +0 -23 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- mod_perl.c2001/06/19 02:36:38 1.138
+++ mod_perl.c2001/06/19 02:38:54 1.139
@@ -480,29 +480,6 @@
}
}
-#if 0
-/* unload_xs_dso should obsolete this hack */
-static void cancel_dso_dlclose(void)
-{
-module *modp;
-
-if(!PERL_DSO_UNLOAD)
- return;
-
-if(strEQ(top_module->name, "mod_perl.c"))
- return;
-
-for(modp = top_module; modp; modp = modp->next) {
- if(modp->dynamic_load_handle) {
- MP_TRACE_g(fprintf(stderr,
-"mod_perl: cancel dlclose for %s\n",
-modp->name));
- modp->dynamic_load_handle = NULL;
- }
-}
-}
-#endif
-
static void mp_dso_unload(void *data)
{
array_header *librefs;
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 01/04/17 15:01:20
Modified:.Changes
src/modules/perl mod_perl.c
Log:
back out 'stop win32 crash when bringing down service' change, no
longer needed with 1.3.19
Revision ChangesPath
1.586 +4 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -r1.585 -r1.586
--- Changes 2001/04/17 21:57:17 1.585
+++ Changes 2001/04/17 22:01:13 1.586
@@ -10,6 +10,10 @@
=item 1.25_01-dev
+back out 'stop win32 crash when bringing down service' change, no
+longer needed with 1.3.19
+[John Sterling, Will Rowe]
+
$r->no_cache(0) will unset cache headers
[Geoffrey Young <[EMAIL PROTECTED]>]
1.136 +0 -12 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- mod_perl.c2001/02/16 23:30:27 1.135
+++ mod_perl.c2001/04/17 22:01:18 1.136
@@ -509,18 +509,6 @@
{
array_header *librefs;
-#ifdef WIN32
-// This is here to stop a crash when bringing down
-// a service. Apparently the dso is unloaded too early.
-// This if statement tests to see if we are running as a
-// service. apache does the same
-// see apache's isProcessService() in service.c
-if (AllocConsole()) {
-FreeConsole();
-return;
-}
-#endif
-
librefs = xs_dl_librefs((pool *)data);
perl_shutdown(NULL, NULL);
unload_xs_so(librefs);
Re: cvs commit: modperl/src/modules/perl mod_perl.c
On Wed, 7 Mar 2001, Ask Bjoern Hansen wrote: > On 6 Oct 2000 [EMAIL PROTECTED] wrote: > > > dougm 00/10/06 13:18:29 > > > > Modified:t/internal error.t > >src/modules/perl mod_perl.c > > Log: > > more for the "Apache::send_http_header was resetting r->status = 200" fix > > Doug, do you remember what this was about? just that sent_http_header should not modify r->status > (I just had a problem with only being able to get redirects from a > subrequest to work if I set status == 302 but returned 200 from the > handler). you should not modify $r->status and return 302 from the handler.
Re: cvs commit: modperl/src/modules/perl mod_perl.c
On 6 Oct 2000 [EMAIL PROTECTED] wrote:
> dougm 00/10/06 13:18:29
>
> Modified:t/internal error.t
>src/modules/perl mod_perl.c
> Log:
> more for the "Apache::send_http_header was resetting r->status = 200" fix
Doug, do you remember what this was about?
(I just had a problem with only being able to get redirects from a
subrequest to work if I set status == 302 but returned 200 from the
handler).
- ask
> RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
> +if (r->prev && (r->prev->status != HTTP_OK) &&
> +mod_perl_sent_header(r, 0))
> +{
> +/* avoid recursive error for ErrorDocuments */
> +status = OK;
> +}
> +
--
ask bjoern hansen, http://ask.netcetera.dk/ !try; do();
more than 70M impressions per day, http://valueclick.com
cvs commit: modperl/src/modules/perl mod_perl.c mod_perl.h perl_util.c
dougm 01/02/16 15:30:30
Modified:.Changes
src/modules/perl mod_perl.c mod_perl.h perl_util.c
Log:
adjust U magic functions to Perl 5.7.x-dev prototype change
Revision ChangesPath
1.581 +2 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- Changes 2001/02/11 15:33:12 1.580
+++ Changes 2001/02/16 23:30:23 1.581
@@ -10,6 +10,8 @@
=item 1.25_01-dev
+adjust 'U' magic functions to Perl 5.7.x-dev prototype change
+
Put Apache's CFLAGS into AP_CFLAGS instead of CFLAGS, so that
people who like to override CFLAGS from the make line (make
CFLAGS='-arch ppc -arch i386') can do so without stomping the
1.135 +1 -1 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- mod_perl.c2000/12/20 06:39:48 1.134
+++ mod_perl.c2001/02/16 23:30:27 1.135
@@ -382,7 +382,7 @@
}
#ifdef PERL_TIE_SCRIPTNAME
-static I32 scriptname_val(IV ix, SV* sv)
+static PERL_MG_UFUNC(scriptname_val, ix, sv)
{
dTHR;
request_rec *r = perl_request_rec(NULL);
1.108 +4 -0 modperl/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.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mod_perl.h2000/12/30 05:08:59 1.107
+++ mod_perl.h2001/02/16 23:30:27 1.108
@@ -197,6 +197,10 @@
#define AvFILLp(av) ((XPVAV*) SvANY(av))->xav_fill
#endif
+#ifndef PERL_MG_UFUNC
+#define PERL_MG_UFUNC(name,ix,sv) I32 name(IV ix, SV *sv)
+#endif
+
#ifdef eval_pv
# ifndef perl_eval_pv
# define perl_eval_pv eval_pv
1.45 +1 -2 modperl/src/modules/perl/perl_util.c
Index: perl_util.c
===
RCS file: /home/cvs/modperl/src/modules/perl/perl_util.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- perl_util.c 2001/01/05 05:48:14 1.44
+++ perl_util.c 2001/02/16 23:30:28 1.45
@@ -426,8 +426,7 @@
}
}
-static I32
-errgv_empty_set(IV ix, SV* sv)
+static PERL_MG_UFUNC(errgv_empty_set, ix, sv)
{
sv_setsv(sv, &sv_no);
return TRUE;
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/12/19 22:39:48
Modified:.Changes
src/modules/perl mod_perl.c
Log:
stop win32 crash when bringing down service
Revision ChangesPath
1.551 +3 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -r1.550 -r1.551
--- Changes 2000/12/20 06:34:19 1.550
+++ Changes 2000/12/20 06:39:47 1.551
@@ -10,6 +10,9 @@
=item 1.24_02-dev
+stop win32 crash when bringing down service
+[John K. Sterling <[EMAIL PROTECTED]>]
+
various Apache::test enhancements and fixes
[Ken Williams <[EMAIL PROTECTED]>, Dave Rolsky <[EMAIL PROTECTED]>]
1.134 +15 -1 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- mod_perl.c2000/10/06 20:18:28 1.133
+++ mod_perl.c2000/12/20 06:39:48 1.134
@@ -507,7 +507,21 @@
static void mp_dso_unload(void *data)
{
-array_header *librefs = xs_dl_librefs((pool *)data);
+array_header *librefs;
+
+#ifdef WIN32
+// This is here to stop a crash when bringing down
+// a service. Apparently the dso is unloaded too early.
+// This if statement tests to see if we are running as a
+// service. apache does the same
+// see apache's isProcessService() in service.c
+if (AllocConsole()) {
+FreeConsole();
+return;
+}
+#endif
+
+librefs = xs_dl_librefs((pool *)data);
perl_shutdown(NULL, NULL);
unload_xs_so(librefs);
}
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/09/27 09:13:35
Modified:src/modules/perl mod_perl.c
Log:
fix logic for last change
Revision ChangesPath
1.129 +2 -2 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- mod_perl.c2000/09/27 15:23:24 1.128
+++ mod_perl.c2000/09/27 16:13:28 1.129
@@ -962,8 +962,8 @@
static int do_proxy (request_rec *r)
{
-return
- !(r->parsed_uri.scheme && r->parsed_uri.hostname
+return r->parsed_uri.scheme &&
+ !(r->parsed_uri.hostname
&& strEQ(r->parsed_uri.scheme, ap_http_method(r))
&& ap_matches_request_vhost(r, r->parsed_uri.hostname,
r->parsed_uri.port_str ?
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/09/27 08:23:29
Modified:.Changes
src/modules/perl mod_perl.c
Log:
disable r->proxyreq checking unless PerlTransHandler is enabled and
configured
Revision ChangesPath
1.526 +3 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -r1.525 -r1.526
--- Changes 2000/09/26 21:19:32 1.525
+++ Changes 2000/09/27 15:23:18 1.526
@@ -10,6 +10,9 @@
=item 1.24_01-dev
+disable r->proxyreq checking unless PerlTransHandler is enabled and
+configured
+
fix 'make tar_Apache' [Jesse Erlbaum <[EMAIL PROTECTED]>]
fix for Perl{Module,Require} in .htaccess,
1.128 +4 -2 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- mod_perl.c2000/09/26 18:20:47 1.127
+++ mod_perl.c2000/09/27 15:23:24 1.128
@@ -963,7 +963,7 @@
static int do_proxy (request_rec *r)
{
return
- !(r->parsed_uri.hostname
+ !(r->parsed_uri.scheme && r->parsed_uri.hostname
&& strEQ(r->parsed_uri.scheme, ap_http_method(r))
&& ap_matches_request_vhost(r, r->parsed_uri.hostname,
r->parsed_uri.port_str ?
@@ -976,11 +976,13 @@
{
dSTATUS;
dPSRV(r->server);
+#ifdef PERL_TRANS
#if MODULE_MAGIC_NUMBER > 19980270
-if(r->parsed_uri.scheme && r->parsed_uri.hostname && do_proxy(r)) {
+if (cls->PerlTransHandler && do_proxy(r)) {
r->proxyreq = 1;
r->uri = r->unparsed_uri;
}
+#endif
#endif
#ifdef PERL_INIT
PERL_CALLBACK("PerlInitHandler", cls->PerlInitHandler);
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/09/26 11:20:49
Modified:.Changes
src/modules/perl mod_perl.c
Log:
PerlAddVar is now an ITERATE2 directive rather than TAKE2
Revision ChangesPath
1.521 +2 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- Changes 2000/09/26 17:34:26 1.520
+++ Changes 2000/09/26 18:20:45 1.521
@@ -10,6 +10,8 @@
=item 1.24_01-dev
+PerlAddVar is now an ITERATE2 directive rather than TAKE2
+
added Apache::Server::error_fname method
eg/makepl_args.mod_perl updated
1.127 +1 -1 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- mod_perl.c2000/09/01 05:23:17 1.126
+++ mod_perl.c2000/09/26 18:20:47 1.127
@@ -119,7 +119,7 @@
OR_ALL, TAKE2, "Perl config var and value" },
{ "PerlAddVar", (crft) perl_cmd_var,
(void*)1,
- OR_ALL, TAKE2, "Perl config var and value" },
+ OR_ALL, ITERATE2, "Perl config var and value" },
{ "PerlSetEnv", (crft) perl_cmd_setenv,
NULL,
OR_ALL, TAKE2, "Perl %ENV key and value" },
RE: cvs commit: modperl/src/modules/perl mod_perl.c
the mod_perl.c update is causing conficts with the set_handlers patch...
the patch works, albit with lots of fuzz, but make yields:
mod_perl.c: In function `perl_run_stacked_handlers':
mod_perl.c:1342: parse error before `register'
make[3]: *** [mod_perl.o] Error 1
make[2]: *** [all] Error 1
make[1]: *** [subdirs] Error 1
make[1]: Leaving directory `/usr/src/apache_1.3.12/src'
make: *** [apache_httpd] Error 2
just in case you want to issue a new patch :)
--Geoff
> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
> Sent: Friday, September 01, 2000 1:16 AM
> To: [EMAIL PROTECTED]
> Subject: cvs commit: modperl/src/modules/perl mod_perl.c
>
>
> dougm 00/08/31 22:15:42
>
> Modified:.Changes
>Leak Leak.xs
>src/modules/perl mod_perl.c
> Log:
> fixes for ActivePerl
>
> Revision ChangesPath
> 1.513 +2 -0 modperl/Changes
>
> Index: Changes
> ===
> RCS file: /home/cvs/modperl/Changes,v
> retrieving revision 1.512
> retrieving revision 1.513
> diff -u -r1.512 -r1.513
> --- Changes 2000/09/01 05:10:09 1.512
> +++ Changes 2000/09/01 05:15:37 1.513
> @@ -10,6 +10,8 @@
>
>=item 1.24_01-dev
>
> +fixes for ActivePerl [Gurusamy Sarathy <[EMAIL PROTECTED]>]
> +
>change apaci/Makefile.tmpl and src/modules/perl/Makefile so Perl's
>include path comes before /usr/local/include, e.g. to make
> sure Perl's
>patchlevel.h is used, thanks to Ryan Morgan for the spot
>
>
>
> 1.4 +1 -1 modperl/Leak/Leak.xs
>
> Index: Leak.xs
> ===
> RCS file: /home/cvs/modperl/Leak/Leak.xs,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- Leak.xs 1999/11/15 20:05:27 1.3
> +++ Leak.xs 2000/09/01 05:15:40 1.4
> @@ -121,7 +121,7 @@
>{
>char *state = lookup((struct hash_s **)p, sv, t_new);
>if (state != t_old) {
> - fprintf(stderr, "%s %p : ", state ? state : t_new, sv);
> + PerlIO_printf(PerlIO_stderr(), "%s %p : ", state ?
> state : t_new, sv);
> sv_dump(sv);
>}
>return hwm+1;
>
>
>
> 1.125 +21 -2 modperl/src/modules/perl/mod_perl.c
>
> Index: mod_perl.c
> ===
> RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
> retrieving revision 1.124
> retrieving revision 1.125
> diff -u -r1.124 -r1.125
> --- mod_perl.c 2000/08/15 19:36:33 1.124
> +++ mod_perl.c 2000/09/01 05:15:41 1.125
> @@ -850,10 +850,21 @@
>dPPDIR;
>dPPREQ;
>dTHR;
> -GV *gv = gv_fetchpv("SIG", TRUE, SVt_PVHV);
> +GV *gv;
> +
> +#ifdef USE_ITHREADS
> +dTHX;
> +
> +if (!aTHX) {
> + PERL_SET_CONTEXT(perl);
> +}
> +#endif
>
>(void)acquire_mutex(mod_perl_mutex);
> -
> +
> +gv = gv_fetchpv("SIG", TRUE, SVt_PVHV);
> +
> +
>#if 0
>/* force 'PerlSendHeader On' for sub-requests
> * e.g. Apache::Sandwich
> @@ -1299,6 +1310,14 @@
>I32 i, do_clear=FALSE;
>SV *sub, **svp;
>int hook_len = strlen(hook);
> +
> +#ifdef USE_ITHREADS
> +dTHX;
> +
> +if (!aTHX) {
> + PERL_SET_CONTEXT(perl);
> +}
> +#endif
>
>if(handlers == Nullav) {
> if(hv_exists(stacked_handlers, hook, hook_len)) {
>
>
>
>
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/08/31 22:23:19
Modified:src/modules/perl mod_perl.c
Log:
fix indentation
Revision ChangesPath
1.126 +2 -2 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- mod_perl.c2000/09/01 05:15:41 1.125
+++ mod_perl.c2000/09/01 05:23:17 1.126
@@ -856,7 +856,7 @@
dTHX;
if (!aTHX) {
- PERL_SET_CONTEXT(perl);
+PERL_SET_CONTEXT(perl);
}
#endif
@@ -1315,7 +1315,7 @@
dTHX;
if (!aTHX) {
- PERL_SET_CONTEXT(perl);
+PERL_SET_CONTEXT(perl);
}
#endif
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/08/31 22:15:42
Modified:.Changes
Leak Leak.xs
src/modules/perl mod_perl.c
Log:
fixes for ActivePerl
Revision ChangesPath
1.513 +2 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -r1.512 -r1.513
--- Changes 2000/09/01 05:10:09 1.512
+++ Changes 2000/09/01 05:15:37 1.513
@@ -10,6 +10,8 @@
=item 1.24_01-dev
+fixes for ActivePerl [Gurusamy Sarathy <[EMAIL PROTECTED]>]
+
change apaci/Makefile.tmpl and src/modules/perl/Makefile so Perl's
include path comes before /usr/local/include, e.g. to make sure Perl's
patchlevel.h is used, thanks to Ryan Morgan for the spot
1.4 +1 -1 modperl/Leak/Leak.xs
Index: Leak.xs
===
RCS file: /home/cvs/modperl/Leak/Leak.xs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Leak.xs 1999/11/15 20:05:27 1.3
+++ Leak.xs 2000/09/01 05:15:40 1.4
@@ -121,7 +121,7 @@
{
char *state = lookup((struct hash_s **)p, sv, t_new);
if (state != t_old) {
- fprintf(stderr, "%s %p : ", state ? state : t_new, sv);
+ PerlIO_printf(PerlIO_stderr(), "%s %p : ", state ? state : t_new, sv);
sv_dump(sv);
}
return hwm+1;
1.125 +21 -2 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- mod_perl.c2000/08/15 19:36:33 1.124
+++ mod_perl.c2000/09/01 05:15:41 1.125
@@ -850,10 +850,21 @@
dPPDIR;
dPPREQ;
dTHR;
-GV *gv = gv_fetchpv("SIG", TRUE, SVt_PVHV);
+GV *gv;
+
+#ifdef USE_ITHREADS
+dTHX;
+
+if (!aTHX) {
+ PERL_SET_CONTEXT(perl);
+}
+#endif
(void)acquire_mutex(mod_perl_mutex);
-
+
+gv = gv_fetchpv("SIG", TRUE, SVt_PVHV);
+
+
#if 0
/* force 'PerlSendHeader On' for sub-requests
* e.g. Apache::Sandwich
@@ -1299,6 +1310,14 @@
I32 i, do_clear=FALSE;
SV *sub, **svp;
int hook_len = strlen(hook);
+
+#ifdef USE_ITHREADS
+dTHX;
+
+if (!aTHX) {
+ PERL_SET_CONTEXT(perl);
+}
+#endif
if(handlers == Nullav) {
if(hv_exists(stacked_handlers, hook, hook_len)) {
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/06/14 18:42:49
Modified:.Changes
src/modules/perl mod_perl.c
Log:
backed out $Apache::Server::ConfigTestOnly until proper Apache support
is in place
Revision ChangesPath
1.499 +3 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -r1.498 -r1.499
--- Changes 2000/06/05 18:18:48 1.498
+++ Changes 2000/06/15 01:42:40 1.499
@@ -10,6 +10,9 @@
=item 1.24_01-dev
+backed out $Apache::Server::ConfigTestOnly until proper Apache support
+is in place
+
fix $r->bytes_sent($bytes)
support version parsing of 1.3.13-dev's httpd.h
1.123 +1 -4 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- mod_perl.c2000/06/02 17:23:07 1.122
+++ mod_perl.c2000/06/15 01:42:44 1.123
@@ -735,10 +735,7 @@
perl_tainting_set(s, cls->PerlTaintCheck);
(void)GvSV_init("Apache::__SendHeader");
(void)GvSV_init("Apache::__CurrentCallback");
-#if !defined(WIN32) && !defined(STRONGHOLD)
-if (ap_configtestonly)
- GvSV_setiv(GvSV_init("Apache::Server::ConfigTestOnly"), TRUE);
-#endif
+
Apache__ServerReStarting(FALSE); /* just for -w */
Apache__ServerStarting_on();
Re: cvs commit: modperl/src/modules/perl mod_perl.c
> I need some help explaining this change.
i would just call it:
fix for 'sub handler : method {}' support when method is not found
Re: cvs commit: modperl/src/modules/perl mod_perl.c
On Sat, Jun 03, 2000 at 01:57:26PM -0700, Ask Bjoern Hansen wrote:
> On 2 Jun 2000 [EMAIL PROTECTED] wrote:
>
> > Modified:src/modules/perl mod_perl.c
> > Log:
> > fix segfault
>
> Don't forget to update Changes.
>
I need some help explaining this change.
Here's what happened:
% cat >t/docs/Foo.pm
package foo;
sub handler { warn 'foo' }
1;
notice the typo, the package declaration says 'foo' instead of 'Foo'
% cat >>t/conf/httpd.conf
PerlHandler Foo
SetHandler perl-script
GET /foo will trigger the segfault. Well, under 5.00502 it does, but under 5.6
I get an (expected) 500 internal server error.
--
Eric Cholet
Re: cvs commit: modperl/src/modules/perl mod_perl.c
On 2 Jun 2000 [EMAIL PROTECTED] wrote: > Modified:src/modules/perl mod_perl.c > Log: > fix segfault Don't forget to update Changes. - ask
cvs commit: modperl/src/modules/perl mod_perl.c
cholet 00/06/02 10:23:08
Modified:src/modules/perl mod_perl.c
Log:
fix segfault
Revision ChangesPath
1.122 +1 -1 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- mod_perl.c2000/05/25 18:06:23 1.121
+++ mod_perl.c2000/06/02 17:23:07 1.122
@@ -1222,7 +1222,7 @@
}
#ifdef CVf_METHOD
-if (CvFLAGS(cv) & CVf_METHOD) {
+if (cv && (CvFLAGS(cv) & CVf_METHOD)) {
is_method = 1;
}
#endif
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/05/25 11:06:27
Modified:.Changes Makefile.PL
src/modules/perl mod_perl.c
Log:
fixes for building with stronghold
Revision ChangesPath
1.492 +3 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492
--- Changes 2000/05/23 18:45:07 1.491
+++ Changes 2000/05/25 18:06:10 1.492
@@ -10,6 +10,9 @@
=item 1.24_01-dev
+fixes for building with stronghold
+[Sander van Zoest <[EMAIL PROTECTED]>]
+
Apache::Resource was not converting PERL_RLIMIT_AS to MB values
thanks to Ian Kallen for the spot
1.163 +7 -2 modperl/Makefile.PL
Index: Makefile.PL
===
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- Makefile.PL 2000/05/16 21:53:14 1.162
+++ Makefile.PL 2000/05/25 18:06:13 1.163
@@ -947,8 +947,13 @@
}
$cmd .= "./configure " .
- "--activate-module=src/modules/perl/libperl.a" .
-" --disable-rule=EXPAT";
+ "--activate-module=src/modules/perl/libperl.a";
+
+# Do not disable the rule EXPAT for Stronghold, since this
+# rule is not implementated yet and breaks the configure process.
+if(is_ssl() !~ /stronghold/i) {
+ $cmd .= " --disable-rule=EXPAT";
+}
if($USE_DSO) {
$cmd .= " --enable-shared=perl";
1.121 +1 -1 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- mod_perl.c2000/05/18 18:05:38 1.120
+++ mod_perl.c2000/05/25 18:06:23 1.121
@@ -735,7 +735,7 @@
perl_tainting_set(s, cls->PerlTaintCheck);
(void)GvSV_init("Apache::__SendHeader");
(void)GvSV_init("Apache::__CurrentCallback");
-#ifndef WIN32
+#if !defined(WIN32) && !defined(STRONGHOLD)
if (ap_configtestonly)
GvSV_setiv(GvSV_init("Apache::Server::ConfigTestOnly"), TRUE);
#endif
cvs commit: modperl/src/modules/perl mod_perl.c
cholet 00/05/18 11:05:43
Modified:src/modules/perl mod_perl.c
Log:
fix Win32 build: ap_configtestonly is not exported
Revision ChangesPath
1.120 +2 -1 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- mod_perl.c2000/05/16 21:52:21 1.119
+++ mod_perl.c2000/05/18 18:05:38 1.120
@@ -735,9 +735,10 @@
perl_tainting_set(s, cls->PerlTaintCheck);
(void)GvSV_init("Apache::__SendHeader");
(void)GvSV_init("Apache::__CurrentCallback");
+#ifndef WIN32
if (ap_configtestonly)
GvSV_setiv(GvSV_init("Apache::Server::ConfigTestOnly"), TRUE);
-
+#endif
Apache__ServerReStarting(FALSE); /* just for -w */
Apache__ServerStarting_on();
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/05/16 14:52:22
Modified:.Changes
src/modules/perl mod_perl.c
Log:
'sub handler : method {}' is now treated as a method handler
Revision ChangesPath
1.484 +2 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- Changes 2000/05/16 13:53:00 1.483
+++ Changes 2000/05/16 21:52:20 1.484
@@ -10,6 +10,8 @@
=item 1.23_01-dev
+'sub handler : method {}' is now treated as a method handler
+
variable $Apache::Server::ConfigTestOnly is set to 1 if Apache
is running in configuration test mode (httpd -t)
[Eric Cholet <[EMAIL PROTECTED]>]
1.119 +8 -1 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- mod_perl.c2000/05/16 13:53:01 1.118
+++ mod_perl.c2000/05/16 21:52:21 1.119
@@ -1220,8 +1220,15 @@
if (gvp) cv = GvCV(gvp);
}
-if (cv && SvPOK(cv))
+#ifdef CVf_METHOD
+if (CvFLAGS(cv) & CVf_METHOD) {
+is_method = 1;
+}
+#endif
+if (!is_method && (cv && SvPOK(cv))) {
is_method = strnEQ(SvPVX(cv), "$$", 2);
+}
+
MP_TRACE_h(fprintf(stderr, "checking if `%s' is a method...%s\n",
sub, (is_method ? "yes" : "no")));
SvREFCNT_dec(sv);
cvs commit: modperl/src/modules/perl mod_perl.c
cholet 00/05/16 06:53:01
Modified:.Changes
src/modules/perl mod_perl.c
Log:
add $Apache::Server::ConfigTestOnly
Revision ChangesPath
1.483 +4 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.482
retrieving revision 1.483
diff -u -r1.482 -r1.483
--- Changes 2000/05/13 01:10:52 1.482
+++ Changes 2000/05/16 13:53:00 1.483
@@ -10,6 +10,10 @@
=item 1.23_01-dev
+variable $Apache::Server::ConfigTestOnly is set to 1 if Apache
+is running in configuration test mode (httpd -t)
+[Eric Cholet <[EMAIL PROTECTED]>]
+
add PerlAddVar directive, like PerlSetVar, but uses ap_table_add
instead of ap_table_set
1.118 +2 -0 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- mod_perl.c2000/05/13 01:10:53 1.117
+++ mod_perl.c2000/05/16 13:53:01 1.118
@@ -735,6 +735,8 @@
perl_tainting_set(s, cls->PerlTaintCheck);
(void)GvSV_init("Apache::__SendHeader");
(void)GvSV_init("Apache::__CurrentCallback");
+if (ap_configtestonly)
+ GvSV_setiv(GvSV_init("Apache::Server::ConfigTestOnly"), TRUE);
Apache__ServerReStarting(FALSE); /* just for -w */
Apache__ServerStarting_on();
cvs commit: modperl/src/modules/perl mod_perl.c perl_config.c
dougm 00/05/12 18:10:54
Modified:.Changes
src/modules/perl mod_perl.c perl_config.c
Log:
add PerlAddVar directive, like PerlSetVar, but uses ap_table_add
instead of ap_table_set
Revision ChangesPath
1.482 +3 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -r1.481 -r1.482
--- Changes 2000/05/12 22:48:06 1.481
+++ Changes 2000/05/13 01:10:52 1.482
@@ -10,6 +10,9 @@
=item 1.23_01-dev
+add PerlAddVar directive, like PerlSetVar, but uses ap_table_add
+instead of ap_table_set
+
Makefile.PL warns about 5.6.0+uselargefiles if USE_APXS
Apache::Table->unset can now be called with an array reference
1.117 +3 -0 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- mod_perl.c2000/04/13 06:07:33 1.116
+++ mod_perl.c2000/05/13 01:10:53 1.117
@@ -126,6 +126,9 @@
{ "PerlSetVar", (crft) perl_cmd_var,
NULL,
OR_ALL, TAKE2, "Perl config var and value" },
+{ "PerlAddVar", (crft) perl_cmd_var,
+ (void*)1,
+ OR_ALL, TAKE2, "Perl config var and value" },
{ "PerlSetEnv", (crft) perl_cmd_setenv,
NULL,
OR_ALL, TAKE2, "Perl %ENV key and value" },
1.97 +12 -2 modperl/src/modules/perl/perl_config.c
Index: perl_config.c
===
RCS file: /home/cvs/modperl/src/modules/perl/perl_config.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- perl_config.c 2000/05/13 00:57:21 1.96
+++ perl_config.c 2000/05/13 01:10:53 1.97
@@ -729,11 +729,21 @@
MP_TRACE_d(fprintf(stderr, "perl_cmd_var: '%s' = '%s'\n", key, val));
if (cmd->path) {
perl_dir_config *rec = (perl_dir_config *) config;
-table_set(rec->vars, key, val);
+if (cmd->info) {
+table_add(rec->vars, key, val);
+}
+else {
+table_set(rec->vars, key, val);
+}
}
else {
dPSRV(cmd->server);
-table_set(cls->vars, key, val);
+if (cmd->info) {
+table_add(cls->vars, key, val);
+}
+else {
+table_set(cls->vars, key, val);
+}
}
return NULL;
}
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/04/12 23:07:33
Modified:.Changes
src/modules/perl mod_perl.c
Log:
fix indentation and change description
Revision ChangesPath
1.467 +2 -2 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.466
retrieving revision 1.467
diff -u -r1.466 -r1.467
--- Changes 2000/04/12 21:23:18 1.466
+++ Changes 2000/04/13 06:07:32 1.467
@@ -10,8 +10,8 @@
=item 1.22_01-dev
-set r->notes("error-notes") to $@ when there is a compile error.
-[ Doug / Tom Mornini <[EMAIL PROTECTED]>]
+set r->notes("error-notes") to $@ if $@ after a Perl*Handlers is run
+[Doug / Tom Mornini <[EMAIL PROTECTED]>]
added INSTALL.raven
[Adam Qualset <[EMAIL PROTECTED]>]
1.116 +3 -3 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- mod_perl.c2000/04/12 21:23:18 1.115
+++ mod_perl.c2000/04/13 06:07:33 1.116
@@ -1635,9 +1635,9 @@
if(perl_eval_ok(r->server) != OK) {
dTHRCTX;
MP_STORE_ERROR(r->uri, ERRSV);
-if (r->notes) {
-ap_table_set(r->notes, "error-notes", SvPVX(ERRSV));
-}
+if (r->notes) {
+ap_table_set(r->notes, "error-notes", SvPVX(ERRSV));
+}
if(!perl_sv_is_http_code(ERRSV, &status))
status = SERVER_ERROR;
}
cvs commit: modperl/src/modules/perl mod_perl.c
ask 00/04/12 14:23:19
Modified:.Changes
src/modules/perl mod_perl.c
Log:
set r->notes("error-notes") to $@ when there is an eval error.
Revision ChangesPath
1.466 +3 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -r1.465 -r1.466
--- Changes 2000/04/12 16:13:09 1.465
+++ Changes 2000/04/12 21:23:18 1.466
@@ -10,6 +10,9 @@
=item 1.22_01-dev
+set r->notes("error-notes") to $@ when there is a compile error.
+[ Doug / Tom Mornini <[EMAIL PROTECTED]>]
+
added INSTALL.raven
[Adam Qualset <[EMAIL PROTECTED]>]
1.115 +3 -0 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- mod_perl.c2000/04/05 06:19:34 1.114
+++ mod_perl.c2000/04/12 21:23:18 1.115
@@ -1635,6 +1635,9 @@
if(perl_eval_ok(r->server) != OK) {
dTHRCTX;
MP_STORE_ERROR(r->uri, ERRSV);
+if (r->notes) {
+ap_table_set(r->notes, "error-notes", SvPVX(ERRSV));
+}
if(!perl_sv_is_http_code(ERRSV, &status))
status = SERVER_ERROR;
}
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/04/04 23:19:35
Modified:.Changes
lib/Apache PerlRun.pm Registry.pm
src/modules/perl mod_perl.c
Log:
$Apache::Registry::NameWithVirtualHost fix take 2
(move is_virtual logic from mod_perl.c to Registry.pm)
Revision ChangesPath
1.461 +4 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- Changes 2000/04/05 04:55:54 1.460
+++ Changes 2000/04/05 06:19:33 1.461
@@ -10,6 +10,10 @@
=item 1.22_01-dev
+$Apache::Registry::NameWithVirtualHost fix take 2
+(move is_virtual logic from mod_perl.c to Registry.pm)
+[John Hughes <[EMAIL PROTECTED]>]
+
added Apache::OPEN method for 5.6.0+ tied filehandle support
Apache::Table is now loaded by default (if enabled), rather than
1.27 +1 -1 modperl/lib/Apache/PerlRun.pm
Index: PerlRun.pm
===
RCS file: /home/cvs/modperl/lib/Apache/PerlRun.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- PerlRun.pm2000/03/15 08:02:11 1.26
+++ PerlRun.pm2000/04/05 06:19:34 1.27
@@ -169,7 +169,7 @@
substr($uri, 0, length($uri)-length($path_info)) :
$uri;
-if($Apache::Registry::NameWithVirtualHost) {
+if ($Apache::Registry::NameWithVirtualHost && $pr->server->is_virtual) {
my $name = $pr->get_server_name;
$script_name = join "", $name, $script_name if $name;
}
1.31 +1 -1 modperl/lib/Apache/Registry.pm
Index: Registry.pm
===
RCS file: /home/cvs/modperl/lib/Apache/Registry.pm,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Registry.pm 2000/03/15 08:02:11 1.30
+++ Registry.pm 2000/04/05 06:19:34 1.31
@@ -68,7 +68,7 @@
$script_name =~ s:/+$:/__INDEX__:;
- if($Apache::Registry::NameWithVirtualHost) {
+ if ($Apache::Registry::NameWithVirtualHost && $r->server->is_virtual) {
my $name = $r->get_server_name;
$script_name = join "", $name, $script_name if $name;
}
1.114 +0 -6 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- mod_perl.c2000/04/03 04:48:52 1.113
+++ mod_perl.c2000/04/05 06:19:34 1.114
@@ -856,7 +856,6 @@
dPPDIR;
dPPREQ;
dTHR;
-SV *nwvh = Nullsv;
GV *gv = gv_fetchpv("SIG", TRUE, SVt_PVHV);
(void)acquire_mutex(mod_perl_mutex);
@@ -878,11 +877,6 @@
(int)sv_count, (int)sv_objcount));
ENTER;
SAVETMPS;
-
-if((nwvh = ApachePerlRun_name_with_virtualhost())) {
- SAVESPTR(nwvh);
- sv_setiv(nwvh, r->server->is_virtual);
-}
if (gv) {
save_hptr(&GvHV(gv));
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/03/30 21:16:06
Modified:.Changes
apacimod_perl.config.sh
src/modules/perl mod_perl.c
Log:
$Apache::Server::AddPerlVersion uses $^V for Perl/v5.6.0+
Revision ChangesPath
1.448 +2 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -r1.447 -r1.448
--- Changes 2000/03/30 19:59:16 1.447
+++ Changes 2000/03/31 05:16:04 1.448
@@ -10,6 +10,8 @@
=item 1.22_01-dev
+$Apache::Server::AddPerlVersion uses $^V for Perl/v5.6.0+
+
update mod_ssl config for 'make test'
[Stas Bekman <[EMAIL PROTECTED]>]
1.18 +1 -1 modperl/apaci/mod_perl.config.sh
Index: mod_perl.config.sh
===
RCS file: /home/cvs/modperl/apaci/mod_perl.config.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_perl.config.sh2000/03/03 22:20:18 1.17
+++ mod_perl.config.sh2000/03/31 05:16:05 1.18
@@ -95,7 +95,7 @@
IFS="$OIFS"
perl_interp="`echo $perl_interp | sed -e 's://:/:'`"
fi
-perl_version="`$perl_interp -e 'print $];'`"
+perl_version="`$perl_interp -e '$^V ? printf("v%vd", $^V) : print($]);'`"
os_version="`$perl_interp -e 'print $^O;'`"
#
1.112 +7 -2 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- mod_perl.c2000/03/30 19:41:25 1.111
+++ mod_perl.c2000/03/31 05:16:05 1.112
@@ -539,7 +539,7 @@
if(strEQ(SvPV(version,n_a), MP_APACHE_VERSION)) /*no worries*/
return;
-fprintf(stderr, "Apache.pm version %.02f required!\n",
+fprintf(stderr, "Apache.pm version %s required!\n",
MP_APACHE_VERSION);
fprintf(stderr, "%s", form("%_ is version %_\n",
*hv_fetch(GvHV(incgv), "Apache.pm", 9, FALSE),
@@ -577,8 +577,13 @@
#if HAS_MMN_130
ap_add_version_component(MOD_PERL_STRING_VERSION);
if(PERL_RUNNING()) {
+#ifdef PERL_IS_5_6
+ char *version = form("Perl/v%vd", PL_patchlevel);
+#else
+ char *version = form("Perl/%_", perl_get_sv("]", TRUE));
+#endif
if(perl_get_sv("Apache::Server::AddPerlVersion", FALSE)) {
- ap_add_version_component(form("Perl/%_", perl_get_sv("]",TRUE)));
+ ap_add_version_component(version);
}
}
#endif
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/03/30 11:41:25
Modified:.Changes
src/modules/perl mod_perl.c
Log:
reset the stack pointer after calling perl_require_module() in
perl_call_handler()
Revision ChangesPath
1.446 +5 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- Changes 2000/03/30 00:44:39 1.445
+++ Changes 2000/03/30 19:41:24 1.446
@@ -10,6 +10,11 @@
=item 1.22_01-dev
+reset the stack pointer after calling perl_require_module() in
+perl_call_handler(). this fix will most likely cure the reports of
+"Can't upgrade that kind of scalar at ..."
+[Ben Cottrell <[EMAIL PROTECTED]>]
+
workaround use of Perl api functions that are no longer public with
Perl 5.6.0 + win32, thanks to Randy Kobes for spotting
1.111 +1 -0 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- mod_perl.c2000/03/30 19:34:13 1.110
+++ mod_perl.c2000/03/30 19:41:25 1.111
@@ -1557,6 +1557,7 @@
if(stash) /* check again */
is_method = perl_handler_ismethod(stash, method);
#endif
+ SPAGAIN; /* reset stack pointer after require() */
}
if(!is_method && !defined_sub) {
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/03/30 11:34:14
Modified:src/modules/perl mod_perl.c
Log:
more for win32+5.6.0
Revision ChangesPath
1.110 +2 -0 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mod_perl.c2000/03/30 00:20:34 1.109
+++ mod_perl.c2000/03/30 19:34:13 1.110
@@ -1099,6 +1099,7 @@
cfg->pnotes = Nullhv;
}
+#ifndef WIN32
sigs = (perl_request_sigsave **)cfg->sigsave->elts;
for (i=0; i < cfg->sigsave->nelts; i++) {
MP_TRACE_g(fprintf(stderr,
@@ -1108,6 +1109,7 @@
(unsigned long)sigs[i]->h));
rsignal(sigs[i]->signo, sigs[i]->h);
}
+#endif
}
void mod_perl_end_cleanup(void *data)
cvs commit: modperl/src/modules/perl mod_perl.c
dougm 00/03/29 16:20:35
Modified:.Changes
src/modules/perl mod_perl.c
Log:
change $Apache::VERSION check to use a string instead of SvNV
Revision ChangesPath
1.444 +3 -0 modperl/Changes
Index: Changes
===
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.443
retrieving revision 1.444
diff -u -r1.443 -r1.444
--- Changes 2000/03/26 20:32:53 1.443
+++ Changes 2000/03/30 00:20:32 1.444
@@ -10,6 +10,9 @@
=item 1.22_01-dev
+change $Apache::VERSION check to use a string instead of SvNV, which
+was troublesome with Perl 5.6.0, thanks to Dave Seidel for pinpointing
+
Apache::src fixup to quiet warnings under Perl 5.004. Thanks to Ken
Williams for the spot. [ Ask Bjoern Hansen ]
1.109 +5 -4 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===
RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- mod_perl.c2000/03/23 05:56:10 1.108
+++ mod_perl.c2000/03/30 00:20:34 1.109
@@ -523,24 +523,25 @@
if(!PERL_IS_DSO) \
register_cleanup(p, NULL, mp_server_notstarting, mod_perl_noop)
-#define MP_APACHE_VERSION 1.26
+#define MP_APACHE_VERSION "1.26"
void mp_check_version(void)
{
I32 i;
SV *namesv;
SV *version;
+STRLEN n_a;
require_Apache(NULL);
if(!(version = perl_get_sv("Apache::VERSION", FALSE)))
croak("Apache.pm failed to load!"); /*should never happen*/
-if(SvNV(version) >= MP_APACHE_VERSION) /*no worries*/
+if(strEQ(SvPV(version,n_a), MP_APACHE_VERSION)) /*no worries*/
return;
-fprintf(stderr, "Apache.pm version %.02f or higher required!\n",
+fprintf(stderr, "Apache.pm version %.02f required!\n",
MP_APACHE_VERSION);
-fprintf(stderr, "%s", form("%_ is only version %_\n",
+fprintf(stderr, "%s", form("%_ is version %_\n",
*hv_fetch(GvHV(incgv), "Apache.pm", 9, FALSE),
version));
fprintf(stderr,
