- Regenerate patch files with make makepatch for they have

  piled up and additional patches conflict.
  This also will help when we try to syncronize www/apache20&www/apache22
- Unconditionally apply the mod_proxy_connect patch, you just may or may
  not actually compile the file to save some logic in Makefile

With Hat:   apache@

24 files changed, 110 insertions, 91 deletions

diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 38e52a9dbccc..9df2c7afb3b5 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -172,10 +172,6 @@ CONFIGURE_ARGS+=	--enable-nonportable-atomics
 
 CONFIGURE_ARGS+=	--with-mpm=${WITH_MPM:L}
 
-.if defined(WITH_PATCH_PROXY_CONNECT)
-EXTRA_PATCHES+=	${FILESDIR}/opt-patch-modules:proxy:mod_proxy_connect.c
-.endif
-
 pre-everything::
 	@${ECHO_MSG}	""
 	@${ECHO_MSG}	" To enable a module category: WITH_<CATEGORY>_MODULES"
diff --git a/www/apache22/files/patch-Makefile.in b/www/apache22/files/patch-Makefile.in
index 14bf7f150465..6d6a51a14e06 100644
--- a/www/apache22/files/patch-Makefile.in
+++ b/www/apache22/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2007-04-24 11:08:01.000000000 +0000
-+++ Makefile.in	2007-12-03 21:15:51.000000000 +0000
+--- ./Makefile.in.orig	2008-11-25 15:24:49.000000000 -0500
++++ ./Makefile.in	2010-05-06 19:37:54.211730130 -0400
 @@ -31,9 +31,11 @@
  install-conf:
  	@echo Installing configuration files
@@ -13,8 +13,8 @@
  	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
  	        $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
  	    fi; \
-@@ -66,14 +68,14 @@
- 	    				-e 's#@@Port@@#$(PORT)#g' \
+@@ -69,14 +71,14 @@
+ 	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
  	    				< $$i; \
  	    		fi \
 -	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \
@@ -31,7 +31,7 @@
  	    	fi; \
  	    	fi; \
  	    done ; \
-@@ -117,48 +119,29 @@
+@@ -120,48 +122,29 @@
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -90,7 +90,7 @@
  
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
-@@ -206,12 +189,14 @@
+@@ -210,12 +193,14 @@
  	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
  	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
  	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
diff --git a/www/apache22/files/patch-config.layout b/www/apache22/files/patch-config.layout
index eeba5df21b36..67775646a0a2 100644
--- a/www/apache22/files/patch-config.layout
+++ b/www/apache22/files/patch-config.layout
@@ -1,5 +1,5 @@
---- config.layout.orig	Sun Nov 21 18:50:36 2004
-+++ config.layout	Sat Dec  3 22:07:46 2005
+--- ./config.layout.orig	2004-11-21 13:50:36.000000000 -0500
++++ ./config.layout	2010-05-06 19:37:54.214731918 -0400
 @@ -281,17 +281,17 @@
    bindir:        ${exec_prefix}/bin
    sbindir:       ${exec_prefix}/sbin
diff --git a/www/apache22/files/patch-configure.in b/www/apache22/files/patch-configure.in
index bc00627ed7af..10bdad0f0391 100644
--- a/www/apache22/files/patch-configure.in
+++ b/www/apache22/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Sun Nov 13 06:33:15 2005
-+++ configure.in	Sat Dec 10 13:14:10 2005
-@@ -67,9 +67,14 @@
+--- ./configure.in.orig	2008-12-01 15:32:43.000000000 -0500
++++ ./configure.in	2010-05-06 19:37:54.216730223 -0400
+@@ -87,9 +87,14 @@
    AC_MSG_ERROR([APR not found.  Please read the documentation.])
  fi
  
@@ -16,7 +16,7 @@
                      [--enable-layout=*|\'--enable-layout=*])
    dnl We must be the first to build and the last to be cleaned
    AP_BUILD_SRCLIB_DIRS="apr $AP_BUILD_SRCLIB_DIRS"
-@@ -95,6 +100,11 @@
+@@ -123,6 +128,11 @@
    AC_MSG_ERROR([APR-util not found.  Please read the documentation.])
  fi
  
@@ -28,7 +28,7 @@
  # Catch some misconfigurations:
  case ${apr_found}.${apu_found} in
  reconfig.yes)
