- updated addon (date only) and eapi (fixed clean shutdown) patches from

  mod_ssl 2.8.13
- use mm 1.3.0 on HEAD
- release 5

Changed files:
    apache1-mod_ssl-addon.patch -> 1.2
    apache1-mod_ssl-eapi.patch -> 1.2
    apache1.spec -> 1.4

diff --git a/apache1-mod_ssl-addon.patch b/apache1-mod_ssl-addon.patch
index 73c1cbc7951c46070967615cafe7f1949299dcb1..fbc2890b51d60723c799d9108cf9f6ef391f11b5 100644 (file)
--- a/apache1-mod_ssl-addon.patch
+++ b/apache1-mod_ssl-addon.patch
@@ -8,7 +8,7 @@
 ##
 ## Annotated patch file: addon.patch
 ## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved. 
-## Created on: 04-Oct-2002
+## Created on: 18-Mar-2003
 ##
 ## This file assembles changes to existing Apache source files
 ## between the original Apache and the patched variant. It can be

diff --git a/apache1-mod_ssl-eapi.patch b/apache1-mod_ssl-eapi.patch
index 8a3c33d4147ef2d967d12619d7dc4a642e91a415..2e66f5435d2bcdb2a7c3802b82d560fc00239573 100644 (file)
--- a/apache1-mod_ssl-eapi.patch
+++ b/apache1-mod_ssl-eapi.patch
@@ -7,7 +7,7 @@
 ## 
 ## Annotated patch file: eapi.patch
 ## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved. 
-## Created on: 04-Oct-2002
+## Created on: 18-Mar-2003
 ##
 ## This file assembles changes to existing Apache source files
 ## between the original Apache and the patched variant. It can be
@@ -495,7 +495,7 @@ Index: src/include/httpd.h
 +---------------------------------------------------------------------------
 Index: src/main/alloc.c
 --- src/main/alloc.c   4 Oct 2002 11:50:14 -0000       1.1.1.13
-+++ src/main/alloc.c   4 Oct 2002 11:54:56 -0000       1.20
++++ src/main/alloc.c   7 Mar 2003 13:45:51 -0000       1.21
 @@ -64,6 +64,10 @@
   */
  
@@ -952,6 +952,16 @@ Index: src/main/alloc.c
      ptr = realloc(ptr, (char *)ps.vbuff.curpos - (char *)ptr);
      if (ptr == NULL) {
        fputs("Ouch!  Out of memory!\n", stderr);
+@@ -1758,6 +1992,9 @@
+     cleanup_pool_for_exec(permanent_pool);
+     ap_unblock_alarms();
+ #endif /* ndef WIN32 */
++#ifdef EAPI
++    ap_kill_alloc_shared();
++#endif
+ }
+ 
+ API_EXPORT_NONSTD(void) ap_null_cleanup(void *data)
 
 +---------------------------------------------------------------------------
 | Patch the low-level buffer routines to additionally allow

diff --git a/apache1.spec b/apache1.spec
index c70e9139ec4072c2c453e7467e6bfb5fb1577ae0..a5ce1274ddb86ff69fff3612bb593ad23f37f898 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -27,7 +27,7 @@ Summary(uk):  
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache1
 Version:       1.3.27
-Release:       4
+Release:       5
 License:       Apache Group 
 Group:         Networking/Daemons
 URL:           http://www.apache.org/
@@ -66,7 +66,7 @@ Patch21:      %{name}-apxs-quiet.patch
 Patch22:       %{name}-db4.patch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: db-devel >= 4.1
-BuildRequires: mm-devel >= 1.1.3
+BuildRequires: mm-devel >= 1.3.0
 %{?_with_rewrite_ldap:BuildRequires: openldap-devel}
 PreReq:                rc-scripts
 PreReq:                mm