diff options
author | tv <tv> | 1999-04-30 17:05:19 +0000 |
---|---|---|
committer | tv <tv> | 1999-04-30 17:05:19 +0000 |
commit | 5f5f29be7b0d09e5c05de452bff354a363b1395d (patch) | |
tree | 79fcc17e390c6e96d28c5129664c05c7b2085e7e /www/ap-perl/patches | |
parent | ec97b3a65ae124be7625b3372955b93f20e2d47f (diff) | |
download | pkgsrc-5f5f29be7b0d09e5c05de452bff354a363b1395d.tar.gz |
Update Apache to 1.3.6, mod_ssl to 2.2.8, and mod_perl to 1.19. mod_ssl
now makes use of OpenSSL.
Diffstat (limited to 'www/ap-perl/patches')
-rw-r--r-- | www/ap-perl/patches/patch-aa | 34 | ||||
-rw-r--r-- | www/ap-perl/patches/patch-ab | 74 |
2 files changed, 21 insertions, 87 deletions
diff --git a/www/ap-perl/patches/patch-aa b/www/ap-perl/patches/patch-aa index 4ff8535446a..0e3b141ce26 100644 --- a/www/ap-perl/patches/patch-aa +++ b/www/ap-perl/patches/patch-aa @@ -1,13 +1,21 @@ -$NetBSD: patch-aa,v 1.1.1.1 1998/12/04 00:10:57 tv Exp $ - ---- lib/Apache/src.pm.orig Thu Oct 1 13:55:29 1998 -+++ lib/Apache/src.pm Thu Dec 3 15:32:42 1998 -@@ -184,7 +184,7 @@ - my $src = $self->dir; - my $main = $self->main; - my $os = $Is_Win32 ? "win32" : "unix"; -- my @inc = ("-I$src", "-I$src/modules/perl", "-I$main"); -+ my @inc = ("-I../include", "-I../src/modules/perl -DMOD_PERL"); - for ("src/regex", "$src/os/$os") { - push @inc, "-I$_" if -d $_; - } +--- apaci/Makefile.tmpl.orig Mon Apr 26 18:22:37 1999 ++++ apaci/Makefile.tmpl Mon Apr 26 18:32:27 1999 +@@ -58,7 +58,7 @@ + + libperl.so: $(MP_OBJS_PIC) + $(MP_RM) $@ +- $(MP_LD) $(MP_LDFLAGS_SHLIB) -o $@ $(MP_OBJS_PIC) $(MP_LIBS) ++ $(MP_LD) $(MP_LDFLAGS_SHLIB) -o $@ $(MP_OBJS_PIC) + + .SUFFIXES: .xs .c .o .lo + +@@ -94,7 +94,8 @@ + + # FOR STAND-ALONE BUILDING ONLY + install: +- $(APXS) -i -a -n perl libperl.so ++ @cp libperl.so mod_perl.so ++ $(APXS) -i -n perl mod_perl.so + + depend: + cp Makefile.tmpl Makefile.tmpl.bak \ diff --git a/www/ap-perl/patches/patch-ab b/www/ap-perl/patches/patch-ab deleted file mode 100644 index 55f1af72491..00000000000 --- a/www/ap-perl/patches/patch-ab +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: patch-ab,v 1.3 1998/12/07 16:36:15 tv Exp $ - ---- src/modules/perl/mod_perl.c.orig Wed Sep 30 23:13:14 1998 -+++ src/modules/perl/mod_perl.c Thu Dec 3 17:30:09 1998 -@@ -58,6 +58,57 @@ - - #define CORE_PRIVATE - #include "mod_perl.h" -+#include <ap_include_extern.h> -+ -+/* --- ripped from mod_include.c --- */ -+/* -+ * sub key may be anything a Perl*Handler can be: -+ * subroutine name, package name (defaults to package::handler), -+ * Class->method call or anoymous sub {} -+ * -+ * Child <!--#perl sub="sub {print $$}" --> accessed -+ * <!--#perl sub="sub {print ++$Access::Cnt }" --> times. <br> -+ * -+ * <!--#perl arg="one" sub="mymod::includer" --> -+ * -+ * -Doug MacEachern -+ */ -+ -+static int handle_perl(FILE *in, request_rec *r, const char *error, const char *timefmt) -+{ -+ char tag[MAX_STRING_LEN]; -+ char parsed_string[MAX_STRING_LEN]; -+ char *tag_val; -+ SV *sub = Nullsv; -+ AV *av = newAV(); -+ -+ if (ap_allow_options(r) & OPT_INCNOEXEC) { -+ ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r, -+ "httpd: #perl SSI disallowed by IncludesNoExec in %s", -+ r->filename); -+ return DECLINED; -+ } -+ while (1) { -+ if (!(tag_val = ap_include_get_tag(r->pool, in, tag, sizeof(tag), 1))) { -+ break; -+ } -+ if (strnEQ(tag, "sub", 3)) { -+ sub = newSVpv(tag_val, 0); -+ } -+ else if (strnEQ(tag, "arg", 3)) { -+ ap_include_parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0); -+ av_push(av, newSVpv(parsed_string, 0)); -+ } -+ else if (strnEQ(tag, "done", 4)) { -+ break; -+ } -+ } -+ perl_stdout2client(r); -+ perl_setup_env(r); -+ perl_call_handler(sub, r, av); -+ return OK; -+} -+/* --- end from mod_include.c --- */ - - #ifdef WIN32 - void *mod_perl_mutex = &mod_perl_mutex; -@@ -486,6 +537,11 @@ - #endif - ap_add_version_component(MOD_PERL_STRING_VERSION); - #endif -+ -+ if (ap_include_register_extern("perl", handle_perl)) { -+ fprintf(stderr, "mod_perl: Cannot register XSSI handler\n"); -+ exit(1); -+ } - - #ifndef WIN32 - argv[0] = server_argv0; |