-@@ -107,7 +117,7 @@
+@@ -135,7 +145,7 @@
  
  if test "$apu_found" = "reconfig"; then
    APR_SUBDIR_CONFIG(srclib/apr-util,
@@ -37,7 +37,7 @@
                      [--enable-layout=*|\'--enable-layout=*])
    dnl We must be the last to build and the first to be cleaned
    AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS apr-util"
-@@ -617,8 +627,14 @@
+@@ -653,8 +663,14 @@
  	[Root directory of the Apache install area])
  AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
  	[Location of the config file, relative to the Apache root directory])
diff --git a/www/apache22/files/patch-docs_conf_extra_httpd-ssl.conf.in b/www/apache22/files/patch-docs__conf__extra__httpd-ssl.conf.in
index 1d109a1b7896..b2b66394261a 100644
--- a/www/apache22/files/patch-docs_conf_extra_httpd-ssl.conf.in
+++ b/www/apache22/files/patch-docs__conf__extra__httpd-ssl.conf.in
@@ -1,8 +1,8 @@
---- docs/conf/extra/httpd-ssl.conf.in.orig	Wed Mar  7 08:33:58 2007
-+++ docs/conf/extra/httpd-ssl.conf.in	Sun Sep  9 11:59:51 2007
+--- ./docs/conf/extra/httpd-ssl.conf.in.orig	2008-02-04 18:00:07.000000000 -0500
++++ ./docs/conf/extra/httpd-ssl.conf.in	2010-05-06 19:37:54.219730055 -0400
 @@ -77,8 +77,8 @@
  DocumentRoot "@exp_htdocsdir@"
- ServerName www.example.com:443
+ ServerName www.example.com:@@SSLPort@@
  ServerAdmin you@example.com
 -ErrorLog "@exp_logfiledir@/error_log"
 -TransferLog "@exp_logfiledir@/access_log"
diff --git a/www/apache22/files/patch-docs_conf_extra_httpd-userdir.conf.in b/www/apache22/files/patch-docs__conf__extra__httpd-userdir.conf.in
index 902ef9584641..48fc2f5dc8ee 100644
--- a/www/apache22/files/patch-docs_conf_extra_httpd-userdir.conf.in
+++ b/www/apache22/files/patch-docs__conf__extra__httpd-userdir.conf.in
@@ -1,5 +1,5 @@
---- docs/conf/extra/httpd-userdir.conf.in.orig	Sun Oct 30 19:37:37 2005
-+++ docs/conf/extra/httpd-userdir.conf.in	Sun Oct 30 19:38:27 2005
+--- ./docs/conf/extra/httpd-userdir.conf.in.orig	2007-03-07 02:33:58.000000000 -0500
++++ ./docs/conf/extra/httpd-userdir.conf.in	2010-05-06 19:37:54.222730166 -0400
 @@ -8,7 +8,7 @@
  # the default access control for these directories, as in the example below.
  #
diff --git a/www/apache22/files/patch-docs_conf_httpd.conf.in b/www/apache22/files/patch-docs__conf__httpd.conf.in
index 8067ad7cbd1b..e53d974aa7c0 100644
--- a/www/apache22/files/patch-docs_conf_httpd.conf.in
+++ b/www/apache22/files/patch-docs__conf__httpd.conf.in
@@ -1,5 +1,5 @@
---- docs/conf/httpd.conf.in.orig	2007-12-21 12:43:00.000000000 +0100
-+++ docs/conf/httpd.conf.in	2008-01-19 21:36:47.000000000 +0100
+--- ./docs/conf/httpd.conf.in.orig	2007-12-21 06:43:00.000000000 -0500
++++ ./docs/conf/httpd.conf.in	2010-05-06 19:37:54.224731824 -0400
 @@ -63,8 +63,8 @@
  # It is usually good practice to create a dedicated user and group for
  # running httpd, as with most system services.
