head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.46 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.44 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.42 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.40 pkgsrc-2011Q2-base:1.5 TNF:1.1.1 pkgsrc-2009Q4:1.5.0.38 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.36 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.34 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.32 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.30 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.28 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.26 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.24 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.22 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.20 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.18 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.16 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.14 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.12 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.10 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.8 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.6 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.4 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.2 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.4.0.16 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.14 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.12 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.10 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.3 pkgsrc_www_apache_19990724:1.1.1.1; locks; strict; comment @# @; 1.5 date 2004.11.25.15.21.08; author wiz; state dead; branches; next 1.4; 1.4 date 2001.10.08.13.23.37; author martti; state Exp; branches 1.4.16.1; next 1.3; 1.3 date 2001.02.06.10.58.18; author itojun; state Exp; branches; next 1.2; 1.2 date 99.07.23.18.19.30; author itojun; state dead; branches; next 1.1; 1.1 date 99.07.23.17.53.30; author itojun; state Exp; branches 1.1.1.1; next ; 1.4.16.1 date 2004.11.27.16.51.06; author salo; state dead; branches; next ; 1.1.1.1 date 99.07.23.17.53.30; author itojun; state Exp; branches; next ; desc @@ 1.5 log @Forgot removing the patches when I removed the package. @ text @$NetBSD: patch-af,v 1.4 2001/10/08 13:23:37 martti Exp $ --- src/modules/standard/mod_so.c.orig Tue Feb 27 04:59:53 2001 +++ src/modules/standard/mod_so.c Mon Oct 8 14:34:14 2001 @@@@ -308,7 +308,15 @@@@ return err; } - file = ap_server_root_relative(cmd->pool, filename); + /* + * If the filename starts with '!', then just dlopen() it without + * translating it to a pathname relative to ServerRoot. + */ + if (filename[0] == '!') { + file = filename + 1; + } else { + file = ap_server_root_relative(cmd->pool, filename); + } if (!(handle = ap_os_dso_load(file))) { const char *my_error = ap_os_dso_error(); @ 1.4 log @- Upgraded to 1.3.20. - IPv6 patch will be maintained at ftp://ftp.piuha.net/pub/misc/ A better ChangeLog (1.3.19 -> 1.3.20) is available in pkgsrc/www/apache/Makefile rev 1.73 @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.3 2001/02/06 10:58:18 itojun Exp $ @ 1.4.16.1 log @Pullup ticket 160 - requested by Thomas Klausner remove apache6 package removed from -current because of too many vulnerabilities and no newer version available (people are expected to switch to apache2). @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.4 2001/10/08 13:23:37 martti Exp $ @ 1.3 log @upgrade to 1.3.17 + IPv6 patch. pkgsrc directory is much more similar to pksrc/www/apache. see pkgsrc/www/apache changelog for full changelog. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- src/modules/standard/mod_so.c.orig Tue Jan 16 02:05:49 2001 +++ src/modules/standard/mod_so.c Tue Feb 6 19:42:56 2001 @@@@ -305,7 +305,15 @@@@ @ 1.2 log @provide and enable IPv6-ready apache. This is provided as separate package because: # This package does not compile in mod_ssl support hooks, as it conflicts # with IPv6 enable patch. # IPv6 enable patch conflicts with third-party modules anyway, due to # sanity fixes in apache module API (for example, avoid u_long for IPv4 addrs) @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.1 1999/07/23 17:53:30 itojun Exp $ d3 4 a6 54 --- src/modules/standard/mod_include.c.orig Thu Sep 24 10:06:42 1998 +++ src/modules/standard/mod_include.c Mon Dec 7 11:17:39 1998 @@@@ -92,7 +92,11 @@@@ #include "http_log.h" #include "http_main.h" #include "util_script.h" +#include "ap_include_extern.h" +#include "ap_hook.h" #endif +#define get_tag ap_include_get_tag +#define parse_string ap_include_parse_string #define STARTING_SEQUENCE "" @@@@ -354,7 +358,8 @@@@ * the tag value is html decoded if dodecode is non-zero */ -static char *get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode) +API_EXPORT(char *) +ap_include_get_tag(pool *p, FILE *in, char *tag, int tagbuf_len, int dodecode) { char *t = tag, *tag_val, c, term; @@@@ -473,7 +478,7 @@@@ /* * Do variable substitution on strings */ -static void parse_string(request_rec *r, const char *in, char *out, +API_EXPORT(void) ap_include_parse_string(request_rec *r, const char *in, char *out, size_t length, int leave_name) { char ch; @@@@ -666,7 +671,8 @@@@ parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0); if (tag[0] == 'f') { /* be safe; only files in this directory or below allowed */ - if (!is_only_below(parsed_string)) { + if ((ap_allow_options(r) & OPT_INCNOEXEC) && + !is_only_below(parsed_string)) { error_fmt = "unable to include file \"%s\" " "in parsed file %s"; } @@@@ -1010,7 +1016,8 @@@@ int ret=0; if (!strcmp(tag, "file")) { - ap_getparents(tag_val); /* get rid of any nasties */ + if (ap_allow_options(r) & OPT_INCNOEXEC) + ap_getparents(tag_val); /* get rid of any nasties */ rr = ap_sub_req_lookup_file(tag_val, r); @@@@ -2090,6 +2097,16 @@@@ d8 14 a21 29 } +API_EXPORT(int) +ap_include_register_extern(const char *cmd, ap_include_extern_func func) { + char cmdbuf[40] = "include::"; + + strncat(cmdbuf, cmd, 30); + ap_hook_configure(cmdbuf, AP_HOOK_SIG5(int,ptr,ptr,ptr,ptr), AP_HOOK_TOPMOST); + ap_hook_register(cmdbuf, func, NULL); + + return 0; +} /* -------------------------- The main function --------------------------- */ @@@@ -2214,6 +2231,13 @@@@ } #endif else { + char cmdbuf[40] = "include::"; + + strncat(cmdbuf, directive, 30); + if ((ap_hook_status(cmdbuf) >= AP_HOOK_STATE_CONFIGURED) && + (ap_hook_call(cmdbuf, &ret, f, r, error, timefmt) == TRUE)) + continue; + ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r, "httpd: unknown directive \"%s\" " "in parsed doc %s", @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.4 1998/12/07 16:20:40 tv Exp $ @ 1.1.1.1 log @import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package. @ text @@