head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.46 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.44 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.42 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.40 pkgsrc-2011Q2-base:1.3 TNF:1.1.1 pkgsrc-2009Q4:1.3.0.38 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.36 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.34 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.32 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.30 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.28 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.26 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.24 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.22 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.20 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.18 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.16 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.14 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.12 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.10 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.8 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.6 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.4 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.2 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.2.0.16 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.14 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.12 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.10 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.6 netbsd-1-6-1-base:1.2 netbsd-1-6:1.2.0.8 netbsd-1-6-RELEASE-base:1.2 pkgviews:1.2.0.4 pkgviews-base:1.2 buildlink2:1.2.0.2 buildlink2-base:1.2 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 netbsd-1-4-PATCH002:1.1.1.1 comdex-fall-1999:1.1.1.1 pkgsrc_www_apache_19990724:1.1.1.1; locks; strict; comment @# @; 1.3 date 2004.11.25.15.21.08; author wiz; state dead; branches; next 1.2; 1.2 date 2001.02.06.10.58.18; author itojun; state Exp; branches 1.2.16.1; next 1.1; 1.1 date 99.07.23.17.53.30; author itojun; state Exp; branches 1.1.1.1; next ; 1.2.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.3 log @Forgot removing the patches when I removed the package. @ text @$NetBSD: patch-ae,v 1.2 2001/02/06 10:58:18 itojun Exp $ --- src/modules/standard/mod_include.c.orig Tue Jan 16 02:05:42 2001 +++ src/modules/standard/mod_include.c Tue Feb 6 19:49:25 2001 @@@@ -94,6 +94,8 @@@@ #include "http_main.h" #include "util_script.h" #endif +#define get_tag ap_include_get_tag +#define parse_string ap_include_parse_string #define STARTING_SEQUENCE "" @@@@ -352,7 +354,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; @@@@ -471,7 +474,8 @@@@ /* * 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; @@@@ -669,7 +673,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"; } @@@@ -1081,7 +1086,8 @@@@ "in parsed file %s"; } else { - 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); if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) { @ 1.2 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$ @ 1.2.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-ae,v 1.2 2001/02/06 10:58:18 itojun Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 1998/12/03 17:23:53 tv Exp $ d3 51 a53 12 --- src/support/apachectl.orig Thu Dec 3 08:23:16 1998 +++ src/support/apachectl Thu Dec 3 08:23:49 1998 @@@@ -27,6 +27,9 @@@@ # the path to your httpd binary, including options if necessary HTTPD='/usr/local/apache/src/httpd' # +# shared object search path +LD_LIBRARY_PATH= +export LD_LIBRARY_PATH # a command that outputs a formatted text version of the HTML at the # url given on the command line. Designed for lynx, however other # programs may work. @ 1.1.1.1 log @import pkgsrc/www/apache into pkgsrc/www/apache6, to make a IPv6-ready version of apache package. @ text @@