diff --git a/www/apache22/files/opt-patch-modules:proxy:mod_proxy_connect.c b/www/apache22/files/patch-modules__proxy__mod_proxy_connect.c
index 37d562267a8c..05b7be0a22d8 100644
--- a/www/apache22/files/opt-patch-modules:proxy:mod_proxy_connect.c
+++ b/www/apache22/files/patch-modules__proxy__mod_proxy_connect.c
@@ -1,6 +1,5 @@
-diff -Naurw modules/proxy/mod_proxy_connect.c modules/proxy/mod_proxy_connect.c
---- modules/proxy/mod_proxy_connect.c	2007-09-02 18:42:59.000000000 +0100
-+++ modules/proxy/mod_proxy_connect.c	2007-10-08 17:03:32.523635700 +0100
+--- ./modules/proxy/mod_proxy_connect.c.orig	2009-11-19 09:07:46.000000000 -0500
++++ ./modules/proxy/mod_proxy_connect.c	2010-05-06 19:37:54.227730259 -0400
 @@ -21,6 +21,8 @@
  #include "mod_proxy.h"
  #include "apr_poll.h"
diff --git a/www/apache22/files/patch-server__core.c b/www/apache22/files/patch-server__core.c
index 3abbe22dd2f4..2b2782772f9f 100644
--- a/www/apache22/files/patch-server__core.c
+++ b/www/apache22/files/patch-server__core.c
@@ -1,6 +1,6 @@
---- ./server/core.c.orig	2008-06-02 23:18:18.000000000 +0200
-+++ ./server/core.c	2009-03-09 15:05:57.000000000 +0100
-@@ -494,6 +494,7 @@
+--- ./server/core.c.orig	2009-07-02 17:30:36.000000000 -0400
++++ ./server/core.c	2010-05-06 19:37:54.278731038 -0400
+@@ -500,6 +500,7 @@
      core_server_config *base = (core_server_config *)basev;
      core_server_config *virt = (core_server_config *)virtv;
      core_server_config *conf;
@@ -8,7 +8,7 @@
  
      conf = (core_server_config *)apr_pmemdup(p, virt, sizeof(core_server_config));
  
-@@ -509,6 +510,25 @@
+@@ -515,6 +516,25 @@
          conf->protocol = base->protocol;
      }
  
@@ -34,3 +34,30 @@
      conf->sec_dir = apr_array_append(p, base->sec_dir, virt->sec_dir);
      conf->sec_url = apr_array_append(p, base->sec_url, virt->sec_url);
  
