diff --git a/www/apache20/Makefile b/www/apache20/Makefile index d7d44b34ff68..2f2dfda0fea7 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -36,10 +36,6 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* # patch files EXTRA_PATCHES+= ${FILESDIR}/build-fix-openssl_beta -.if defined (WITH_WINDOWSUPDATEFIX) -EXTRA_PATCHES+= ${FILESDIR}/exp-windowsupdate.patch -.endif - .if defined(WITH_EXPERIMENTAL_PATCHES) IGNORE= : Please define WITH_KQUEUE_SUPPORT instead .endif diff --git a/www/apache20/Makefile.doc b/www/apache20/Makefile.doc index fe76b6f60bd2..30743ed70eac 100644 --- a/www/apache20/Makefile.doc +++ b/www/apache20/Makefile.doc @@ -73,12 +73,7 @@ ## [cgi|errordocs|icons|wwwdata] ## ## Optionnal patches: -# WITH_EXPERIMENTAL_PATCHES Add performance patches (generally backported -# from apr/httpd CVS) -# ## WITH_KQUEUE_SUPPORT Add kqueue support to apr/httpd -## WITH_WINDOWSUPDATEFIX Add a fix to use apache as proxy with -## Windows Update service. ## ## Available make targets: ## show-options: prints this message diff --git a/www/apache20/files/exp-windowsupdate.patch b/www/apache20/files/exp-windowsupdate.patch deleted file mode 100644 index 3f1306777100..000000000000 --- a/www/apache20/files/exp-windowsupdate.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- server/protocol.c.orig Tue Jun 29 08:21:28 2004 -+++ server/protocol.c Tue Jun 29 08:21:50 2004 -@@ -1248,7 +1248,7 @@ - * We can only set a C-L in the response header if we haven't already - * sent any buckets on to the next output filter for this request. - */ -- if (ctx->data_sent == 0 && eos) { -+ if (ctx->data_sent == 0 && eos && !r->header_only) { - ap_set_content_length(r, r->bytes_sent); - } -