diff options
Diffstat (limited to 'www/apache/patches')
-rw-r--r-- | www/apache/patches/patch-aa | 4 | ||||
-rw-r--r-- | www/apache/patches/patch-ab | 6 | ||||
-rw-r--r-- | www/apache/patches/patch-ac | 8 | ||||
-rw-r--r-- | www/apache/patches/patch-ad | 6 | ||||
-rw-r--r-- | www/apache/patches/patch-ae | 27 | ||||
-rw-r--r-- | www/apache/patches/patch-af | 6 | ||||
-rw-r--r-- | www/apache/patches/patch-ag | 6 | ||||
-rw-r--r-- | www/apache/patches/patch-ah | 6 | ||||
-rw-r--r-- | www/apache/patches/patch-ai | 6 | ||||
-rw-r--r-- | www/apache/patches/patch-aj | 8 | ||||
-rw-r--r-- | www/apache/patches/patch-ak | 4 | ||||
-rw-r--r-- | www/apache/patches/patch-al | 19 | ||||
-rw-r--r-- | www/apache/patches/patch-am | 8 | ||||
-rw-r--r-- | www/apache/patches/patch-ao | 8 | ||||
-rw-r--r-- | www/apache/patches/patch-ap | 18 |
15 files changed, 46 insertions, 94 deletions
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa index 8c22c8af907..35d166c43e6 100644 --- a/www/apache/patches/patch-aa +++ b/www/apache/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.23 2004/05/13 21:21:27 abs Exp $ +$NetBSD: patch-aa,v 1.23.4.1 2004/12/01 00:25:56 salo Exp $ ---- Makefile.tmpl.orig 2004-05-13 22:18:11.000000000 +0100 +--- Makefile.tmpl.orig 2004-10-29 14:44:35.000000000 +0100 +++ Makefile.tmpl @@ -56,6 +56,8 @@ INSTALL_DATA = $(INSTALL) $(IFLAGS_DA PERL = @PERL@ diff --git a/www/apache/patches/patch-ab b/www/apache/patches/patch-ab index 8e062eafa1b..35b6252f9ac 100644 --- a/www/apache/patches/patch-ab +++ b/www/apache/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.10 2001/04/29 20:42:29 jlam Exp $ +$NetBSD: patch-ab,v 1.10.16.1 2004/12/01 00:25:56 salo Exp $ ---- conf/httpd.conf-dist.orig Sun Mar 4 02:42:23 2001 +--- conf/httpd.conf-dist.orig 2004-10-29 14:44:35.000000000 +0100 +++ conf/httpd.conf-dist -@@ -197,7 +197,12 @@ +@@ -197,7 +197,12 @@ MaxRequestsPerChild 0 # the order below without expert advice. # # Example: diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac index 70ec8d23429..60af64356a9 100644 --- a/www/apache/patches/patch-ac +++ b/www/apache/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2001/06/09 06:36:43 jlam Exp $ +$NetBSD: patch-ac,v 1.7.16.1 2004/12/01 00:25:56 salo Exp $ ---- htdocs/index.html.en.orig Thu May 3 20:00:38 2001 -+++ htdocs/index.html.en Sat Jun 9 01:44:14 2001 -@@ -27,12 +27,26 @@ +--- htdocs/index.html.en.orig 2001-05-04 01:00:38.000000000 +0100 ++++ htdocs/index.html.en +@@ -27,12 +27,26 @@ issues.</p> <hr width="50%" size="8" /> <p>The Apache <a href="manual/">documentation</a> has been included diff --git a/www/apache/patches/patch-ad b/www/apache/patches/patch-ad index d589b0b653c..47b864204f6 100644 --- a/www/apache/patches/patch-ad +++ b/www/apache/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.5 2000/09/12 14:17:32 jlam Exp $ +$NetBSD: patch-ad,v 1.5.16.1 2004/12/01 00:25:56 salo Exp $ ---- src/ap/ap_hook.c.orig Thu Sep 7 01:19:46 2000 +--- src/ap/ap_hook.c.orig 2004-10-29 14:44:35.000000000 +0100 +++ src/ap/ap_hook.c -@@ -740,6 +740,15 @@ +@@ -740,6 +740,15 @@ static int ap_hook_call_func(va_list ap, *((int *)v_rc) = ((int(*)(void *, void *, void *, int, void *))(hf->hf_ptr))(v1, v2, v3, v4, v5); rc = (*((int *)v_rc) != he->he_modeval.v_int); } diff --git a/www/apache/patches/patch-ae b/www/apache/patches/patch-ae index d5af8755560..d7760c053c5 100644 --- a/www/apache/patches/patch-ae +++ b/www/apache/patches/patch-ae @@ -1,30 +1,19 @@ -$NetBSD: patch-ae,v 1.6 2001/10/17 19:17:00 jlam Exp $ +$NetBSD: patch-ae,v 1.6.16.1 2004/12/01 00:25:56 salo Exp $ ---- src/modules/standard/mod_include.c.orig Thu Sep 20 23:51:54 2001 +--- src/modules/standard/mod_include.c.orig 2004-10-25 16:44:04.000000000 +0100 +++ src/modules/standard/mod_include.c -@@ -93,7 +93,11 @@ +@@ -50,7 +50,10 @@ #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 "<!--#" #define ENDING_SEQUENCE "-->" -@@ -352,7 +356,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 +476,8 @@ +@@ -447,7 +450,8 @@ static int get_directive(FILE *in, char /* * Do variable substitution on strings */ @@ -34,7 +23,7 @@ $NetBSD: patch-ae,v 1.6 2001/10/17 19:17:00 jlam Exp $ size_t length, int leave_name) { char ch; -@@ -669,7 +675,8 @@ +@@ -645,7 +649,8 @@ static int handle_include(FILE *in, requ 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 */ @@ -44,7 +33,7 @@ $NetBSD: patch-ae,v 1.6 2001/10/17 19:17:00 jlam Exp $ error_fmt = "unable to include file \"%s\" " "in parsed file %s"; } -@@ -1081,7 +1088,8 @@ +@@ -1057,7 +1062,8 @@ static int find_file(request_rec *r, con "in parsed file %s"; } else { @@ -54,7 +43,7 @@ $NetBSD: patch-ae,v 1.6 2001/10/17 19:17:00 jlam Exp $ rr = ap_sub_req_lookup_file(tag_val, r); if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) { -@@ -2162,6 +2170,16 @@ +@@ -2140,6 +2146,16 @@ static int handle_printenv(FILE *in, req } } @@ -71,7 +60,7 @@ $NetBSD: patch-ae,v 1.6 2001/10/17 19:17:00 jlam Exp $ /* -------------------------- The main function --------------------------- */ -@@ -2300,6 +2318,13 @@ +@@ -2275,6 +2291,13 @@ static void send_parsed_content(FILE *f, } #endif else { diff --git a/www/apache/patches/patch-af b/www/apache/patches/patch-af index ba7ddfcf3fa..7bdcdcf2ef9 100644 --- a/www/apache/patches/patch-af +++ b/www/apache/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.9 2002/02/01 16:04:39 jlam Exp $ +$NetBSD: patch-af,v 1.9.16.1 2004/12/01 00:25:56 salo Exp $ ---- src/modules/standard/mod_so.c.orig Fri Feb 1 10:05:43 2002 +--- src/modules/standard/mod_so.c.orig 2004-10-29 14:44:35.000000000 +0100 +++ src/modules/standard/mod_so.c -@@ -324,7 +324,15 @@ +@@ -321,7 +321,15 @@ static const char *load_file(cmd_parms * return err; } diff --git a/www/apache/patches/patch-ag b/www/apache/patches/patch-ag index b8683610031..09dd17a9d7c 100644 --- a/www/apache/patches/patch-ag +++ b/www/apache/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.7 2002/02/01 16:04:39 jlam Exp $ +$NetBSD: patch-ag,v 1.7.16.1 2004/12/01 00:25:56 salo Exp $ ---- src/os/unix/os.c.orig Mon Nov 12 12:36:38 2001 +--- src/os/unix/os.c.orig 2004-02-20 21:01:04.000000000 +0000 +++ src/os/unix/os.c -@@ -132,7 +132,12 @@ +@@ -153,7 +153,12 @@ void ap_os_dso_unload(void *handle) #elif defined(HAVE_DYLD) NSUnLinkModule(handle,FALSE); diff --git a/www/apache/patches/patch-ah b/www/apache/patches/patch-ah index 9e86aa92e6d..ec83e05353a 100644 --- a/www/apache/patches/patch-ah +++ b/www/apache/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.3 2000/09/12 14:17:33 jlam Exp $ +$NetBSD: patch-ah,v 1.3.16.1 2004/12/01 00:25:56 salo Exp $ ---- src/support/apachectl.orig Thu Sep 7 01:19:50 2000 +--- src/support/apachectl.orig 2004-10-29 14:44:35.000000000 +0100 +++ src/support/apachectl -@@ -27,6 +27,9 @@ +@@ -42,6 +42,9 @@ PIDFILE=/usr/local/apache/logs/httpd.pid # the path to your httpd binary, including options if necessary HTTPD='/usr/local/apache/src/httpd' # diff --git a/www/apache/patches/patch-ai b/www/apache/patches/patch-ai index 8ada8fdb436..6aa0eedaac0 100644 --- a/www/apache/patches/patch-ai +++ b/www/apache/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.8 2002/04/02 14:13:03 jlam Exp $ +$NetBSD: patch-ai,v 1.8.16.1 2004/12/01 00:25:56 salo Exp $ ---- src/support/apxs.pl.orig Tue Apr 2 02:15:23 2002 +--- src/support/apxs.pl.orig 2004-10-29 14:44:35.000000000 +0100 +++ src/support/apxs.pl -@@ -460,8 +460,7 @@ +@@ -423,8 +423,7 @@ if ($opt_i or $opt_e) { if ($^O ne "MSWin32") { $t =~ s|^.+/([^/]+)$|$1|; if ($opt_i) { diff --git a/www/apache/patches/patch-aj b/www/apache/patches/patch-aj index 5d9c5725ad0..b4199beb44b 100644 --- a/www/apache/patches/patch-aj +++ b/www/apache/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.7 2001/10/17 19:17:00 jlam Exp $ +$NetBSD: patch-aj,v 1.7.16.1 2004/12/01 00:25:56 salo Exp $ ---- htdocs/index.html.fr.orig Wed Jun 27 08:38:39 2001 -+++ htdocs/index.html.fr Tue Oct 16 22:29:50 2001 -@@ -36,12 +36,28 @@ +--- htdocs/index.html.fr.orig 2001-06-27 09:38:39.000000000 +0100 ++++ htdocs/index.html.fr +@@ -36,12 +36,28 @@ site et ne peut intervenir sur sa config <hr width="50%" size="8"> <p>La <a href="manual/">documentation</a> Apache est incluse dans cette diff --git a/www/apache/patches/patch-ak b/www/apache/patches/patch-ak index cb2ab5a2f00..bf2cdce5d38 100644 --- a/www/apache/patches/patch-ak +++ b/www/apache/patches/patch-ak @@ -1,6 +1,6 @@ -$NetBSD: patch-ak,v 1.5 2001/10/16 04:11:06 jlam Exp $ +$NetBSD: patch-ak,v 1.5.16.1 2004/12/01 00:25:56 salo Exp $ ---- src/Makefile.tmpl.orig Sun Oct 14 22:14:29 2001 +--- src/Makefile.tmpl.orig 2004-10-29 14:44:35.000000000 +0100 +++ src/Makefile.tmpl @@ -2,7 +2,7 @@ CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) diff --git a/www/apache/patches/patch-al b/www/apache/patches/patch-al deleted file mode 100644 index bae9c607d66..00000000000 --- a/www/apache/patches/patch-al +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-al,v 1.4 2002/02/28 05:45:33 jlam Exp $ - ---- htdocs/manual/mod/index.html.en.orig Thu Feb 28 00:09:28 2002 -+++ htdocs/manual/mod/index.html.en -@@ -219,12 +219,12 @@ - <dt><a href="mod_speling.html">mod_speling</a> Apache 1.3 and - up</dt> - -+ <dd>Automatically correct minor typos in URLs</dd> -+ - <dt><a href="mod_ssl/index.html">mod_ssl</a> Apache 1.3 with mod_ssl - applied</dt> - - <dd>Apache SSL interface to OpenSSL</dd> -- -- <dd>Automatically correct minor typos in URLs</dd> - - <dt><a href="mod_status.html">mod_status</a> Apache 1.1 and - up</dt> diff --git a/www/apache/patches/patch-am b/www/apache/patches/patch-am index e8f887eb470..d2a3ab7cb3a 100644 --- a/www/apache/patches/patch-am +++ b/www/apache/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.6 2002/03/28 17:17:08 thorpej Exp $ +$NetBSD: patch-am,v 1.6.16.1 2004/12/01 00:25:56 salo Exp $ ---- src/include/ap_config.h.orig Thu Mar 28 08:43:24 2002 -+++ src/include/ap_config.h Thu Mar 28 09:01:18 2002 -@@ -1359,7 +1359,7 @@ +--- src/include/ap_config.h.orig 2004-09-16 00:45:17.000000000 +0100 ++++ src/include/ap_config.h +@@ -1304,7 +1304,7 @@ extern int ap_execve(const char *filenam * so we don't have to. Sigh... */ diff --git a/www/apache/patches/patch-ao b/www/apache/patches/patch-ao index 40a221d0ad9..4b54f32e495 100644 --- a/www/apache/patches/patch-ao +++ b/www/apache/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.2 2002/08/25 18:40:19 jlam Exp $ +$NetBSD: patch-ao,v 1.2.10.1 2004/12/01 00:25:56 salo Exp $ ---- configure.orig Thu Jun 20 20:56:07 2002 +--- configure.orig 2004-10-29 14:44:35.000000000 +0100 +++ configure -@@ -227,6 +227,8 @@ +@@ -185,6 +185,8 @@ if [ ! -f "$SHELL" ]; then fi fi @@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 18:40:19 jlam Exp $ ## ## determine default parameters ## -@@ -1300,6 +1302,8 @@ +@@ -1258,6 +1260,8 @@ sed <Makefile.tmpl >$mkf \ -e "s%@PLATFORM@%$PLATFORM%g" \ -e "s%@PERL@%$PERL%g" \ -e "s%@TAR@%$TAR%g" \ diff --git a/www/apache/patches/patch-ap b/www/apache/patches/patch-ap deleted file mode 100644 index d5473184712..00000000000 --- a/www/apache/patches/patch-ap +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ap,v 1.4.4.1 2004/09/30 13:58:22 agc Exp $ - ---- src/modules/proxy/proxy_http.c.orig 29 Mar 2004 17:47:15 -0000 1.106 -+++ src/modules/proxy/proxy_http.c 11 Jun 2004 07:54:38 -0000 1.107 -@@ -485,6 +485,13 @@ - content_length = ap_table_get(resp_hdrs, "Content-Length"); - if (content_length != NULL) { - c->len = ap_strtol(content_length, NULL, 10); -+ -+ if (c->len < 0) { -+ ap_kill_timeout(r); -+ return ap_proxyerror(r, HTTP_BAD_GATEWAY, ap_pstrcat(r->pool, -+ "Invalid Content-Length from remote server", -+ NULL)); -+ } - } - - } |