+@@ -2750,7 +2770,7 @@
+ AP_DECLARE(const char *) ap_get_server_description(void)
+ {
+     return server_description ? server_description :
+-        AP_SERVER_BASEVERSION " (" PLATFORM ")";
++        AP_SERVER_BASEVERSION " (FreeBSD)";
+ }
+ 
+ AP_DECLARE(const char *) ap_get_server_banner(void)
+@@ -2811,7 +2831,7 @@
+         ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT "/" AP_SERVER_MAJORVERSION);
+     }
+     else {
+-        ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (" PLATFORM ")");
++        ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (FreeBSD)");
+     }
+ 
+     /*
+@@ -2821,7 +2841,7 @@
+     if (ap_server_tokens != SrvTk_FULL) {
+         banner_locked++;
+     }
+-    server_description = AP_SERVER_BASEVERSION " (" PLATFORM ")";
++    server_description = AP_SERVER_BASEVERSION " (FreeBSD)";
+ }
+ 
+ static const char *set_serv_tokens(cmd_parms *cmd, void *dummy,
diff --git a/www/apache22/files/patch-srclib__arp-util__Makefile.in b/www/apache22/files/patch-srclib__apr-util__Makefile.in
index ee5df9074093..48756e987854 100644
--- a/www/apache22/files/patch-srclib__arp-util__Makefile.in
+++ b/www/apache22/files/patch-srclib__apr-util__Makefile.in
@@ -1,6 +1,6 @@
---- srclib/apr-util/Makefile.in.orig	2008-05-23 00:37:47.000000000 +0200
-+++ srclib/apr-util/Makefile.in	2008-06-12 16:33:33.000000000 +0200
-@@ -69,12 +69,11 @@
+--- ./srclib/apr-util/Makefile.in.orig	2008-11-21 01:32:58.000000000 -0500
++++ ./srclib/apr-util/Makefile.in	2010-05-06 19:37:54.256730127 -0400
+@@ -74,12 +74,11 @@
  	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
  
  install: $(TARGETS) install-modules
diff --git a/www/apache22/files/patch-srclib:apr-util:build:dbm.m4 b/www/apache22/files/patch-srclib__apr-util__build__dbm.m4
index 0cd1b7945e21..c768ac65cc08 100644
--- a/www/apache22/files/patch-srclib:apr-util:build:dbm.m4
+++ b/www/apache22/files/patch-srclib__apr-util__build__dbm.m4
@@ -1,7 +1,5 @@
-Index: srclib/apr-util/build/dbm.m4
-diff -u srclib/apr-util/build/dbm.m4.orig srclib/apr-util/build/dbm.m4
---- srclib/apr-util/build/dbm.m4.orig	2008-11-21 15:32:58.000000000 +0900
-+++ srclib/apr-util/build/dbm.m4	2009-12-01 15:02:29.374250645 +0900
+--- ./srclib/apr-util/build/dbm.m4.orig	2008-11-21 01:32:58.000000000 -0500
++++ ./srclib/apr-util/build/dbm.m4	2010-05-06 19:37:54.238730296 -0400
 @@ -315,8 +315,8 @@
    fi
    APU_CHECK_BERKELEY_DB(1, -1, -1,
diff --git a/www/apache22/files/patch-srclib-apr-utils-buildconf b/www/apache22/files/patch-srclib__apr-util__buildconf
index a916dba5deb8..ed6023ae94cf 100644
--- a/www/apache22/files/patch-srclib-apr-utils-buildconf
+++ b/www/apache22/files/patch-srclib__apr-util__buildconf
@@ -1,8 +1,8 @@
---- srclib/apr-util/buildconf.orig	Sat Mar 25 20:30:07 2006
-+++ srclib/apr-util/buildconf	Sun Sep 24 15:13:18 2006
+--- ./srclib/apr-util/buildconf.orig	2007-01-15 14:00:58.000000000 -0500
++++ ./srclib/apr-util/buildconf	2010-05-06 19:37:54.235730463 -0400
 @@ -81,8 +81,10 @@
  #
- # Generate build-outputs.mk for the build systme
+ # Generate build-outputs.mk for the build system
  #
 +if [ "x${FULLBUILD}" = "xon" ] ; then
  echo "Generating 'make' outputs ..."
diff --git a/www/apache22/files/patch-srclib:apr-util:config.layout b/www/apache22/files/patch-srclib__apr-util__config.layout
index ad1f4e176a59..d72d61f2ba77 100644
--- a/www/apache22/files/patch-srclib:apr-util:config.layout
+++ b/www/apache22/files/patch-srclib__apr-util__config.layout
@@ -1,8 +1,8 @@
---- srclib/apr-util/config.layout.orig	Thu Oct  2 16:29:48 2003
-+++ srclib/apr-util/config.layout	Mon Dec 13 10:17:45 2004
+--- ./srclib/apr-util/config.layout.orig	2005-02-09 07:18:43.000000000 -0500
++++ ./srclib/apr-util/config.layout	2010-05-06 19:37:54.241730407 -0400
 @@ -229,4 +229,8 @@
      infodir:       ${exec_prefix}/share/info
-     libsuffix     -${APRUTIL_MAJOR_VERSION}
+     libsuffix:     -${APRUTIL_MAJOR_VERSION}
      installbuilddir: ${prefix}/usr/share/apache2/build
 +
 +<Layout FreeBSD>
diff --git a/www/apache22/files/patch-srclib:apr:Makefile.in b/www/apache22/files/patch-srclib__apr__Makefile.in
index 0ca7f3f529c3..b2f62c13f9fb 100644
--- a/www/apache22/files/patch-srclib:apr:Makefile.in
+++ b/www/apache22/files/patch-srclib__apr__Makefile.in
@@ -1,8 +1,8 @@
---- srclib/apr/Makefile.in.orig	Sun Nov 28 20:00:49 2004
-+++ srclib/apr/Makefile.in	Wed Feb 23 11:10:47 2005
-@@ -67,14 +67,13 @@
+--- ./srclib/apr/Makefile.in.orig	2008-05-02 13:04:46.000000000 -0400
++++ ./srclib/apr/Makefile.in	2010-05-06 19:37:54.243730109 -0400
+@@ -70,14 +70,13 @@
  
- install: $(TARGET_LIB) apr-config.out build/apr_rules.out
+ install: $(TARGETS)
  	$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \
 -		     $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
 +		     $(DESTDIR)$(includedir)
diff --git a/www/apache22/files/patch-srclib:apr:build:apr_hints.m4 b/www/apache22/files/patch-srclib__apr__build__apr_hints.m4
index 6a1445ddfb6d..03e04fbc6048 100644
--- a/www/apache22/files/patch-srclib:apr:build:apr_hints.m4
+++ b/www/apache22/files/patch-srclib__apr__build__apr_hints.m4
@@ -1,6 +1,6 @@
---- srclib/apr/build/apr_hints.m4.orig	Wed Oct 27 11:12:28 2004
-+++ srclib/apr/build/apr_hints.m4	Wed Oct 27 11:25:32 2004
-@@ -137,11 +137,7 @@
+--- ./srclib/apr/build/apr_hints.m4.orig	2009-11-17 09:28:12.000000000 -0500
++++ ./srclib/apr/build/apr_hints.m4	2010-05-06 19:37:54.280731298 -0400
+@@ -159,11 +159,7 @@
  	;;
      *-freebsd*)
          APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
@@ -9,8 +9,7 @@
 -        else
 -            os_version=000000
 -        fi
-+        os_version="%%OSVERSION%%"
++        os_version="900010"
          # 502102 is when libc_r switched to libpthread (aka libkse).
          if test $os_version -ge "502102"; then
            apr_cv_pthreads_cflags="none"
-
diff --git a/www/apache22/files/patch-srclib:apr:build:buildcheck.sh b/www/apache22/files/patch-srclib__apr__build__buildcheck.sh
index 04af0a0c30ce..6547192c35d4 100644
--- a/www/apache22/files/patch-srclib:apr:build:buildcheck.sh
+++ b/www/apache22/files/patch-srclib__apr__build__buildcheck.sh
@@ -1,5 +1,5 @@
---- srclib/apr/build/buildcheck.sh.orig	Fri Jun 17 00:53:05 2005
-+++ srclib/apr/build/buildcheck.sh	Sun Sep 24 15:18:38 2006
+--- ./srclib/apr/build/buildcheck.sh.orig	2009-11-12 19:27:16.000000000 -0500
++++ ./srclib/apr/build/buildcheck.sh	2010-05-06 19:37:54.248730202 -0400
 @@ -2,6 +2,7 @@
  
  echo "buildconf: checking installation..."
@@ -14,7 +14,7 @@
  fi
 +fi
  
- # autoconf 2.50 or newer
+ # autoconf 2.59 or newer
  ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;q'`
 @@ -38,7 +40,7 @@
  # output is multiline from 1.5 onwards
diff --git a/www/apache22/files/patch-srclib__apr__buildconf b/www/apache22/files/patch-srclib__apr__buildconf
index 6cc3bc97d84e..933d3dbada63 100644
--- a/www/apache22/files/patch-srclib__apr__buildconf
+++ b/www/apache22/files/patch-srclib__apr__buildconf
@@ -1,5 +1,5 @@
---- srclib/apr/buildconf.orig	2009-11-12 17:19:49.000000000 -0500
-+++ srclib/apr/buildconf	2010-04-30 19:22:40.116834529 -0400
+--- ./srclib/apr/buildconf.orig	2009-11-12 17:19:49.000000000 -0500
++++ ./srclib/apr/buildconf	2010-05-06 19:37:54.253730294 -0400
 @@ -28,7 +28,7 @@
  #
  build/buildcheck.sh $verbose || exit 1
diff --git a/www/apache22/files/patch-srclib:apr:config.layout b/www/apache22/files/patch-srclib__apr__config.layout
index 87903810ee1b..6adfe5210baa 100644
--- a/www/apache22/files/patch-srclib:apr:config.layout
+++ b/www/apache22/files/patch-srclib__apr__config.layout
@@ -1,5 +1,5 @@
---- srclib/apr/config.layout.orig	Wed Jun 30 15:16:54 2004
-+++ srclib/apr/config.layout	Mon Dec 13 10:17:16 2004
+--- ./srclib/apr/config.layout.orig	2004-11-24 17:51:51.000000000 -0500
++++ ./srclib/apr/config.layout	2010-05-06 19:37:54.251730593 -0400
 @@ -229,3 +229,8 @@
      infodir:       ${exec_prefix}/share/info
      libsuffix:    -${APR_MAJOR_VERSION}
diff --git a/www/apache22/files/patch-support:Makefile.in b/www/apache22/files/patch-support__Makefile.in
index e4fafb3f456c..0eb698807b09 100644
--- a/www/apache22/files/patch-support:Makefile.in
+++ b/www/apache22/files/patch-support__Makefile.in
@@ -1,5 +1,5 @@
---- support/Makefile.in.orig	2005-07-06 23:15:34.000000000 +0000
-+++ support/Makefile.in	2007-07-22 09:41:16.000000000 +0000
+--- ./support/Makefile.in.orig	2005-07-06 19:15:34.000000000 -0400
++++ ./support/Makefile.in	2010-05-06 19:37:54.258730387 -0400
 @@ -16,17 +16,14 @@
  	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
  	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
diff --git a/www/apache22/files/patch-support:ab.c b/www/apache22/files/patch-support__ab.c
index 98b5539a74db..b035673752be 100644
--- a/www/apache22/files/patch-support:ab.c
+++ b/www/apache22/files/patch-support__ab.c
@@ -1,6 +1,6 @@
---- support/ab.c.orig	2008-12-01 00:47:31.000000000 +0900
-+++ support/ab.c	2009-04-01 16:08:09.000000000 +0900
-@@ -208,13 +208,18 @@
+--- ./support/ab.c.orig	2010-01-07 10:11:53.000000000 -0500
++++ ./support/ab.c	2010-05-06 19:37:54.262732305 -0400
+@@ -221,13 +221,18 @@
  /* maximum number of requests on a time limited test */
  #define MAX_REQUESTS (INT_MAX > 50000 ? 50000 : INT_MAX)
  
@@ -24,7 +24,7 @@
  
  #define CBUFFSIZE (2048)
  
-@@ -239,6 +244,7 @@
+@@ -252,6 +257,7 @@
                 done;            /* Connection closed */
  
      int socknum;
@@ -32,7 +32,7 @@
  #ifdef USE_SSL
      SSL *ssl;
  #endif
-@@ -383,6 +389,56 @@
+@@ -396,6 +402,56 @@
      exit(rv);
  }
  
@@ -89,7 +89,7 @@
  /* --------------------------------------------------------- */
  /* write out request to a connection - assumes we can write
   * (small) request out in one go into our new socket buffer
-@@ -556,7 +612,6 @@
+@@ -569,7 +625,6 @@
  
      while (do_next) {
          int ret, ecode;
@@ -97,7 +97,7 @@
  
          ret = SSL_do_handshake(c->ssl);
          ecode = SSL_get_error(c->ssl, ret);
-@@ -588,11 +643,7 @@
+@@ -601,11 +656,7 @@
              do_next = 0;
              break;
          case SSL_ERROR_WANT_READ:
@@ -110,7 +110,7 @@
              do_next = 0;
              break;
          case SSL_ERROR_WANT_WRITE:
-@@ -668,16 +719,8 @@
+@@ -681,16 +732,8 @@
          c->rwrite -= l;
      } while (c->rwrite);
  
@@ -128,7 +128,7 @@
  }
  
  /* --------------------------------------------------------- */
-@@ -1191,21 +1234,12 @@
+@@ -1210,21 +1253,12 @@
  #endif
      if ((rv = apr_socket_connect(c->aprsock, destsa)) != APR_SUCCESS) {
          if (APR_STATUS_IS_EINPROGRESS(rv)) {
@@ -152,7 +152,7 @@
              apr_socket_close(c->aprsock);
              err_conn++;
              if (bad++ > 10) {
-@@ -1213,14 +1247,14 @@
+@@ -1232,14 +1266,14 @@
                     "\nTest aborted after 10 failures\n\n");
                  apr_err("apr_socket_connect()", rv);
              }
@@ -169,7 +169,7 @@
      started++;
  #ifdef USE_SSL
      if (c->ssl) {
-@@ -1269,21 +1303,15 @@
+@@ -1288,21 +1322,15 @@
          }
      }
  
@@ -198,7 +198,7 @@
  
      /* connect again */
      start_connect(c);
-@@ -1401,10 +1429,7 @@
+@@ -1420,10 +1448,7 @@
              }
              else {
              /* header is in invalid or too big - close connection */
@@ -210,7 +210,7 @@
                  apr_socket_close(c->aprsock);
                  err_response++;
                  if (bad++ > 10) {
-@@ -1727,11 +1752,7 @@
+@@ -1748,11 +1773,7 @@
              }
              if (rv & APR_POLLOUT) {
                  if (c->state == STATE_CONNECTING) {
@@ -222,7 +222,7 @@
                      if (rv != APR_SUCCESS) {
                          apr_socket_close(c->aprsock);
                          err_conn++;
-@@ -1740,12 +1761,12 @@
+@@ -1761,12 +1782,12 @@
                                      "\nTest aborted after 10 failures\n\n");
                              apr_err("apr_socket_connect()", rv);
                          }
@@ -237,7 +237,7 @@
                          started++;
  #ifdef USE_SSL
                          if (c->ssl)
-@@ -1759,22 +1780,6 @@
+@@ -1780,22 +1801,6 @@
                      write_request(c);
                  }
              }
diff --git a/www/apache22/files/patch-support:apachectl.in b/www/apache22/files/patch-support__apachectl.in
index 7c5c3238e955..5391b30dfe58 100644
--- a/www/apache22/files/patch-support:apachectl.in
+++ b/www/apache22/files/patch-support__apachectl.in
@@ -1,6 +1,6 @@
---- support/apachectl.in.orig	Thu Sep 16 09:28:54 2004
-+++ support/apachectl.in	Thu Sep 16 09:29:14 2004
-@@ -63,7 +63,7 @@
+--- ./support/apachectl.in.orig	2006-07-11 23:38:44.000000000 -0400
++++ ./support/apachectl.in	2010-05-06 19:37:54.265730461 -0400
+@@ -64,7 +64,7 @@
  ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@"
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
diff --git a/www/apache22/files/patch-support:apxs.in b/www/apache22/files/patch-support__apxs.in
index db8081fa4fc5..f07805469c9a 100644
--- a/www/apache22/files/patch-support:apxs.in
+++ b/www/apache22/files/patch-support__apxs.in
@@ -1,6 +1,6 @@
---- support/apxs.in.orig	Mon Nov 29 10:24:23 2004
-+++ support/apxs.in	Mon Nov 29 10:25:05 2004
-@@ -629,8 +629,7 @@
+--- ./support/apxs.in.orig	2006-07-11 23:38:44.000000000 -0400
++++ ./support/apxs.in	2010-05-06 19:37:54.268730293 -0400
+@@ -619,8 +619,7 @@
              if (open(FP, ">$CFG_SYSCONFDIR/$CFG_TARGET.conf.new")) {
                  print FP $content;
                  close(FP);
diff --git a/www/apache22/files/patch-support:envvars-std.in b/www/apache22/files/patch-support__envvars-std.in
index c38910ad8a78..2e6811e0ef9a 100644
--- a/www/apache22/files/patch-support:envvars-std.in
+++ b/www/apache22/files/patch-support__envvars-std.in
@@ -1,6 +1,6 @@
---- support/envvars-std.in.orig	Fri Dec 17 14:39:21 2004
-+++ support/envvars-std.in	Fri Dec 17 14:41:06 2004
-@@ -21,3 +21,10 @@
+--- ./support/envvars-std.in.orig	2006-07-11 23:38:44.000000000 -0400
++++ ./support/envvars-std.in	2010-05-06 19:37:54.270732510 -0400
+@@ -22,3 +22,10 @@
  export @SHLIBPATH_VAR@
  #
  @OS_SPECIFIC_VARS@
diff --git a/www/apache22/files/patch-support:log_server_status.in b/www/apache22/files/patch-support__log_server_status.in
index 136bafb9ff1a..7aeb579dbad8 100644
--- a/www/apache22/files/patch-support:log_server_status.in
+++ b/www/apache22/files/patch-support__log_server_status.in
@@ -1,6 +1,6 @@
---- support/log_server_status.in.orig	Tue Jun 18 23:21:53 2002
-+++ support/log_server_status.in	Tue Jun 18 23:23:08 2002
-@@ -63,7 +63,7 @@
+--- ./support/log_server_status.in.orig	2006-07-11 23:38:44.000000000 -0400
++++ ./support/log_server_status.in	2010-05-06 19:37:54.273730386 -0400
+@@ -27,7 +27,7 @@
  #
  require 'sys/socket.ph';
  
@@ -9,7 +9,7 @@
  $server = "localhost";          # Name of server, could be "www.foo.com"
  $port = "80";                   # Port on server
  $request = "/status/?auto";     # Request to send
-@@ -96,7 +96,7 @@
+@@ -60,7 +60,7 @@
  	chomp($date);
  	($day,$time)=split(/:/,$date);
  	$res=&tcp_connect($server,$port);